Timeline: Stretch date section sections across the whole ListView width

With paddings, it looked sort of glitched, especially in RTL layouts,
because messages from the top were highlighting all around the padded
section delegate.

.flatpak-manifest.json

@@ -19,7 +19,6 @@
         "--talk-name=org.freedesktop.Notifications",
         "--talk-name=org.kde.kwalletd5",
         "--talk-name=org.kde.StatusNotifierWatcher",
-        "--talk-name=org.freedesktop.secrets",
         "--own-name=org.kde.StatusNotifierItem-2-2"
     ],
     "modules": [

.gitlab-ci.yml

@@ -3,7 +3,7 @@
 
 include:
   - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/reuse-lint.yml
-  - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/android-qt6.yml
+#  - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/android-qt6.yml
   - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/linux-qt6.yml
 #  - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/windows-qt6.yml
   - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/freebsd-qt6.yml

.kde-ci.yml

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

.reuse/dep5

@@ -34,14 +34,10 @@ Files: src/neochat.notifyrc
 Copyright: 2020 Tobias Fella <tobias.fella@kde.org>
 License: BSD-2-Clause
 
-Files: src/qml/confetti.png src/qml/glowdot.png
+Files: src/qml/Component/confetti.png src/qml/Component/glowdot.png
 Copyright: 2021 Alexey Andreyev <aa13q@ya.ru>
 License: CC0-1.0
 
 Files: .flatpak-manifest.json
 Copyright: 2020-2022 Tobias Fella <tobias.fella@kde.org>
 License: BSD-2-Clause
-
-Files: autotests/data/*
-Copyright: none
-License: CC0-1.0

CMakeLists.txt

@@ -63,9 +63,9 @@ set_package_properties(KF6 PROPERTIES
     PURPOSE "Basic application components"
 )
 set_package_properties(KF6Kirigami2 PROPERTIES
-    TYPE REQUIRED
-    PURPOSE "Kirigami application UI framework"
-)
+        TYPE REQUIRED
+        PURPOSE "Kirigami application UI framework"
+        )
 find_package(KF6KirigamiAddons 0.7.2 REQUIRED)
 
 if(ANDROID)
@@ -81,12 +81,6 @@ else()
         TYPE RUNTIME
     )
     ecm_find_qmlmodule(org.kde.syntaxhighlighting 1.0)
-
-    find_package(ICU 61.0 COMPONENTS uc)
-    set_package_properties(ICU PROPERTIES
-        TYPE REQUIRED
-        PURPOSE "Unicode library"
-    )
 endif()
 
 if (NOT ANDROID AND NOT WIN32 AND NOT APPLE)
@@ -101,8 +95,7 @@ set_package_properties(QuotientQt6 PROPERTIES
     PURPOSE "Talk with matrix server"
 )
 
-# The android part is just for CI. We do NOT support any builds without E2EE
-if (NOT TARGET Olm::Olm AND NOT ANDROID)
+if (NOT TARGET Olm::Olm)
     message(FATAL_ERROR "NeoChat requires Quotient with the E2EE feature enabled")
 endif()
 
@@ -118,7 +111,7 @@ set_package_properties(cmark PROPERTIES
 ecm_find_qmlmodule(org.kde.kquickimageeditor 1.0)
 ecm_find_qmlmodule(org.kde.kitemmodels 1.0)
 ecm_find_qmlmodule(org.kde.quickcharts 1.0)
-ecm_find_qmlmodule(QtLocation)
+ecm_find_qmlmodule(QtLocation ${QTLOCATION_MODULE_QML_VERSION})
 
 find_package(KQuickImageEditor COMPONENTS)
 set_package_properties(KQuickImageEditor PROPERTIES

appiumtests/logintest.py

@@ -4,26 +4,25 @@
 # SPDX-FileCopyrightText: 2021-2022 Harald Sitter <sitter@kde.org>
 # SPDX-FileCopyrightText: 2023 Tobias Fella <tobias.fella@kde.org>
 
+import unittest
+from appium import webdriver
+from appium.webdriver.common.appiumby import AppiumBy
+from selenium.webdriver.support.ui import WebDriverWait
 import os
+import time
 import subprocess
 import sys
-import unittest
-
-from appium import webdriver
-from appium.options.common.base import AppiumOptions
-from appium.webdriver.common.appiumby import AppiumBy
-
 
 class LoginTest(unittest.TestCase):
-
-    mockServerProcess: subprocess.Popen
-
     @classmethod
-    def setUpClass(cls):
-        options = AppiumOptions()
-        options.set_capability("app", "neochat --ignore-ssl-errors")
-        cls.driver = webdriver.Remote(command_executor='http://127.0.0.1:4723', options=options)
-        cls.mockServerProcess = subprocess.Popen([sys.executable, os.path.join(os.path.dirname(__file__), "login-server.py")])
+    def setUpClass(self):
+        desired_caps = {}
+        desired_caps["app"] = "neochat --ignore-ssl-errors"
+        desired_caps["timeouts"] = {'implicit': 10000}
+        self.driver = webdriver.Remote(
+            command_executor='http://127.0.0.1:4723',
+            desired_capabilities=desired_caps)
+        self.mockServerProcess = subprocess.Popen([sys.executable, os.path.join(os.path.dirname(__file__), "login-server.py")])
 
     def setUp(self):
         pass
@@ -46,6 +45,5 @@ class LoginTest(unittest.TestCase):
         self.driver.find_element(by=AppiumBy.NAME, value="Login").click()
         self.driver.find_element(by=AppiumBy.NAME, value="Join some rooms to get started").click()
 
-
 if __name__ == '__main__':
     unittest.main()

autotests/CMakeLists.txt

@@ -3,8 +3,6 @@
 
 enable_testing()
 
-add_definitions(-DDATA_DIR="${CMAKE_CURRENT_SOURCE_DIR}/data" )
-
 ecm_add_test(
     neochatroomtest.cpp
     LINK_LIBRARIES neochat Qt::Test
@@ -34,9 +32,3 @@ ecm_add_test(
     LINK_LIBRARIES neochat Qt::Test
     TEST_NAME eventhandlertest
 )
-
-ecm_add_test(
-    chatbarcachetest.cpp
-    LINK_LIBRARIES neochat Qt::Test
-    TEST_NAME chatbarcachetest
-)

autotests/chatbarcachetest.cpp

@@ -1,157 +0,0 @@
-// SPDX-FileCopyrightText: 2023 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 <QJsonDocument>
-#include <QJsonObject>
-#include <QObject>
-#include <QTest>
-
-#include <Quotient/syncdata.h>
-#include <qtestcase.h>
-
-#include "chatbarcache.h"
-#include "neochatroom.h"
-
-using namespace Quotient;
-
-class TestRoom : public NeoChatRoom
-{
-public:
-    using NeoChatRoom::NeoChatRoom;
-
-    void update(SyncRoomData &&data, bool fromCache = false)
-    {
-        Room::updateData(std::move(data), fromCache);
-    }
-};
-
-class ChatBarCacheTest : public QObject
-{
-    Q_OBJECT
-
-private:
-    Connection *connection = nullptr;
-    TestRoom *room = nullptr;
-
-private Q_SLOTS:
-    void initTestCase();
-
-    void empty();
-    void noRoom();
-    void badParent();
-    void reply();
-    void edit();
-    void attachment();
-};
-
-void ChatBarCacheTest::initTestCase()
-{
-    connection = Connection::makeMockConnection(QStringLiteral("@bob:kde.org"));
-    room = new TestRoom(connection, QStringLiteral("#myroom:kde.org"), JoinState::Join);
-
-    QFile testMinSyncFile;
-    testMinSyncFile.setFileName(QLatin1String(DATA_DIR) + u'/' + QLatin1String("test-min-sync.json"));
-    testMinSyncFile.open(QIODevice::ReadOnly);
-    const auto testMinSyncJson = QJsonDocument::fromJson(testMinSyncFile.readAll());
-    SyncRoomData roomData(QStringLiteral("@bob:kde.org"), JoinState::Join, testMinSyncJson.object());
-    room->update(std::move(roomData));
-}
-
-void ChatBarCacheTest::empty()
-{
-    QScopedPointer<ChatBarCache> chatBarCache(new ChatBarCache(room));
-
-    QCOMPARE(chatBarCache->text(), QString());
-    QCOMPARE(chatBarCache->isReplying(), false);
-    QCOMPARE(chatBarCache->replyId(), QString());
-    QCOMPARE(chatBarCache->isEditing(), false);
-    QCOMPARE(chatBarCache->editId(), QString());
-    QCOMPARE(chatBarCache->relationUser(), room->getUser(nullptr));
-    QCOMPARE(chatBarCache->relationMessage(), QString());
-    QCOMPARE(chatBarCache->attachmentPath(), QString());
-}
-
-void ChatBarCacheTest::noRoom()
-{
-    QScopedPointer<ChatBarCache> chatBarCache(new ChatBarCache());
-    chatBarCache->setReplyId(QLatin1String("$153456789:example.org"));
-
-    // These should return empty even though a reply ID has been set because the
-    // 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());
-
-    QTest::ignoreMessage(QtWarningMsg, "ChatBarCache created with no parent, a NeoChatRoom must be set as the parent on creation.");
-    QCOMPARE(chatBarCache->relationMessage(), QString());
-}
-
-void ChatBarCacheTest::badParent()
-{
-    QScopedPointer<QObject> badParent(new QObject());
-    QScopedPointer<ChatBarCache> chatBarCache(new ChatBarCache(badParent.get()));
-    chatBarCache->setReplyId(QLatin1String("$153456789:example.org"));
-
-    // These should return empty even though a reply ID has been set because the
-    // 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());
-
-    QTest::ignoreMessage(QtWarningMsg, "ChatBarCache created with incorrect parent, a NeoChatRoom must be set as the parent on creation.");
-    QCOMPARE(chatBarCache->relationMessage(), QString());
-}
-
-void ChatBarCacheTest::reply()
-{
-    QScopedPointer<ChatBarCache> chatBarCache(new ChatBarCache(room));
-    chatBarCache->setText(QLatin1String("some text"));
-    chatBarCache->setAttachmentPath(QLatin1String("some/path"));
-    chatBarCache->setReplyId(QLatin1String("$153456789:example.org"));
-
-    QCOMPARE(chatBarCache->text(), QLatin1String("some text"));
-    QCOMPARE(chatBarCache->isReplying(), true);
-    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->relationMessage(), QLatin1String("This is an example\ntext message"));
-    QCOMPARE(chatBarCache->attachmentPath(), QString());
-}
-
-void ChatBarCacheTest::edit()
-{
-    QScopedPointer<ChatBarCache> chatBarCache(new ChatBarCache(room));
-    chatBarCache->setText(QLatin1String("some text"));
-    chatBarCache->setAttachmentPath(QLatin1String("some/path"));
-    chatBarCache->setEditId(QLatin1String("$153456789:example.org"));
-
-    QCOMPARE(chatBarCache->text(), QLatin1String("some text"));
-    QCOMPARE(chatBarCache->isReplying(), false);
-    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->relationMessage(), QLatin1String("This is an example\ntext message"));
-    QCOMPARE(chatBarCache->attachmentPath(), QString());
-}
-
-void ChatBarCacheTest::attachment()
-{
-    QScopedPointer<ChatBarCache> chatBarCache(new ChatBarCache(room));
-    chatBarCache->setText(QLatin1String("some text"));
-    chatBarCache->setEditId(QLatin1String("$153456789:example.org"));
-    chatBarCache->setAttachmentPath(QLatin1String("some/path"));
-
-    QCOMPARE(chatBarCache->text(), QLatin1String("some text"));
-    QCOMPARE(chatBarCache->isReplying(), false);
-    QCOMPARE(chatBarCache->replyId(), QString());
-    QCOMPARE(chatBarCache->isEditing(), false);
-    QCOMPARE(chatBarCache->editId(), QString());
-    QCOMPARE(chatBarCache->relationUser(), room->getUser(nullptr));
-    QCOMPARE(chatBarCache->relationMessage(), QString());
-    QCOMPARE(chatBarCache->attachmentPath(), QLatin1String("some/path"));
-}
-
-QTEST_MAIN(ChatBarCacheTest)
-#include "chatbarcachetest.moc"

autotests/data/test-eventhandler-sync.json

@@ -1,381 +0,0 @@
-{
-  "account_data": {
-    "events": [
-      {
-        "content": {
-          "tags": {
-            "u.work": {
-              "order": 0.9
-            }
-          }
-        },
-        "type": "m.tag"
-      },
-      {
-        "content": {
-          "custom_config_key": "custom_config_value"
-        },
-        "type": "org.example.custom.room.config"
-      }
-    ]
-  },
-  "ephemeral": {
-    "events": [
-      {
-        "content": {
-          "user_ids": [
-            "@alice:matrix.org",
-            "@bob:example.com"
-          ]
-        },
-        "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
-        "type": "m.typing"
-      },
-      {
-        "content": {
-          "$153456789:example.org": {
-            "m.read": {
-              "@alice:matrix.org": {
-                "ts": 1436451550453
-              }
-            }
-          }
-        },
-        "type": "m.receipt"
-      },
-      {
-        "content": {
-          "$1532735824654:example.org": {
-            "m.read": {
-              "@bob:example.com": {
-                "ts": 1436451550453
-              }
-            }
-          }
-        },
-        "type": "m.receipt"
-      },
-      {
-        "content": {
-          "$1532735824654:example.org": {
-            "m.read": {
-              "@tim:example.com": {
-                "ts": 1436451550454
-              }
-            }
-          }
-        },
-        "type": "m.receipt"
-      },
-      {
-        "content": {
-          "$1532735824654:example.org": {
-            "m.read": {
-              "@jeff:example.com": {
-                "ts": 1436451550455
-              }
-            }
-          }
-        },
-        "type": "m.receipt"
-      },
-      {
-        "content": {
-          "$1532735824654:example.org": {
-            "m.read": {
-              "@tina:example.com": {
-                "ts": 1436451550456
-              }
-            }
-          }
-        },
-        "type": "m.receipt"
-      },
-      {
-        "content": {
-          "$1532735824654:example.org": {
-            "m.read": {
-              "@sally:example.com": {
-                "ts": 1436451550457
-              }
-            }
-          }
-        },
-        "type": "m.receipt"
-      },
-      {
-        "content": {
-          "$1532735824654:example.org": {
-            "m.read": {
-              "@fred:example.com": {
-                "ts": 1436451550458
-              }
-            }
-          }
-        },
-        "type": "m.receipt"
-      }
-    ]
-  },
-  "state": {
-    "events": [
-      {
-        "content": {
-          "avatar_url": "mxc://example.org/SEsfnsuifSDFSSEF",
-          "displayname": "Alice Margatroid",
-          "membership": "join",
-          "reason": "Looking for support"
-        },
-        "event_id": "$143273582443PhrSn:example.org",
-        "origin_server_ts": 1432735824653,
-        "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
-        "sender": "@example:example.org",
-        "state_key": "@alice:example.org",
-        "type": "m.room.member",
-        "unsigned": {
-          "age": 1234
-        }
-      }
-    ]
-  },
-  "summary": {
-    "m.heroes": [
-      "@alice:example.com",
-      "@bob:example.com"
-    ],
-    "m.invited_member_count": 0,
-    "m.joined_member_count": 2
-  },
-  "timeline": {
-    "events": [
-      {
-        "content": {
-          "body": "This is an example\ntext message",
-          "format": "org.matrix.custom.html",
-          "formatted_body": "<b>This is an example<br>text message</b>",
-          "msgtype": "m.text"
-        },
-        "event_id": "$153456789:example.org",
-        "origin_server_ts": 1432735824654,
-        "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
-        "sender": "@example:example.org",
-        "type": "m.room.message",
-        "unsigned": {
-          "age": 1232
-        }
-      },
-      {
-        "content": {
-          "avatar_url": "mxc://kde.org/123456",
-          "displayname": "after",
-          "membership": "join"
-        },
-        "origin_server_ts": 1690651134736,
-        "sender": "@example:example.org",
-        "state_key": "@example:example.org",
-        "type": "m.room.member",
-        "unsigned": {
-          "replaces_state": "$1234567890:example.org",
-          "prev_content": {
-            "avatar_url": "mxc://kde.org/12345",
-            "displayname": "before",
-            "membership": "join"
-          },
-          "prev_sender": "@example:example.orgg",
-          "age": 1234
-        },
-        "event_id": "$143273583553PhrSn:example.org",
-        "room_id": "!jEsUZKDJdhlrceRyVU:example.org"
-      },
-      {
-        "content": {
-          "body": "This is a highlight @bob:kde.org and this is a link https://kde.org",
-          "format": "org.matrix.custom.html",
-          "msgtype": "m.text"
-        },
-        "event_id": "$1532735824654:example.org",
-        "origin_server_ts": 1532735824654,
-        "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
-        "sender": "@example:example.org",
-        "type": "m.room.message",
-        "unsigned": {
-          "age": 1233
-        }
-      },
-      {
-        "content": {
-            "m.relates_to": {
-            "event_id": "$153456789:example.org",
-            "key": "👍",
-            "rel_type": "m.annotation"
-            }
-        },
-        "origin_server_ts": 1690322545182,
-        "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
-        "sender": "@alice:matrix.org",
-        "type": "m.reaction",
-        "unsigned": {
-            "age": 390159120
-        },
-        "event_id": "$163456789:example.org",
-        "age": 390159120
-      },
-      {
-        "age": 4926305285,
-        "content": {
-            "body": "video caption",
-            "filename": "video.mp4",
-            "info": {
-                "duration": 10,
-                "h": 1080,
-                "mimetype": "video/mp4",
-                "size": 62650636,
-                "w": 1920,
-                "thumbnail_info": {
-                    "h": 450,
-                    "mimetype": "image/jpeg",
-                    "size": 382249,
-                    "w": 800
-                },
-                "thumbnail_url": "mxc://kde.org/2234567"
-            },
-            "msgtype": "m.video",
-            "url": "mxc://kde.org/1234567"
-        },
-        "event_id": "$263456789:example.org",
-        "origin_server_ts": 1685793783330,
-        "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
-        "sender": "@example:example.org",
-        "type": "m.room.message",
-        "unsigned": {
-            "age": 4926305285
-        },
-        "user_id": "@example:example.org"
-      },
-      {
-        "content": {
-            "body": "> <@example:example.org> This is an example\ntext message\n\nreply",
-            "format": "org.matrix.custom.html",
-            "formatted_body": "<mx-reply><blockquote><a href=\"https://matrix.to/#/!jEsUZKDJdhlrceRyVU:example.org/$153456789:example.org?via=kde.org&via=matrix.org\">In reply to</a> <a href=\"https://matrix.to/#/@example:example.org\">@example:example.org</a><br><b>This is an example<br>text message</b></blockquote></mx-reply>reply",
-            "m.relates_to": {
-                "m.in_reply_to": {
-                    "event_id": "$153456789:example.org"
-                }
-            },
-            "msgtype": "m.text"
-        },
-        "origin_server_ts": 1690725965572,
-        "sender": "@alice:matrix.org",
-        "type": "m.room.message",
-        "unsigned": {
-            "age": 98
-        },
-        "event_id": "$154456789:example.org",
-        "room_id": "!jEsUZKDJdhlrceRyVU:example.org"
-      },
-      {
-        "content": {
-            "body": "> <@example:example.org> video caption\n\nreply",
-            "m.relates_to": {
-                "m.in_reply_to": {
-                    "event_id": "$263456789:example.org"
-                }
-            },
-            "msgtype": "m.text"
-        },
-        "origin_server_ts": 1690725965573,
-        "sender": "@alice:matrix.org",
-        "type": "m.room.message",
-        "unsigned": {
-            "age": 98
-        },
-        "event_id": "$154456799:example.org",
-        "room_id": "!jEsUZKDJdhlrceRyVU:example.org"
-      },
-      {
-        "age": 96845207,
-        "content": {
-            "body": "Lat: 51.7035, Lon: -1.14394",
-            "geo_uri": "geo:51.7035,-1.14394",
-            "msgtype": "m.location",
-            "org.matrix.msc1767.text": "Lat: 51.7035, Lon: -1.14394",
-            "org.matrix.msc3488.asset": {
-                "type": "m.pin"
-            },
-            "org.matrix.msc3488.location": {
-                "uri": "geo:51.7035,-1.14394"
-            }
-        },
-        "event_id": "$1544567999:example.org",
-        "origin_server_ts": 1690821582876,
-        "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
-        "sender": "@example:example.org",
-        "type": "m.room.message",
-        "unsigned": {
-            "age": 96845207
-        }
-      },
-      {
-        "content": {
-          "body": "Thread root",
-          "format": "org.matrix.custom.html",
-          "msgtype": "m.text"
-        },
-        "event_id": "$threadroot:example.org",
-        "origin_server_ts": 1690821582879,
-        "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
-        "sender": "@example:example.org",
-        "type": "m.room.message",
-        "unsigned": {
-          "age": 1232
-        }
-      },
-      {
-        "content": {
-          "body": "Thread message 1",
-          "msgtype": "m.text",
-          "m.relates_to": {
-                "rel_type": "m.thread",
-                "event_id": "$threadroot:example.org",
-                "m.in_reply_to": {
-                    "event_id": "$threadroot:example.org"
-                },
-                "is_falling_back": true
-            }
-        },
-        "event_id": "$threadmessage1:example.org",
-        "origin_server_ts": 1690821582890,
-        "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
-        "sender": "@example:example.org",
-        "type": "m.room.message",
-        "unsigned": {
-          "age": 1238
-        }
-      },
-      {
-        "content": {
-          "body": "Thread message 2",
-          "msgtype": "m.text",
-          "m.relates_to": {
-                "rel_type": "m.thread",
-                "event_id": "$threadroot:example.org",
-                "m.in_reply_to": {
-                    "event_id": "$threadmessage1:example.org"
-                },
-                "is_falling_back": true
-            }
-        },
-        "event_id": "$threadmessage2:example.org",
-        "origin_server_ts": 1690821582890,
-        "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
-        "sender": "@example:example.org",
-        "type": "m.room.message",
-        "unsigned": {
-          "age": 1238
-        }
-      }
-    ],
-    "limited": true,
-    "prev_batch": "t34-23535_0_0"
-  }
-}

autotests/data/test-min-sync.json

@@ -1,87 +0,0 @@
-{
-  "account_data": {
-    "events": [
-      {
-        "content": {
-          "tags": {
-            "u.work": {
-              "order": 0.9
-            }
-          }
-        },
-        "type": "m.tag"
-      },
-      {
-        "content": {
-          "custom_config_key": "custom_config_value"
-        },
-        "type": "org.example.custom.room.config"
-      }
-    ]
-  },
-  "ephemeral": {
-    "events": [
-      {
-        "content": {
-          "user_ids": [
-            "@alice:matrix.org",
-            "@bob:example.com"
-          ]
-        },
-        "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
-        "type": "m.typing"
-      }
-    ]
-  },
-  "state": {
-    "events": [
-      {
-        "content": {
-          "avatar_url": "mxc://example.org/SEsfnsuifSDFSSEF",
-          "displayname": "Alice Margatroid",
-          "membership": "join",
-          "reason": "Looking for support"
-        },
-        "event_id": "$143273582443PhrSn:example.org",
-        "origin_server_ts": 1432735824653,
-        "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
-        "sender": "@example:example.org",
-        "state_key": "@alice:example.org",
-        "type": "m.room.member",
-        "unsigned": {
-          "age": 1234
-        }
-      }
-    ]
-  },
-  "summary": {
-    "m.heroes": [
-      "@alice:example.com",
-      "@bob:example.com"
-    ],
-    "m.invited_member_count": 0,
-    "m.joined_member_count": 2
-  },
-  "timeline": {
-    "events": [
-      {
-        "content": {
-          "body": "This is an example\ntext message",
-          "format": "org.matrix.custom.html",
-          "formatted_body": "<b>This is an example<br>text message</b>",
-          "msgtype": "m.text"
-        },
-        "event_id": "$153456789:example.org",
-        "origin_server_ts": 1432735824654,
-        "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
-        "sender": "@example:example.org",
-        "type": "m.room.message",
-        "unsigned": {
-          "age": 1232
-        }
-      }
-    ],
-    "limited": true,
-    "prev_batch": "t34-23535_0_0"
-  }
-}

autotests/eventhandlertest.cpp

@@ -64,7 +64,6 @@ private Q_SLOTS:
     void replyAuthor();
     void replyBody();
     void replyMediaInfo();
-    void thread();
     void location();
     void readMarkers();
 };
@@ -74,11 +73,329 @@ void EventHandlerTest::initTestCase()
     connection = Connection::makeMockConnection(QStringLiteral("@bob:kde.org"));
     room = new TestRoom(connection, QStringLiteral("#myroom:kde.org"), JoinState::Join);
 
-    QFile testEventHandlerSyncFile;
-    testEventHandlerSyncFile.setFileName(QLatin1String(DATA_DIR) + u'/' + QLatin1String("test-eventhandler-sync.json"));
-    testEventHandlerSyncFile.open(QIODevice::ReadOnly);
-    const auto testEventHandlerSyncJson = QJsonDocument::fromJson(testEventHandlerSyncFile.readAll());
-    SyncRoomData roomData(QStringLiteral("@bob:kde.org"), JoinState::Join, testEventHandlerSyncJson.object());
+    const auto json = QJsonDocument::fromJson(R"EVENT({
+  "account_data": {
+    "events": [
+      {
+        "content": {
+          "tags": {
+            "u.work": {
+              "order": 0.9
+            }
+          }
+        },
+        "type": "m.tag"
+      },
+      {
+        "content": {
+          "custom_config_key": "custom_config_value"
+        },
+        "type": "org.example.custom.room.config"
+      }
+    ]
+  },
+  "ephemeral": {
+    "events": [
+      {
+        "content": {
+          "user_ids": [
+            "@alice:matrix.org",
+            "@bob:example.com"
+          ]
+        },
+        "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
+        "type": "m.typing"
+      },
+      {
+        "content": {
+          "$153456789:example.org": {
+            "m.read": {
+              "@alice:matrix.org": {
+                "ts": 1436451550453
+              }
+            }
+          }
+        },
+        "type": "m.receipt"
+      },
+      {
+        "content": {
+          "$1532735824654:example.org": {
+            "m.read": {
+              "@bob:example.com": {
+                "ts": 1436451550453
+              }
+            }
+          }
+        },
+        "type": "m.receipt"
+      },
+      {
+        "content": {
+          "$1532735824654:example.org": {
+            "m.read": {
+              "@tim:example.com": {
+                "ts": 1436451550454
+              }
+            }
+          }
+        },
+        "type": "m.receipt"
+      },
+      {
+        "content": {
+          "$1532735824654:example.org": {
+            "m.read": {
+              "@jeff:example.com": {
+                "ts": 1436451550455
+              }
+            }
+          }
+        },
+        "type": "m.receipt"
+      },
+      {
+        "content": {
+          "$1532735824654:example.org": {
+            "m.read": {
+              "@tina:example.com": {
+                "ts": 1436451550456
+              }
+            }
+          }
+        },
+        "type": "m.receipt"
+      },
+      {
+        "content": {
+          "$1532735824654:example.org": {
+            "m.read": {
+              "@sally:example.com": {
+                "ts": 1436451550457
+              }
+            }
+          }
+        },
+        "type": "m.receipt"
+      },
+      {
+        "content": {
+          "$1532735824654:example.org": {
+            "m.read": {
+              "@fred:example.com": {
+                "ts": 1436451550458
+              }
+            }
+          }
+        },
+        "type": "m.receipt"
+      }
+    ]
+  },
+  "state": {
+    "events": [
+      {
+        "content": {
+          "avatar_url": "mxc://example.org/SEsfnsuifSDFSSEF",
+          "displayname": "Alice Margatroid",
+          "membership": "join",
+          "reason": "Looking for support"
+        },
+        "event_id": "$143273582443PhrSn:example.org",
+        "origin_server_ts": 1432735824653,
+        "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
+        "sender": "@example:example.org",
+        "state_key": "@alice:example.org",
+        "type": "m.room.member",
+        "unsigned": {
+          "age": 1234
+        }
+      }
+    ]
+  },
+  "summary": {
+    "m.heroes": [
+      "@alice:example.com",
+      "@bob:example.com"
+    ],
+    "m.invited_member_count": 0,
+    "m.joined_member_count": 2
+  },
+  "timeline": {
+    "events": [
+      {
+        "content": {
+          "body": "This is an example\ntext message",
+          "format": "org.matrix.custom.html",
+          "formatted_body": "<b>This is an example<br>text message</b>",
+          "msgtype": "m.text"
+        },
+        "event_id": "$153456789:example.org",
+        "origin_server_ts": 1432735824654,
+        "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
+        "sender": "@example:example.org",
+        "type": "m.room.message",
+        "unsigned": {
+          "age": 1232
+        }
+      },
+      {
+        "content": {
+          "avatar_url": "mxc://kde.org/123456",
+          "displayname": "after",
+          "membership": "join"
+        },
+        "origin_server_ts": 1690651134736,
+        "sender": "@example:example.org",
+        "state_key": "@example:example.org",
+        "type": "m.room.member",
+        "unsigned": {
+          "replaces_state": "$1234567890:example.org",
+          "prev_content": {
+            "avatar_url": "mxc://kde.org/12345",
+            "displayname": "before",
+            "membership": "join"
+          },
+          "prev_sender": "@example:example.orgg",
+          "age": 1234
+        },
+        "event_id": "$143273583553PhrSn:example.org",
+        "room_id": "!jEsUZKDJdhlrceRyVU:example.org"
+      },
+      {
+        "content": {
+          "body": "This is a highlight @bob:kde.org and this is a link https://kde.org",
+          "format": "org.matrix.custom.html",
+          "msgtype": "m.text"
+        },
+        "event_id": "$1532735824654:example.org",
+        "origin_server_ts": 1532735824654,
+        "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
+        "sender": "@example:example.org",
+        "type": "m.room.message",
+        "unsigned": {
+          "age": 1233
+        }
+      },
+      {
+        "content": {
+            "m.relates_to": {
+            "event_id": "$153456789:example.org",
+            "key": "👍",
+            "rel_type": "m.annotation"
+            }
+        },
+        "origin_server_ts": 1690322545182,
+        "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
+        "sender": "@alice:matrix.org",
+        "type": "m.reaction",
+        "unsigned": {
+            "age": 390159120
+        },
+        "event_id": "$163456789:example.org",
+        "age": 390159120
+      },
+      {
+        "age": 4926305285,
+        "content": {
+            "body": "video caption",
+            "filename": "video.mp4",
+            "info": {
+                "duration": 10,
+                "h": 1080,
+                "mimetype": "video/mp4",
+                "size": 62650636,
+                "w": 1920,
+                "thumbnail_info": {
+                    "h": 450,
+                    "mimetype": "image/jpeg",
+                    "size": 382249,
+                    "w": 800
+                },
+                "thumbnail_url": "mxc://kde.org/2234567"
+            },
+            "msgtype": "m.video",
+            "url": "mxc://kde.org/1234567"
+        },
+        "event_id": "$263456789:example.org",
+        "origin_server_ts": 1685793783330,
+        "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
+        "sender": "@example:example.org",
+        "type": "m.room.message",
+        "unsigned": {
+            "age": 4926305285
+        },
+        "user_id": "@example:example.org"
+      },
+      {
+        "content": {
+            "body": "> <@example:example.org> This is an example\ntext message\n\nreply",
+            "format": "org.matrix.custom.html",
+            "formatted_body": "<mx-reply><blockquote><a href=\"https://matrix.to/#/!jEsUZKDJdhlrceRyVU:example.org/$153456789:example.org?via=kde.org&via=matrix.org\">In reply to</a> <a href=\"https://matrix.to/#/@example:example.org\">@example:example.org</a><br><b>This is an example<br>text message</b></blockquote></mx-reply>reply",
+            "m.relates_to": {
+                "m.in_reply_to": {
+                    "event_id": "$153456789:example.org"
+                }
+            },
+            "msgtype": "m.text"
+        },
+        "origin_server_ts": 1690725965572,
+        "sender": "@alice:matrix.org",
+        "type": "m.room.message",
+        "unsigned": {
+            "age": 98
+        },
+        "event_id": "$154456789:example.org",
+        "room_id": "!jEsUZKDJdhlrceRyVU:example.org"
+      },
+      {
+        "content": {
+            "body": "> <@example:example.org> video caption\n\nreply",
+            "m.relates_to": {
+                "m.in_reply_to": {
+                    "event_id": "$263456789:example.org"
+                }
+            },
+            "msgtype": "m.text"
+        },
+        "origin_server_ts": 1690725965573,
+        "sender": "@alice:matrix.org",
+        "type": "m.room.message",
+        "unsigned": {
+            "age": 98
+        },
+        "event_id": "$154456799:example.org",
+        "room_id": "!jEsUZKDJdhlrceRyVU:example.org"
+      },
+      {
+        "age": 96845207,
+        "content": {
+            "body": "Lat: 51.7035, Lon: -1.14394",
+            "geo_uri": "geo:51.7035,-1.14394",
+            "msgtype": "m.location",
+            "org.matrix.msc1767.text": "Lat: 51.7035, Lon: -1.14394",
+            "org.matrix.msc3488.asset": {
+                "type": "m.pin"
+            },
+            "org.matrix.msc3488.location": {
+                "uri": "geo:51.7035,-1.14394"
+            }
+        },
+        "event_id": "$1544567999:example.org",
+        "origin_server_ts": 1690821582876,
+        "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
+        "sender": "@example:example.org",
+        "type": "m.room.message",
+        "unsigned": {
+            "age": 96845207
+        }
+      }
+    ],
+    "limited": true,
+    "prev_batch": "t34-23535_0_0"
+  }
+})EVENT");
+    SyncRoomData roomData(QStringLiteral("@bob:kde.org"), JoinState::Join, json.object());
     room->update(std::move(roomData));
 
     eventHandler.setRoom(room);
@@ -369,29 +686,6 @@ void EventHandlerTest::replyMediaInfo()
     QCOMPARE(thumbnailInfo["height"_ls], 450);
 }
 
-void EventHandlerTest::thread()
-{
-    auto event = room->messageEvents().at(0).get();
-    eventHandler.setEvent(event);
-
-    QCOMPARE(eventHandler.isThreaded(), false);
-    QCOMPARE(eventHandler.threadRoot(), QString());
-
-    event = room->messageEvents().at(9).get();
-    eventHandler.setEvent(event);
-
-    QCOMPARE(eventHandler.isThreaded(), true);
-    QCOMPARE(eventHandler.threadRoot(), QStringLiteral("$threadroot:example.org"));
-    QCOMPARE(eventHandler.getReplyId(), QStringLiteral("$threadroot:example.org"));
-
-    event = room->messageEvents().at(10).get();
-    eventHandler.setEvent(event);
-
-    QCOMPARE(eventHandler.isThreaded(), true);
-    QCOMPARE(eventHandler.threadRoot(), QStringLiteral("$threadroot:example.org"));
-    QCOMPARE(eventHandler.getReplyId(), QStringLiteral("$threadmessage1:example.org"));
-}
-
 void EventHandlerTest::location()
 {
     auto event = room->messageEvents().at(7).get();

doc/CMakeLists.txt

@@ -2,4 +2,4 @@
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-kdoctools_create_manpage(man-neochat.1.docbook 1 INSTALL_DESTINATION ${KDE_INSTALL_MANDIR})
+kdoctools_create_manpage(man-neochat.1.docbook 1 INSTALL_DESTINATION ${MAN_INSTALL_DIR})

org.kde.neochat.appdata.xml

@@ -53,16 +53,13 @@
   <summary xml:lang="eo">Babilu kun viaj amikoj sur matrix</summary>
   <summary xml:lang="es">Charle con sus amigos en matrix</summary>
   <summary xml:lang="eu">Berriketan jardun zure lagunekin «Matrix»en</summary>
-  <summary xml:lang="fi">Keskustelu ystäviesi kanssa Matrixissa</summary>
   <summary xml:lang="fr">Discuter avec vos ami(e)s sur le réseau Matrix</summary>
   <summary xml:lang="gl">Charle coas súas amizades en Matrix.</summary>
-  <summary xml:lang="ia">Starta Conversation conntu amicos sur matrix</summary>
   <summary xml:lang="it">Conversa con i tuoi contatti su matrix</summary>
   <summary xml:lang="ka">ესაუბრეთ მეგობრებს Matrix-ზე</summary>
   <summary xml:lang="ko">Matrix를 사용하여 친구들과 대화하기</summary>
   <summary xml:lang="nl">Met uw vrienden chatten op matrix</summary>
   <summary xml:lang="nn">Prat med vennar på Matrix</summary>
-  <summary xml:lang="pl">Rozmawiaj ze swoimi znajomymi w Matriksie</summary>
   <summary xml:lang="sl">Klepet z vašimi prijatelji na matrixu</summary>
   <summary xml:lang="sv">Chatta med dina vänner på Matrix</summary>
   <summary xml:lang="ta">மேட்ரிக்ஸு மூலம் உங்கள் நண்பர்களிடம் பேசலாம்</summary>
@@ -283,7 +280,7 @@ to provide a convergent experience across multiple platforms.</p>
     <screenshot type="default">
       <image>https://cdn.kde.org/screenshots/neochat/application.png</image>
     </screenshot>
-    <screenshot environment="windows">
+    <screenshot x-kde-os="windows">
       <image>https://cdn.kde.org/screenshots/neochat/NeoChat-Windows-Timeline.png</image>
       <caption>Main view with room list, chat, and room information</caption>
       <caption xml:lang="ar">العرض الرئيسة مع قائمة الغرف والدردشات و معلومات الغرفة</caption>
@@ -295,7 +292,6 @@ to provide a convergent experience across multiple platforms.</p>
       <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="ia">Vista principal con lista de sala, chat e information de sala</caption>
       <caption xml:lang="it">Vista principale con elenco delle stanze, chat e informazioni sulla stanza</caption>
       <caption xml:lang="ka">მთავარი ხედი სურათების სიით, ჩატით და ოთახის ინფორმაციით</caption>
       <caption xml:lang="ko">대화방 목록, 채팅, 대화방 정보가 표시된 주 보기</caption>
@@ -310,7 +306,7 @@ to provide a convergent experience across multiple platforms.</p>
       <caption xml:lang="uk">Головна панель із списком кімнат, спілкуванням та даними щодо кімнати</caption>
       <caption xml:lang="x-test">xxMain view with room list, chat, and room informationxx</caption>
     </screenshot>
-    <screenshot environment="windows">
+    <screenshot x-kde-os="windows">
       <image>https://cdn.kde.org/screenshots/neochat/NeoChat-Windows-Login.png</image>
       <caption>Login screen</caption>
       <caption xml:lang="ar">شاشة الدخول</caption>
@@ -322,7 +318,6 @@ to provide a convergent experience across multiple platforms.</p>
       <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="ia">Schermo de accesso</caption>
       <caption xml:lang="it">Schermata di accesso</caption>
       <caption xml:lang="ka">შესვლის ეკრანი</caption>
       <caption xml:lang="ko">로그인 화면</caption>
@@ -342,7 +337,6 @@ to provide a convergent experience across multiple platforms.</p>
     <content_attribute id="social-chat">intense</content_attribute>
   </content_rating>
   <releases>
-    <release version="23.08.2" date="2023-10-12"/>
     <release version="23.08.0" date="2023-08-24">
       <url>https://kde.org/announcements/gear/23.08.0/#neochathttpsappskdeorgneochat</url>
       <description>

org.kde.neochat.tray.svg

@@ -1,8 +1 @@
-<svg width="22" height="22" viewBox="0 0 22 22" fill="none" xmlns="http://www.w3.org/2000/svg">
-<style type="text/css" id="current-color-scheme">.ColorScheme-Text{color:#232629}</style>
-<path class="ColorScheme-Text" fill-rule="evenodd" clip-rule="evenodd" d="M3 3H19V14H8.68787L4 18.1019V14H3V3ZM4 13H5V15.8981L8.31213 13H18V4H4V13Z" fill="currentColor"/>
-<path class="ColorScheme-Text" fill-rule="evenodd" clip-rule="evenodd" d="M17 15.2929L14.8536 13.1465L14.1465 13.8536L18 17.7071V13.5H17V15.2929Z" fill="currentColor"/>
-<path class="ColorScheme-Text" d="M5 6H15V7H5V6Z" fill="currentColor"/>
-<path class="ColorScheme-Text" d="M5 8H13V9H5V8Z" fill="currentColor"/>
-<path class="ColorScheme-Text" d="M5 10H11V11H5V10Z" fill="currentColor"/>
-</svg>
+<svg width="22" height="22" fill="none" version="1.1" id="svg13" xmlns="http://www.w3.org/2000/svg"><style type="text/css" id="current-color-scheme">.ColorScheme-Text{color:#232629}</style><path class="ColorScheme-Text" style="fill:currentColor;fill-opacity:1;stroke:none" fill-rule="evenodd" clip-rule="evenodd" d="M2 4h18v11H6.681L3 18.067V15H2zm1 10h1v1.933L6.319 14H19V5H3z" id="path3"/><path class="ColorScheme-Text" style="fill:currentColor;fill-opacity:1;stroke:none" id="rect5" d="M4 7h9v1H4z"/><path class="ColorScheme-Text" style="fill:currentColor;fill-opacity:1;stroke:none" id="rect7" d="M4 9h7v1H4z"/><path class="ColorScheme-Text" style="fill:currentColor;fill-opacity:1;stroke:none" id="rect9" d="M4 11h5v1H4z"/><path class="ColorScheme-Text" style="fill:currentColor;fill-opacity:1;stroke:none" fill-rule="evenodd" clip-rule="evenodd" d="m16 15.293-1.147-1.146-.707.707 2.853 2.853V14.5h-1z" id="path11"/></svg>

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

@@ -97,7 +97,7 @@ SPDX-License-Identifier: CC-BY-SA-4.0
 >Vegeu també</title>
   <simplelist>
     <member
->Una llista de les preguntes més freqüents quant a Matrix <ulink url="https://matrix.org/faq/"
+>Una llista de les preguntes més freqüents quan a Matrix <ulink url="https://matrix.org/faq/"
 >https://matrix.org/faq/</ulink
 > </member>
     <member

src/CMakeLists.txt

@@ -40,12 +40,6 @@ add_library(neochat STATIC
     models/userfiltermodel.h
     models/publicroomlistmodel.cpp
     models/publicroomlistmodel.h
-    models/spacechildrenmodel.cpp
-    models/spacechildrenmodel.h
-    models/spacechildsortfiltermodel.cpp
-    models/spacechildsortfiltermodel.h
-    models/spacetreeitem.cpp
-    models/spacetreeitem.h
     models/userdirectorylistmodel.cpp
     models/userdirectorylistmodel.h
     models/pushrulemodel.cpp
@@ -61,8 +55,8 @@ add_library(neochat STATIC
     models/devicesmodel.cpp
     models/devicesmodel.h
     models/devicesproxymodel.cpp
-    filetype.cpp
-    filetype.h
+    filetypesingleton.cpp
+    filetypesingleton.h
     login.cpp
     login.h
     models/webshortcutmodel.cpp
@@ -133,161 +127,6 @@ add_library(neochat STATIC
     mediasizehelper.h
     eventhandler.cpp
     enums/delegatetype.h
-    roomlastmessageprovider.cpp
-    roomlastmessageprovider.h
-    chatbarcache.cpp
-    chatbarcache.h
-)
-
-qt_add_qml_module(neochat URI org.kde.neochat NO_PLUGIN
-    QML_FILES
-        qml/main.qml
-        qml/AccountMenu.qml
-        qml/ExploreComponent.qml
-        qml/ContextMenu.qml
-        qml/CollapsedRoomDelegate.qml
-        qml/RoomDelegate.qml
-        qml/RoomListPage.qml
-        qml/SpaceListContextMenu.qml
-        qml/UserInfo.qml
-        qml/LoadingPage.qml
-        qml/RoomPage.qml
-        qml/RoomWindow.qml
-        qml/JoinRoomPage.qml
-        qml/ManualRoomDialog.qml
-        qml/ExplorerDelegate.qml
-        qml/InviteUserPage.qml
-        qml/StartChatPage.qml
-        qml/ImageEditorPage.qml
-        qml/WelcomePage.qml
-        qml/General.qml
-        qml/Security.qml
-        qml/PushNotification.qml
-        qml/Categories.qml
-        qml/Permissions.qml
-        qml/NeochatMaximizeComponent.qml
-        qml/FancyEffectsContainer.qml
-        qml/TypingPane.qml
-        qml/ShimmerGradient.qml
-        qml/QuickSwitcher.qml
-        qml/HoverActions.qml
-        qml/ChatBox.qml
-        qml/ChatBar.qml
-        qml/AttachmentPane.qml
-        qml/ReplyPane.qml
-        qml/CompletionMenu.qml
-        qml/PieProgressBar.qml
-        qml/QuickFormatBar.qml
-        qml/RoomData.qml
-        qml/ServerData.qml
-        qml/EmojiPicker.qml
-        qml/TimelineDelegate.qml
-        qml/ReplyComponent.qml
-        qml/StateDelegate.qml
-        qml/RichLabel.qml
-        qml/MessageDelegate.qml
-        qml/Bubble.qml
-        qml/SectionDelegate.qml
-        qml/VideoDelegate.qml
-        qml/ReactionDelegate.qml
-        qml/LinkPreviewDelegate.qml
-        qml/AudioDelegate.qml
-        qml/FileDelegate.qml
-        qml/ImageDelegate.qml
-        qml/EncryptedDelegate.qml
-        qml/EventDelegate.qml
-        qml/TextDelegate.qml
-        qml/ReadMarkerDelegate.qml
-        qml/PollDelegate.qml
-        qml/MimeComponent.qml
-        qml/StateComponent.qml
-        qml/MessageEditComponent.qml
-        qml/AvatarFlow.qml
-        qml/LoginStep.qml
-        qml/Login.qml
-        qml/Homeserver.qml
-        qml/Username.qml
-        qml/RegisterPassword.qml
-        qml/Captcha.qml
-        qml/Terms.qml
-        qml/Email.qml
-        qml/Password.qml
-        qml/LoginRegister.qml
-        qml/Loading.qml
-        qml/LoginMethod.qml
-        qml/Sso.qml
-        qml/UserDetailDialog.qml
-        qml/CreateRoomDialog.qml
-        qml/EmojiDialog.qml
-        qml/OpenFileDialog.qml
-        qml/KeyVerificationDialog.qml
-        qml/ConfirmLogoutDialog.qml
-        qml/PowerLevelDialog.qml
-        qml/Message.qml
-        qml/EmojiItem.qml
-        qml/EmojiRow.qml
-        qml/EmojiSas.qml
-        qml/ConfirmDeactivateAccountDialog.qml
-        qml/VerificationCanceled.qml
-        qml/GlobalMenu.qml
-        qml/EditMenu.qml
-        qml/MessageDelegateContextMenu.qml
-        qml/FileDelegateContextMenu.qml
-        qml/MessageSourceSheet.qml
-        qml/ReportSheet.qml
-        qml/SettingsPage.qml
-        qml/ThemeRadioButton.qml
-        qml/ColorScheme.qml
-        qml/GeneralSettingsPage.qml
-        qml/EmoticonsPage.qml
-        qml/EmoticonEditorPage.qml
-        qml/EmoticonFormCard.qml
-        qml/GlobalNotificationsPage.qml
-        qml/NotificationRuleItem.qml
-        qml/AppearanceSettingsPage.qml
-        qml/AccountsPage.qml
-        qml/AccountEditorPage.qml
-        qml/DevicesPage.qml
-        qml/DeviceDelegate.qml
-        qml/DevicesCard.qml
-        qml/About.qml
-        qml/AboutKDE.qml
-        qml/SonnetConfigPage.qml
-        qml/NetworkProxyPage.qml
-        qml/DevtoolsPage.qml
-        qml/ConfirmEncryptionDialog.qml
-        qml/RemoveSheet.qml
-        qml/BanSheet.qml
-        qml/EmojiTonesPicker.qml
-        qml/EmojiDelegate.qml
-        qml/EmojiGrid.qml
-        qml/SearchPage.qml
-        qml/LocationDelegate.qml
-        qml/LocationChooser.qml
-        qml/TimelineView.qml
-        qml/InvitationView.qml
-        qml/AvatarTabButton.qml
-        qml/SpaceDrawer.qml
-        qml/OsmLocationPlugin.qml
-        qml/LiveLocationDelegate.qml
-        qml/FullScreenMap.qml
-        qml/LocationsPage.qml
-        qml/LocationMapItem.qml
-        qml/RoomDrawer.qml
-        qml/RoomDrawerPage.qml
-        qml/DirectChatDrawerHeader.qml
-        qml/GroupChatDrawerHeader.qml
-        qml/RoomInformation.qml
-        qml/RoomMedia.qml
-        qml/ChooseRoomDialog.qml
-        qml/ShareAction.qml
-        qml/SpaceHomePage.qml
-        qml/SpaceHierarchyDelegate.qml
-        qml/RemoveChildDialog.qml
-        qml/SelectParentDialog.qml
-    RESOURCES
-        qml/confetti.png
-        qml/glowdot.png
 )
 
 ecm_qt_declare_logging_category(neochat
@@ -308,6 +147,7 @@ ecm_qt_declare_logging_category(neochat
 
 add_executable(neochat-app
     main.cpp
+    res.qrc
 )
 
 if(TARGET Qt::WebView)
@@ -333,19 +173,21 @@ if(NOT ANDROID)
     else()
         target_sources(neochat PRIVATE trayicon.cpp trayicon.h)
     endif()
-    target_link_libraries(neochat PUBLIC KF6::ConfigWidgets KF6::WindowSystem ICU::uc)
+    target_link_libraries(neochat PUBLIC KF6::ConfigWidgets KF6::WindowSystem)
     target_compile_definitions(neochat PUBLIC -DHAVE_COLORSCHEME)
     target_compile_definitions(neochat PUBLIC -DHAVE_WINDOWSYSTEM)
-    target_compile_definitions(neochat PUBLIC -DHAVE_ICU)
 endif()
 
 if (NOT ANDROID AND NOT WIN32 AND NOT APPLE)
+    target_sources(neochat-app PRIVATE res_desktop.qrc)
     target_compile_definitions(neochat PUBLIC -DHAVE_RUNNER)
     target_compile_definitions(neochat PUBLIC -DHAVE_X11)
     target_sources(neochat PRIVATE runner.cpp)
+else()
+    target_sources(neochat-app PRIVATE res_android.qrc)
 endif()
 
-target_include_directories(neochat PRIVATE ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/models ${CMAKE_CURRENT_SOURCE_DIR}/enums)
+target_include_directories(neochat PRIVATE ${CMAKE_BINARY_DIR})
 target_link_libraries(neochat PUBLIC Qt::Core Qt::Quick Qt::Qml Qt::Gui Qt::Multimedia Qt::Network Qt::QuickControls2 KF6::I18n KF6::Kirigami2 KF6::Notifications KF6::ConfigCore KF6::ConfigGui KF6::CoreAddons KF6::SonnetCore  KF6::ItemModels QuotientQt6 cmark::cmark QCoro::Core)
 
 kconfig_add_kcfg_files(neochat GENERATE_MOC neochatconfig.kcfgc)
@@ -432,7 +274,6 @@ if(ANDROID)
         "preferences-desktop-notification"
         "computer-symbolic"
         "gps"
-        "system-users-symbolic"
     )
 else()
     target_link_libraries(neochat PUBLIC Qt::Widgets KF6::KIOWidgets)

src/actionshandler.cpp

@@ -35,35 +35,48 @@ void ActionsHandler::setRoom(NeoChatRoom *room)
     }
 
     m_room = room;
+    Q_EMIT roomChanged();
 }
 
-void ActionsHandler::handleMessageEvent(ChatBarCache *chatBarCache)
+void ActionsHandler::handleNewMessage()
 {
-    if (!chatBarCache) {
-        return;
-    }
-
-    checkEffects(chatBarCache->text());
-    if (!chatBarCache->attachmentPath().isEmpty()) {
-        QUrl url(chatBarCache->attachmentPath());
+    checkEffects(m_room->chatBoxText());
+    if (!m_room->chatBoxAttachmentPath().isEmpty()) {
+        QUrl url(m_room->chatBoxAttachmentPath());
         auto path = url.isLocalFile() ? url.toLocalFile() : url.toString();
-        m_room->uploadFile(QUrl(path), chatBarCache->text().isEmpty() ? path.mid(path.lastIndexOf(u'/') + 1) : chatBarCache->text());
-        chatBarCache->setAttachmentPath({});
-        chatBarCache->setText({});
+        m_room->uploadFile(QUrl(path), m_room->chatBoxText().isEmpty() ? path.mid(path.lastIndexOf(u'/') + 1) : m_room->chatBoxText());
+        m_room->setChatBoxAttachmentPath({});
+        m_room->setChatBoxText({});
         return;
     }
 
-    QString handledText = chatBarCache->text();
-    handledText = handleMentions(handledText, chatBarCache->mentions());
-    handleMessage(m_room->mainCache()->text(), handledText, chatBarCache);
+    QString handledText = m_room->chatBoxText();
+    handledText = handleMentions(handledText);
+    handleMessage(m_room->chatBoxText(), handledText);
 }
 
-QString ActionsHandler::handleMentions(QString handledText, QList<Mention> *mentions)
+void ActionsHandler::handleEdit()
+{
+    checkEffects(m_room->editText());
+
+    QString handledText = m_room->editText();
+    handledText = handleMentions(handledText, true);
+    handleMessage(m_room->editText(), handledText, true);
+}
+
+QString ActionsHandler::handleMentions(QString handledText, const bool &isEdit)
 {
     if (!m_room) {
         return QString();
     }
 
+    QVector<Mention> *mentions;
+    if (isEdit) {
+        mentions = m_room->editMentions();
+    } else {
+        mentions = m_room->mentions();
+    }
+
     std::sort(mentions->begin(), mentions->end(), [](const auto &a, const auto &b) -> bool {
         return a.cursor.anchor() > b.cursor.anchor();
     });
@@ -81,7 +94,7 @@ QString ActionsHandler::handleMentions(QString handledText, QList<Mention> *ment
     return handledText;
 }
 
-void ActionsHandler::handleMessage(const QString &text, QString handledText, ChatBarCache *chatBarCache)
+void ActionsHandler::handleMessage(const QString &text, QString handledText, const bool &isEdit)
 {
     if (NeoChatConfig::allowQuickEdit()) {
         QRegularExpression sed(QStringLiteral("^s/([^/]*)/([^/]*)(/g)?$"));
@@ -121,7 +134,7 @@ void ActionsHandler::handleMessage(const QString &text, QString handledText, Cha
         for (const auto &action : ActionsModel::instance().allActions()) {
             if (handledText.indexOf(action.prefix) == 1
                 && (handledText.indexOf(" "_ls) == action.prefix.length() + 1 || handledText.length() == action.prefix.length() + 1)) {
-                handledText = action.handle(handledText.mid(action.prefix.length() + 1).trimmed(), m_room, chatBarCache);
+                handledText = action.handle(handledText.mid(action.prefix.length() + 1).trimmed(), m_room);
                 if (action.messageType.has_value()) {
                     messageType = *action.messageType;
                 }
@@ -148,7 +161,7 @@ void ActionsHandler::handleMessage(const QString &text, QString handledText, Cha
         return;
     }
 
-    m_room->postMessage(text, handledText, messageType, chatBarCache->replyId(), chatBarCache->editId(), chatBarCache->threadId());
+    m_room->postMessage(text, handledText, messageType, m_room->chatBoxReplyId(), isEdit ? m_room->chatBoxEditId() : QString());
 }
 
 void ActionsHandler::checkEffects(const QString &text)

src/actionshandler.h

@@ -4,11 +4,9 @@
 #pragma once
 
 #include <QObject>
-#include <QQmlEngine>
 
 #include <Quotient/events/roommessageevent.h>
 
-#include "chatbarcache.h"
 #include "neochatroom.h"
 
 class NeoChatRoom;
@@ -34,31 +32,38 @@ class NeoChatRoom;
 class ActionsHandler : public QObject
 {
     Q_OBJECT
-    QML_ELEMENT
-    QML_UNCREATABLE("")
-
-public:
-    explicit ActionsHandler(QObject *parent = nullptr);
 
     /**
      * @brief The room that messages will be sent to.
      */
+    Q_PROPERTY(NeoChatRoom *room READ room WRITE setRoom NOTIFY roomChanged)
+
+public:
+    explicit ActionsHandler(QObject *parent = nullptr);
+
     [[nodiscard]] NeoChatRoom *room() const;
     void setRoom(NeoChatRoom *room);
 
 Q_SIGNALS:
+    void roomChanged();
     void showEffect(const QString &effect);
 
 public Q_SLOTS:
+
     /**
-     * @brief Pre-process text and send message event.
+     * @brief Pre-process text and send message.
      */
-    void handleMessageEvent(ChatBarCache *chatBarCache);
+    void handleNewMessage();
+
+    /**
+     * @brief Pre-process text and send edit.
+     */
+    void handleEdit();
 
 private:
     NeoChatRoom *m_room = nullptr;
     void checkEffects(const QString &text);
 
-    QString handleMentions(QString handledText, QList<Mention> *mentions);
-    void handleMessage(const QString &text, QString handledText, ChatBarCache *chatBarCache);
+    QString handleMentions(QString handledText, const bool &isEdit = false);
+    void handleMessage(const QString &text, QString handledText, const bool &isEdit = false);
 };

src/chatbarcache.cpp

@@ -1,175 +0,0 @@
-// SPDX-FileCopyrightText: 2023 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 "chatbarcache.h"
-
-#include "eventhandler.h"
-#include "neochatroom.h"
-
-ChatBarCache::ChatBarCache(QObject *parent)
-    : QObject(parent)
-{
-}
-
-QString ChatBarCache::text() const
-{
-    return m_text;
-}
-
-void ChatBarCache::setText(const QString &text)
-{
-    if (text == m_text) {
-        return;
-    }
-    m_text = text;
-    Q_EMIT textChanged();
-}
-
-bool ChatBarCache::isReplying() const
-{
-    return m_relationType == Reply && !m_relationId.isEmpty();
-}
-
-QString ChatBarCache::replyId() const
-{
-    if (m_relationType != Reply) {
-        return {};
-    }
-    return m_relationId;
-}
-
-void ChatBarCache::setReplyId(const QString &replyId)
-{
-    if (m_relationType == Reply && m_relationId == replyId) {
-        return;
-    }
-    m_relationId = replyId;
-    if (m_relationId.isEmpty()) {
-        m_relationType = None;
-    } else {
-        m_relationType = Reply;
-    }
-    m_attachmentPath = QString();
-    Q_EMIT relationIdChanged();
-    Q_EMIT attachmentPathChanged();
-}
-
-bool ChatBarCache::isEditing() const
-{
-    return m_relationType == Edit && !m_relationId.isEmpty();
-}
-
-QString ChatBarCache::editId() const
-{
-    if (m_relationType != Edit) {
-        return {};
-    }
-    return m_relationId;
-}
-
-void ChatBarCache::setEditId(const QString &editId)
-{
-    if (m_relationType == Edit && m_relationId == editId) {
-        return;
-    }
-    m_relationId = editId;
-    if (m_relationId.isEmpty()) {
-        m_relationType = None;
-    } else {
-        m_relationType = Edit;
-    }
-    m_attachmentPath = QString();
-    Q_EMIT relationIdChanged();
-    Q_EMIT attachmentPathChanged();
-}
-
-QVariantMap ChatBarCache::relationUser() const
-{
-    if (parent() == nullptr) {
-        qWarning() << "ChatBarCache created with no parent, a NeoChatRoom must be set as the parent on creation.";
-        return {};
-    }
-    auto room = dynamic_cast<NeoChatRoom *>(parent());
-    if (room == nullptr) {
-        qWarning() << "ChatBarCache created with incorrect parent, a NeoChatRoom must be set as the parent on creation.";
-        return {};
-    }
-    if (m_relationId.isEmpty()) {
-        return room->getUser(nullptr);
-    }
-    return room->getUser(room->user((*room->findInTimeline(m_relationId))->senderId()));
-}
-
-QString ChatBarCache::relationMessage() const
-{
-    if (parent() == nullptr) {
-        qWarning() << "ChatBarCache created with no parent, a NeoChatRoom must be set as the parent on creation.";
-        return {};
-    }
-    if (m_relationId.isEmpty()) {
-        return {};
-    }
-    auto room = dynamic_cast<NeoChatRoom *>(parent());
-    if (room == nullptr) {
-        qWarning() << "ChatBarCache created with incorrect parent, a NeoChatRoom must be set as the parent on creation.";
-        return {};
-    }
-    EventHandler eventhandler;
-    eventhandler.setRoom(room);
-    if (auto event = room->findInTimeline(m_relationId); event != room->historyEdge()) {
-        eventhandler.setEvent(&**event);
-        return eventhandler.getPlainBody();
-    }
-    return {};
-}
-
-bool ChatBarCache::isThreaded() const
-{
-    return !m_threadId.isEmpty();
-}
-
-QString ChatBarCache::threadId() const
-{
-    return m_threadId;
-}
-
-void ChatBarCache::setThreadId(const QString &threadId)
-{
-    if (m_threadId == threadId) {
-        return;
-    }
-    m_threadId = threadId;
-    Q_EMIT threadIdChanged();
-}
-
-QString ChatBarCache::attachmentPath() const
-{
-    return m_attachmentPath;
-}
-
-void ChatBarCache::setAttachmentPath(const QString &attachmentPath)
-{
-    if (attachmentPath == m_attachmentPath) {
-        return;
-    }
-    m_attachmentPath = attachmentPath;
-    m_relationType = None;
-    m_relationId = QString();
-    Q_EMIT attachmentPathChanged();
-    Q_EMIT relationIdChanged();
-}
-
-QList<Mention> *ChatBarCache::mentions()
-{
-    return &m_mentions;
-}
-
-QString ChatBarCache::savedText() const
-{
-    return m_savedText;
-}
-
-void ChatBarCache::setSavedText(const QString &savedText)
-{
-    m_savedText = savedText;
-}

src/chatbarcache.h

@@ -1,201 +0,0 @@
-// SPDX-FileCopyrightText: 2023 James Graham <james.h.graham@protonmail.com>
-// SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
-
-#pragma once
-
-#include <QObject>
-#include <QQmlEngine>
-#include <QTextCursor>
-
-/**
- * @brief Defines a user mention in the current chat or edit text.
- */
-struct Mention {
-    QTextCursor cursor; /**< Contains the mention's text and position in the text.  */
-    QString text; /**< The inserted text of the mention. */
-    int start = 0; /**< Start position of the mention. */
-    int position = 0; /**< End position of the mention. */
-    QString id; /**< The id the mention (used to create link when sending the message). */
-};
-
-/**
- * @class ChatBarCache
- *
- * 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.
- *
- * 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
- * have a separate cache for each chat bar.
- *
- * @note The NeoChatRoom which this component is created in is expected to be set
- *       as it's parent. This is necessary for certain functions which need to get
- *       relevant room information.
- *
- * @sa ChatBar, MessageEditComponent, NeoChatRoom
- */
-class ChatBarCache : public QObject
-{
-    Q_OBJECT
-    QML_ELEMENT
-    QML_UNCREATABLE("")
-
-    /**
-     * @brief The text in the chat bar.
-     *
-     * Due to problems with QTextDocument, unlike the other properties here,
-     * text is *not* used to store the text when switching rooms.
-     */
-    Q_PROPERTY(QString text READ text WRITE setText NOTIFY textChanged)
-
-    /**
-     * @brief Whether the chat bar is currently replying to a message.
-     */
-    Q_PROPERTY(bool isReplying READ isReplying NOTIFY relationIdChanged)
-
-    /**
-     * @brief The Matrix message ID of an event being replied to, if any.
-     *
-     * Will return empty if the RelationType is currently set to None or Edit.
-     *
-     * @note Replying, editing and attachments are exclusive so setting this will
-     *       clear an edit or attachment.
-     *
-     * @sa RelationType
-     */
-    Q_PROPERTY(QString replyId READ replyId WRITE setReplyId NOTIFY relationIdChanged)
-
-    /**
-     * @brief Whether the chat bar is currently editing a message.
-     */
-    Q_PROPERTY(bool isEditing READ isEditing NOTIFY relationIdChanged)
-
-    /**
-     * @brief The Matrix message ID of an event being edited, if any.
-     *
-     * Will return empty if the RelationType is currently set to None or Reply.
-     *
-     * @note Replying, editing and attachments are exclusive so setting this will
-     *       clear an reply or attachment.
-     *
-     * @sa RelationType
-     */
-    Q_PROPERTY(QString editId READ editId WRITE setEditId NOTIFY relationIdChanged)
-
-    /**
-     * @brief Get the user 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 user if not replying to a message.
-     *
-     * The user QVariantMap has the following properties:
-     *  - isLocalUser - Whether the user is the local user.
-     *  - id - The matrix ID of the user.
-     *  - displayName - Display name in the context of this room.
-     *  - avatarSource - The mxc URL for the user's avatar in the current room.
-     *  - avatarMediaId - Avatar id in the context of this room.
-     *  - color - Color for the user.
-     *  - object - The Quotient::User object for the user.
-     *
-     * @sa getUser, Quotient::User
-     */
-    Q_PROPERTY(QVariantMap relationUser READ relationUser NOTIFY relationIdChanged)
-
-    /**
-     * @brief The content of the related message.
-     *
-     * Will be QString() if no related message.
-     */
-    Q_PROPERTY(QString relationMessage READ relationMessage NOTIFY relationIdChanged)
-
-    /**
-     * @brief Whether the chat bar is replying in a thread.
-     */
-    Q_PROPERTY(bool isThreaded READ isThreaded NOTIFY threadIdChanged)
-
-    /**
-     * @brief The Matrix message ID of thread root event, if any.
-     */
-    Q_PROPERTY(QString threadId READ threadId WRITE setThreadId NOTIFY threadIdChanged)
-
-    /**
-     * @brief The local path for a file to send, if any.
-     *
-     * @note Replying, editing and attachments are exclusive so setting this will
-     *       clear an edit or reply.
-     */
-    Q_PROPERTY(QString attachmentPath READ attachmentPath WRITE setAttachmentPath NOTIFY attachmentPathChanged)
-
-public:
-    /**
-     * @brief Describes the type of relation which relationId can refer to.
-     *
-     * A chat bar can only be relating to a single message at a time making these
-     * exclusive.
-     */
-    enum RelationType {
-        Reply, /**< The current relation is a message being replied to. */
-        Edit, /**< The current relation is a message being edited. */
-        None, /**< There is currently no relation event */
-    };
-    Q_ENUM(RelationType)
-
-    explicit ChatBarCache(QObject *parent = nullptr);
-
-    QString text() const;
-    void setText(const QString &text);
-
-    bool isReplying() const;
-    QString replyId() const;
-    void setReplyId(const QString &replyId);
-
-    bool isEditing() const;
-    QString editId() const;
-    void setEditId(const QString &editId);
-
-    QVariantMap relationUser() const;
-
-    QString relationMessage() const;
-
-    bool isThreaded() const;
-    QString threadId() const;
-    void setThreadId(const QString &threadId);
-
-    QString attachmentPath() const;
-    void setAttachmentPath(const QString &attachmentPath);
-
-    /**
-     * @brief Retrieve the mentions for the current chat bar text.
-     */
-    QList<Mention> *mentions();
-
-    /**
-     * @brief Get the saved chat bar text.
-     */
-    QString savedText() const;
-
-    /**
-     * @brief Save the chat bar text.
-     */
-    void setSavedText(const QString &savedText);
-
-Q_SIGNALS:
-    void textChanged();
-    void relationIdChanged();
-    void threadIdChanged();
-    void attachmentPathChanged();
-
-private:
-    QString m_text = QString();
-    QString m_relationId = QString();
-    RelationType m_relationType = RelationType::None;
-    QString m_threadId = QString();
-    QString m_attachmentPath = QString();
-    QList<Mention> m_mentions;
-    QString m_savedText;
-};

src/chatdocumenthandler.cpp

@@ -57,12 +57,11 @@ public:
                 setFormat(error.first, error.second.size(), errorFormat);
             }
         }
-        auto handler = dynamic_cast<ChatDocumentHandler *>(parent());
-        auto room = handler->room();
+        auto room = dynamic_cast<ChatDocumentHandler *>(parent())->room();
         if (!room) {
             return;
         }
-        auto mentions = handler->chatBarCache()->mentions();
+        auto mentions = room->mentions();
         mentions->erase(std::remove_if(mentions->begin(),
                                        mentions->end(),
                                        [this](auto &mention) {
@@ -104,10 +103,15 @@ ChatDocumentHandler::ChatDocumentHandler(QObject *parent)
         m_completionModel->setRoom(m_room);
         static QPointer<NeoChatRoom> previousRoom = nullptr;
         if (previousRoom) {
-            disconnect(m_chatBarCache, &ChatBarCache::textChanged, this, nullptr);
+            disconnect(previousRoom, &NeoChatRoom::chatBoxTextChanged, this, nullptr);
+            disconnect(previousRoom, &NeoChatRoom::editTextChanged, this, nullptr);
         }
         previousRoom = m_room;
-        connect(m_chatBarCache, &ChatBarCache::textChanged, this, [this]() {
+        connect(m_room, &NeoChatRoom::chatBoxTextChanged, this, [this]() {
+            int start = completionStartIndex();
+            m_completionModel->setText(getText().mid(start, cursorPosition() - start), getText().mid(start));
+        });
+        connect(m_room, &NeoChatRoom::editTextChanged, this, [this]() {
             int start = completionStartIndex();
             m_completionModel->setText(getText().mid(start, cursorPosition() - start), getText().mid(start));
         });
@@ -211,20 +215,6 @@ void ChatDocumentHandler::setRoom(NeoChatRoom *room)
     Q_EMIT roomChanged();
 }
 
-ChatBarCache *ChatDocumentHandler::chatBarCache() const
-{
-    return m_chatBarCache;
-}
-
-void ChatDocumentHandler::setChatBarCache(ChatBarCache *chatBarCache)
-{
-    if (m_chatBarCache == chatBarCache) {
-        return;
-    }
-    m_chatBarCache = chatBarCache;
-    Q_EMIT chatBarCacheChanged();
-}
-
 void ChatDocumentHandler::complete(int index)
 {
     if (m_completionModel->autoCompletionType() == CompletionModel::User) {
@@ -313,7 +303,11 @@ QString ChatDocumentHandler::getText() const
     if (!m_room) {
         return QString();
     }
-    return m_chatBarCache->text();
+    if (m_isEdit) {
+        return m_room->editText();
+    } else {
+        return m_room->chatBoxText();
+    }
 }
 
 void ChatDocumentHandler::pushMention(const Mention mention) const
@@ -321,7 +315,11 @@ void ChatDocumentHandler::pushMention(const Mention mention) const
     if (!m_room) {
         return;
     }
-    m_chatBarCache->mentions()->push_back(mention);
+    if (m_isEdit) {
+        m_room->editMentions()->push_back(mention);
+    } else {
+        m_room->mentions()->push_back(mention);
+    }
 }
 
 QColor ChatDocumentHandler::mentionColor() const

src/chatdocumenthandler.h

@@ -4,11 +4,9 @@
 #pragma once
 
 #include <QObject>
-#include <QQmlEngine>
 #include <QQuickTextDocument>
 #include <QTextCursor>
 
-#include "chatbarcache.h"
 #include "models/completionmodel.h"
 #include "neochatroom.h"
 
@@ -60,7 +58,6 @@ class SyntaxHighlighter;
 class ChatDocumentHandler : public QObject
 {
     Q_OBJECT
-    QML_ELEMENT
 
     /**
      * @brief Is the instance being used to handle an edit message.
@@ -103,11 +100,6 @@ class ChatDocumentHandler : public QObject
      */
     Q_PROPERTY(NeoChatRoom *room READ room WRITE setRoom NOTIFY roomChanged)
 
-    /**
-     * @brief The cache for the chat bar the text document is being handled for.
-     */
-    Q_PROPERTY(ChatBarCache *chatBarCache READ chatBarCache WRITE setChatBarCache NOTIFY chatBarCacheChanged)
-
     /**
      * @brief The color to highlight user mentions.
      */
@@ -139,9 +131,6 @@ public:
     [[nodiscard]] NeoChatRoom *room() const;
     void setRoom(NeoChatRoom *room);
 
-    [[nodiscard]] ChatBarCache *chatBarCache() const;
-    void setChatBarCache(ChatBarCache *chatBarCache);
-
     Q_INVOKABLE void complete(int index);
 
     void updateCompletions();
@@ -158,7 +147,6 @@ Q_SIGNALS:
     void documentChanged();
     void cursorPositionChanged();
     void roomChanged();
-    void chatBarCacheChanged();
     void completionModelChanged();
     void selectionStartChanged();
     void selectionEndChanged();
@@ -173,7 +161,6 @@ private:
     QPointer<QQuickTextDocument> m_document;
 
     QPointer<NeoChatRoom> m_room;
-    QPointer<ChatBarCache> m_chatBarCache;
     bool completionVisible = false;
 
     QColor m_mentionColor;

src/clipboard.h

@@ -4,7 +4,6 @@
 #pragma once
 
 #include <QObject>
-#include <QQmlEngine>
 
 class QClipboard;
 class QImage;
@@ -19,8 +18,6 @@ class QImage;
 class Clipboard : public QObject
 {
     Q_OBJECT
-    QML_ELEMENT
-    QML_SINGLETON
 
     /**
      * @brief Whether the current clipboard content is an image.

src/colorschemer.h

@@ -4,7 +4,6 @@
 #pragma once
 
 #include <QObject>
-#include <QQmlEngine>
 
 class QAbstractItemModel;
 class KColorSchemeManager;
@@ -20,8 +19,6 @@ class KColorSchemeManager;
 class ColorSchemer : public QObject
 {
     Q_OBJECT
-    QML_ELEMENT
-    QML_SINGLETON
 
     /**
      * @brief A QAbstractItemModel of all available color schemes.

src/controller.h

@@ -5,7 +5,6 @@
 
 #include "models/pushrulemodel.h"
 #include <QObject>
-#include <QQmlEngine>
 #include <QQuickItem>
 
 #include <KFormat>
@@ -41,8 +40,6 @@ class ReadPasswordJob;
 class Controller : public QObject
 {
     Q_OBJECT
-    QML_ELEMENT
-    QML_SINGLETON
 
     /**
      * @brief The current connection for the rest of NeoChat to use.
@@ -93,11 +90,6 @@ public:
     Q_ENUM(PasswordStatus)
 
     static Controller &instance();
-    static Controller *create(QQmlEngine *engine, QJSEngine *)
-    {
-        engine->setObjectOwnership(&instance(), QQmlEngine::CppOwnership);
-        return &instance();
-    }
 
     void setActiveConnection(NeoChatConnection *connection);
     [[nodiscard]] NeoChatConnection *activeConnection() const;

src/delegatesizehelper.h

@@ -4,7 +4,6 @@
 #pragma once
 
 #include <QObject>
-#include <QQmlEngine>
 
 /**
  * @class DelegateSizeHelper
@@ -24,7 +23,6 @@
 class DelegateSizeHelper : public QObject
 {
     Q_OBJECT
-    QML_ELEMENT
 
     /**
      * @brief The width of the component's parent.

src/enums/delegatetype.h

@@ -4,18 +4,15 @@
 #pragma once
 
 #include <QObject>
-#include <QQmlEngine>
 
 /**
  * @class DelegateType
  *
  * This class is designed to define the DelegateType enumeration.
  */
-class DelegateType : public QObject
+class DelegateType
 {
-    Q_OBJECT
-    QML_ELEMENT
-    QML_UNCREATABLE("")
+    Q_GADGET
 
 public:
     /**

src/eventhandler.cpp

@@ -901,28 +901,6 @@ QVariantMap EventHandler::getReplyMediaInfo() const
     return getMediaInfoForEvent(replyPtr);
 }
 
-bool EventHandler::isThreaded() const
-{
-    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));
-}
-
-QString EventHandler::threadRoot() const
-{
-    // 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();
-    }
-    // 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();
-    }
-    return {};
-}
-
 float EventHandler::getLatitude() const
 {
     const auto geoUri = m_event->contentJson()["geo_uri"_ls].toString();
@@ -1008,5 +986,3 @@ QString EventHandler::getReadMarkersString() const
     readMarkersString.chop(2);
     return readMarkersString;
 }
-
-#include "moc_eventhandler.cpp"

src/eventhandler.h

@@ -326,20 +326,6 @@ public:
      */
     QVariantMap getReplyMediaInfo() const;
 
-    /**
-     * @brief Whether the message is part of a thread.
-     *
-     * i.e. There is a rel_type of m.thread.
-     */
-    bool isThreaded() const;
-
-    /**
-     * @brief Return the Matrix ID of the thread's root message.
-     *
-     * Empty if this not part of a thread.
-     */
-    QString threadRoot() const;
-
     /**
      * @brief Return the latitude for the event.
      *

src/events/imagepackevent.h

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <QList>
+#include <QVector>
 #include <Quotient/events/eventcontent.h>
 #include <Quotient/events/stateevent.h>
 
@@ -60,7 +60,7 @@ public:
      *
      * @sa ImagePackImage
      */
-    QList<ImagePackEventContent::ImagePackImage> images;
+    QVector<ImagePackEventContent::ImagePackImage> images;
 
     explicit ImagePackEventContent(const QJsonObject &o);
 

src/filetype.cpp

@@ -1,116 +0,0 @@
-// SPDX-FileCopyrightText: 2021 Noah Davis <noahadvs@gmail.com>
-// SPDX-License-Identifier: LicenseRef-KDE-Accepted-LGPL
-
-#include "filetype.h"
-#include <QImageReader>
-#include <QMovie>
-
-static QStringList byteArrayListToStringList(const QByteArrayList &byteArrayList)
-{
-    QStringList stringList;
-    for (const QByteArray &byteArray : byteArrayList) {
-        stringList.append(QString::fromLocal8Bit(byteArray));
-    }
-    return stringList;
-}
-
-class FileTypePrivate
-{
-    Q_DECLARE_PUBLIC(FileType)
-    Q_DISABLE_COPY(FileTypePrivate)
-public:
-    FileTypePrivate(FileType *qq);
-    FileType *const q_ptr;
-    QMimeDatabase mimetypeDatabase;
-    QStringList supportedImageFormats = byteArrayListToStringList(QImageReader::supportedImageFormats());
-    QStringList supportedAnimatedImageFormats = byteArrayListToStringList(QMovie::supportedFormats());
-};
-
-FileTypePrivate::FileTypePrivate(FileType *qq)
-    : q_ptr(qq)
-{
-}
-
-FileType::FileType(QObject *parent)
-    : QObject(parent)
-    , d_ptr(new FileTypePrivate(this))
-{
-}
-
-FileType::~FileType() noexcept
-{
-}
-
-QMimeType FileType::mimeTypeForName(const QString &nameOrAlias) const
-{
-    Q_D(const FileType);
-    return d->mimetypeDatabase.mimeTypeForName(nameOrAlias);
-}
-
-QMimeType FileType::mimeTypeForFile(const QString &fileName, MatchMode mode) const
-{
-    Q_D(const FileType);
-    return d->mimetypeDatabase.mimeTypeForFile(fileName, static_cast<QMimeDatabase::MatchMode>(mode));
-}
-
-QMimeType FileType::mimeTypeForFile(const QFileInfo &fileInfo, MatchMode mode) const
-{
-    Q_D(const FileType);
-    return d->mimetypeDatabase.mimeTypeForFile(fileInfo, static_cast<QMimeDatabase::MatchMode>(mode));
-}
-
-QList<QMimeType> FileType::mimeTypesForFileName(const QString &fileName) const
-{
-    Q_D(const FileType);
-    return d->mimetypeDatabase.mimeTypesForFileName(fileName);
-}
-
-QMimeType FileType::mimeTypeForData(const QByteArray &data) const
-{
-    Q_D(const FileType);
-    return d->mimetypeDatabase.mimeTypeForData(data);
-}
-
-QMimeType FileType::mimeTypeForData(QIODevice *device) const
-{
-    Q_D(const FileType);
-    return d->mimetypeDatabase.mimeTypeForData(device);
-}
-
-QMimeType FileType::mimeTypeForUrl(const QUrl &url) const
-{
-    Q_D(const FileType);
-    return d->mimetypeDatabase.mimeTypeForUrl(url);
-}
-
-QMimeType FileType::mimeTypeForFileNameAndData(const QString &fileName, QIODevice *device) const
-{
-    Q_D(const FileType);
-    return d->mimetypeDatabase.mimeTypeForFileNameAndData(fileName, device);
-}
-
-QMimeType FileType::mimeTypeForFileNameAndData(const QString &fileName, const QByteArray &data) const
-{
-    Q_D(const FileType);
-    return d->mimetypeDatabase.mimeTypeForFileNameAndData(fileName, data);
-}
-
-QString FileType::suffixForFileName(const QString &fileName) const
-{
-    Q_D(const FileType);
-    return d->mimetypeDatabase.suffixForFileName(fileName);
-}
-
-QStringList FileType::supportedImageFormats() const
-{
-    Q_D(const FileType);
-    return d->supportedImageFormats;
-}
-
-QStringList FileType::supportedAnimatedImageFormats() const
-{
-    Q_D(const FileType);
-    return d->supportedAnimatedImageFormats;
-}
-
-#include "moc_filetype.cpp"

src/filetypesingleton.cpp

@@ -0,0 +1,116 @@
+// SPDX-FileCopyrightText: 2021 Noah Davis <noahadvs@gmail.com>
+// SPDX-License-Identifier: LicenseRef-KDE-Accepted-LGPL
+
+#include "filetypesingleton.h"
+#include <QImageReader>
+#include <QMovie>
+
+static QStringList byteArrayListToStringList(const QByteArrayList &byteArrayList)
+{
+    QStringList stringList;
+    for (const QByteArray &byteArray : byteArrayList) {
+        stringList.append(QString::fromLocal8Bit(byteArray));
+    }
+    return stringList;
+}
+
+class FileTypeSingletonPrivate
+{
+    Q_DECLARE_PUBLIC(FileTypeSingleton)
+    Q_DISABLE_COPY(FileTypeSingletonPrivate)
+public:
+    FileTypeSingletonPrivate(FileTypeSingleton *qq);
+    FileTypeSingleton *const q_ptr;
+    QMimeDatabase mimetypeDatabase;
+    QStringList supportedImageFormats = byteArrayListToStringList(QImageReader::supportedImageFormats());
+    QStringList supportedAnimatedImageFormats = byteArrayListToStringList(QMovie::supportedFormats());
+};
+
+FileTypeSingletonPrivate::FileTypeSingletonPrivate(FileTypeSingleton *qq)
+    : q_ptr(qq)
+{
+}
+
+FileTypeSingleton::FileTypeSingleton(QObject *parent)
+    : QObject(parent)
+    , d_ptr(new FileTypeSingletonPrivate(this))
+{
+}
+
+FileTypeSingleton::~FileTypeSingleton() noexcept
+{
+}
+
+QMimeType FileTypeSingleton::mimeTypeForName(const QString &nameOrAlias) const
+{
+    Q_D(const FileTypeSingleton);
+    return d->mimetypeDatabase.mimeTypeForName(nameOrAlias);
+}
+
+QMimeType FileTypeSingleton::mimeTypeForFile(const QString &fileName, MatchMode mode) const
+{
+    Q_D(const FileTypeSingleton);
+    return d->mimetypeDatabase.mimeTypeForFile(fileName, static_cast<QMimeDatabase::MatchMode>(mode));
+}
+
+QMimeType FileTypeSingleton::mimeTypeForFile(const QFileInfo &fileInfo, MatchMode mode) const
+{
+    Q_D(const FileTypeSingleton);
+    return d->mimetypeDatabase.mimeTypeForFile(fileInfo, static_cast<QMimeDatabase::MatchMode>(mode));
+}
+
+QList<QMimeType> FileTypeSingleton::mimeTypesForFileName(const QString &fileName) const
+{
+    Q_D(const FileTypeSingleton);
+    return d->mimetypeDatabase.mimeTypesForFileName(fileName);
+}
+
+QMimeType FileTypeSingleton::mimeTypeForData(const QByteArray &data) const
+{
+    Q_D(const FileTypeSingleton);
+    return d->mimetypeDatabase.mimeTypeForData(data);
+}
+
+QMimeType FileTypeSingleton::mimeTypeForData(QIODevice *device) const
+{
+    Q_D(const FileTypeSingleton);
+    return d->mimetypeDatabase.mimeTypeForData(device);
+}
+
+QMimeType FileTypeSingleton::mimeTypeForUrl(const QUrl &url) const
+{
+    Q_D(const FileTypeSingleton);
+    return d->mimetypeDatabase.mimeTypeForUrl(url);
+}
+
+QMimeType FileTypeSingleton::mimeTypeForFileNameAndData(const QString &fileName, QIODevice *device) const
+{
+    Q_D(const FileTypeSingleton);
+    return d->mimetypeDatabase.mimeTypeForFileNameAndData(fileName, device);
+}
+
+QMimeType FileTypeSingleton::mimeTypeForFileNameAndData(const QString &fileName, const QByteArray &data) const
+{
+    Q_D(const FileTypeSingleton);
+    return d->mimetypeDatabase.mimeTypeForFileNameAndData(fileName, data);
+}
+
+QString FileTypeSingleton::suffixForFileName(const QString &fileName) const
+{
+    Q_D(const FileTypeSingleton);
+    return d->mimetypeDatabase.suffixForFileName(fileName);
+}
+
+QStringList FileTypeSingleton::supportedImageFormats() const
+{
+    Q_D(const FileTypeSingleton);
+    return d->supportedImageFormats;
+}
+
+QStringList FileTypeSingleton::supportedAnimatedImageFormats() const
+{
+    Q_D(const FileTypeSingleton);
+    return d->supportedAnimatedImageFormats;
+}
+
+#include "moc_filetypesingleton.cpp"

src/filetypesingleton.h

@@ -8,10 +8,9 @@
 #include <QFileInfo>
 #include <QMimeDatabase>
 #include <QObject>
-#include <QQmlEngine>
 #include <qqml.h>
 
-class FileTypePrivate;
+class FileTypeSingletonPrivate;
 
 /**
  * @class FileTypeSingleton
@@ -20,11 +19,9 @@ class FileTypePrivate;
  *
  * @sa QMimeDatabase
  */
-class FileType : public QObject
+class FileTypeSingleton : public QObject
 {
     Q_OBJECT
-    QML_ELEMENT
-    QML_SINGLETON
 
     /**
      * @brief List of supported image formats.
@@ -40,9 +37,12 @@ class FileType : public QObject
      */
     Q_PROPERTY(QStringList supportedAnimatedImageFormats READ supportedAnimatedImageFormats CONSTANT FINAL)
 
+    QML_NAMED_ELEMENT(FileType)
+    QML_SINGLETON
+
 public:
-    explicit FileType(QObject *parent = nullptr);
-    ~FileType();
+    explicit FileTypeSingleton(QObject *parent = nullptr);
+    ~FileTypeSingleton();
 
     /**
      * @brief Returns a MIME type for nameOrAlias or an invalid one if none found.
@@ -59,14 +59,14 @@ public:
      *
      * @sa QMimeDatabase
      */
-    Q_INVOKABLE QMimeType mimeTypeForFile(const QString &fileName, FileType::MatchMode mode = MatchDefault) const;
+    Q_INVOKABLE QMimeType mimeTypeForFile(const QString &fileName, FileTypeSingleton::MatchMode mode = MatchDefault) const;
 
     /**
      * @brief Returns a MIME type for fileInfo.
      *
      * @sa QMimeDatabase
      */
-    Q_INVOKABLE QMimeType mimeTypeForFile(const QFileInfo &fileInfo, FileType::MatchMode mode = MatchDefault) const;
+    Q_INVOKABLE QMimeType mimeTypeForFile(const QFileInfo &fileInfo, FileTypeSingleton::MatchMode mode = MatchDefault) const;
 
     /**
      * @brief Returns the MIME types for the file name fileName.
@@ -121,7 +121,9 @@ public:
     QStringList supportedAnimatedImageFormats() const;
 
 private:
-    const QScopedPointer<FileTypePrivate> d_ptr;
-    Q_DECLARE_PRIVATE(FileType)
-    Q_DISABLE_COPY(FileType)
+    const QScopedPointer<FileTypeSingletonPrivate> d_ptr;
+    Q_DECLARE_PRIVATE(FileTypeSingleton)
+    Q_DISABLE_COPY(FileTypeSingleton)
 };
+
+QML_DECLARE_TYPE(FileTypeSingleton)

src/linkpreviewer.h

@@ -4,7 +4,6 @@
 #pragma once
 
 #include <QObject>
-#include <QQmlEngine>
 #include <QUrl>
 
 class NeoChatRoom;
@@ -20,8 +19,6 @@ class NeoChatRoom;
 class LinkPreviewer : public QObject
 {
     Q_OBJECT
-    QML_ELEMENT
-
     /**
      * @brief The URL to get the preview for.
      */

src/locationhelper.h

@@ -2,18 +2,14 @@
 // SPDX-License-Identifier: LGPL-2.0-or-later
 #pragma once
 
+#include "linkpreviewer.h"
 #include <QMetaType>
-#include <QObject>
-#include <QQmlEngine>
 #include <QRectF>
 
 /** Location related helper functions for QML. */
-class LocationHelper : public QObject
+class LocationHelper
 {
-    Q_OBJECT
-    QML_ELEMENT
-    QML_SINGLETON
-
+    Q_GADGET
 public:
     /** Unite two rectanlges. */
     Q_INVOKABLE static QRectF unite(const QRectF &r1, const QRectF &r2);

src/logger.cpp

@@ -212,7 +212,7 @@ void filter(QLoggingCategory *category)
 
 void initLogging()
 {
-    e2eeDebugEnabled = QLoggingCategory("quotient.e2ee", QtInfoMsg).isEnabled(QtDebugMsg);
+    e2eeDebugEnabled = QLoggingCategory("quotient.e2ee", QtDebugMsg).isEnabled(QtDebugMsg);
     oldCategoryFilter = QLoggingCategory::installFilter(filter);
     oldHandler = qInstallMessageHandler(messageHandler);
     sInstance->setOrigHandler(oldHandler);

src/login.cpp

@@ -13,13 +13,13 @@
 
 using namespace Quotient;
 
-LoginHelper::LoginHelper(QObject *parent)
+Login::Login(QObject *parent)
     : QObject(parent)
 {
     init();
 }
 
-void LoginHelper::init()
+void Login::init()
 {
     m_homeserverReachable = false;
     m_connection = new NeoChatConnection();
@@ -31,7 +31,7 @@ void LoginHelper::init()
     m_supportsPassword = false;
     m_ssoUrl = QUrl();
 
-    connect(this, &LoginHelper::matrixIdChanged, this, [this]() {
+    connect(this, &Login::matrixIdChanged, this, [this]() {
         setHomeserverReachable(false);
         QRegularExpression validator(QStringLiteral("^\\@?[a-zA-Z0-9\\._=\\-/]+\\:[a-zA-Z0-9\\-]+(\\.[a-zA-Z0-9\\-]+)*(\\:[0-9]+)?$"));
         if (!validator.match(m_matrixId).hasMatch()) {
@@ -105,23 +105,23 @@ void LoginHelper::init()
     });
 }
 
-void LoginHelper::setHomeserverReachable(bool reachable)
+void Login::setHomeserverReachable(bool reachable)
 {
     m_homeserverReachable = reachable;
     Q_EMIT homeserverReachableChanged();
 }
 
-bool LoginHelper::homeserverReachable() const
+bool Login::homeserverReachable() const
 {
     return m_homeserverReachable;
 }
 
-QString LoginHelper::matrixId() const
+QString Login::matrixId() const
 {
     return m_matrixId;
 }
 
-void LoginHelper::setMatrixId(const QString &matrixId)
+void Login::setMatrixId(const QString &matrixId)
 {
     m_matrixId = matrixId;
     if (!m_matrixId.startsWith(QLatin1Char('@'))) {
@@ -130,30 +130,30 @@ void LoginHelper::setMatrixId(const QString &matrixId)
     Q_EMIT matrixIdChanged();
 }
 
-QString LoginHelper::password() const
+QString Login::password() const
 {
     return m_password;
 }
 
-void LoginHelper::setPassword(const QString &password)
+void Login::setPassword(const QString &password)
 {
     setInvalidPassword(false);
     m_password = password;
     Q_EMIT passwordChanged();
 }
 
-QString LoginHelper::deviceName() const
+QString Login::deviceName() const
 {
     return m_deviceName;
 }
 
-void LoginHelper::setDeviceName(const QString &deviceName)
+void Login::setDeviceName(const QString &deviceName)
 {
     m_deviceName = deviceName;
     Q_EMIT deviceNameChanged();
 }
 
-void LoginHelper::login()
+void Login::login()
 {
     m_isLoggingIn = true;
     Q_EMIT isLoggingInChanged();
@@ -164,22 +164,22 @@ void LoginHelper::login()
     m_connection->loginWithPassword(username, m_password, m_deviceName, QString());
 }
 
-bool LoginHelper::supportsPassword() const
+bool Login::supportsPassword() const
 {
     return m_supportsPassword;
 }
 
-bool LoginHelper::supportsSso() const
+bool Login::supportsSso() const
 {
     return m_supportsSso;
 }
 
-QUrl LoginHelper::ssoUrl() const
+QUrl Login::ssoUrl() const
 {
     return m_ssoUrl;
 }
 
-void LoginHelper::loginWithSso()
+void Login::loginWithSso()
 {
     m_connection->resolveServer(m_matrixId);
     connectSingleShot(m_connection, &Connection::loginFlowsChanged, this, [this]() {
@@ -189,28 +189,28 @@ void LoginHelper::loginWithSso()
     });
 }
 
-bool LoginHelper::testing() const
+bool Login::testing() const
 {
     return m_testing;
 }
 
-bool LoginHelper::isLoggingIn() const
+bool Login::isLoggingIn() const
 {
     return m_isLoggingIn;
 }
 
-bool LoginHelper::isLoggedIn() const
+bool Login::isLoggedIn() const
 {
     return m_isLoggedIn;
 }
 
-void LoginHelper::setInvalidPassword(bool invalid)
+void Login::setInvalidPassword(bool invalid)
 {
     m_invalidPassword = invalid;
     Q_EMIT isInvalidPasswordChanged();
 }
 
-bool LoginHelper::isInvalidPassword() const
+bool Login::isInvalidPassword() const
 {
     return m_invalidPassword;
 }

src/login.h

@@ -4,21 +4,18 @@
 #pragma once
 
 #include <QObject>
-#include <QQmlEngine>
 #include <QUrl>
 
 class NeoChatConnection;
 
 /**
- * @class LoginHelper
+ * @class Login
  *
  * A helper class for logging into a Matrix account.
  */
-class LoginHelper : public QObject
+class Login : public QObject
 {
     Q_OBJECT
-    QML_ELEMENT
-    QML_SINGLETON
 
     /**
      * @brief Whether the home server for the account is reachable.
@@ -79,7 +76,7 @@ class LoginHelper : public QObject
     Q_PROPERTY(bool isInvalidPassword READ isInvalidPassword NOTIFY isInvalidPasswordChanged)
 
 public:
-    explicit LoginHelper(QObject *parent = nullptr);
+    explicit Login(QObject *parent = nullptr);
 
     Q_INVOKABLE void init();
 

src/main.cpp

@@ -34,25 +34,74 @@
 
 #include "neochat-version.h"
 
+#include <Quotient/accountregistry.h>
+#include <Quotient/keyverificationsession.h>
 #include <Quotient/networkaccessmanager.h>
+#include <Quotient/room.h>
+#include <Quotient/user.h>
 #include <Quotient/util.h>
 
+#include "actionshandler.h"
 #include "blurhashimageprovider.h"
+#include "chatdocumenthandler.h"
+#include "clipboard.h"
 #include "controller.h"
+#include "delegatesizehelper.h"
+#include "enums/delegatetype.h"
+#include "filetypesingleton.h"
+#include "linkpreviewer.h"
+#include "locationhelper.h"
 #include "logger.h"
+#include "login.h"
 #include "matriximageprovider.h"
+#include "mediasizehelper.h"
+#include "models/accountemoticonmodel.h"
+#include "models/customemojimodel.h"
+#include "models/devicesmodel.h"
+#include "models/devicesproxymodel.h"
+#include "models/emojimodel.h"
+#include "models/emoticonfiltermodel.h"
+#include "models/imagepacksmodel.h"
+#include "models/livelocationsmodel.h"
+#include "models/locationsmodel.h"
+#include "models/mediamessagefiltermodel.h"
+#include "models/messageeventmodel.h"
+#include "models/messagefiltermodel.h"
+#include "models/publicroomlistmodel.h"
+#include "models/pushrulemodel.h"
+#include "models/reactionmodel.h"
+#include "models/roomlistmodel.h"
+#include "models/searchmodel.h"
+#include "models/serverlistmodel.h"
+#include "models/sortfilterroomlistmodel.h"
+#include "models/sortfilterspacelistmodel.h"
+#include "models/statefiltermodel.h"
+#include "models/stickermodel.h"
+#include "models/userdirectorylistmodel.h"
+#include "models/userfiltermodel.h"
+#include "models/userlistmodel.h"
+#include "models/webshortcutmodel.h"
 #include "neochatconfig.h"
+#include "neochatconnection.h"
+#include "neochatroom.h"
+#include "notificationsmanager.h"
+#include "pollhandler.h"
 #include "roommanager.h"
+#include "spacehierarchycache.h"
+#include "urlhelper.h"
 #include "windowcontroller.h"
 
 #ifdef HAVE_COLORSCHEME
 #include "colorschemer.h"
 #endif
+#include "models/completionmodel.h"
+#include "models/statemodel.h"
 
 #ifdef HAVE_RUNNER
 #include "runner.h"
 #include <QDBusConnection>
 #endif
+#include "registration.h"
 
 #ifdef Q_OS_WINDOWS
 #include <Windows.h>
@@ -60,8 +109,6 @@
 
 using namespace Quotient;
 
-void qml_register_types_org_kde_neochat();
-
 class NetworkAccessManagerFactory : public QQmlNetworkAccessManagerFactory
 {
     QNetworkAccessManager *create(QObject *) override
@@ -168,18 +215,95 @@ int main(int argc, char *argv[])
                 QStringLiteral("/var/config/fontconfig/conf.d/99-noto-mono-color-emoji.conf"));
 #endif
 
+    Clipboard clipboard;
+    auto config = NeoChatConfig::self();
+    FileTypeSingleton fileTypeSingleton;
+
+    Login *login = new Login();
+    UrlHelper urlHelper;
+
 #ifdef HAVE_COLORSCHEME
     ColorSchemer colorScheme;
-    if (!NeoChatConfig::self()->colorScheme().isEmpty()) {
-        colorScheme.apply(NeoChatConfig::self()->colorScheme());
+    qmlRegisterSingletonInstance<ColorSchemer>("org.kde.neochat", 1, 0, "ColorSchemer", &colorScheme);
+    if (!config->colorScheme().isEmpty()) {
+        colorScheme.apply(config->colorScheme());
     }
 #endif
 
-    qml_register_types_org_kde_neochat();
-    qmlRegisterSingletonInstance("org.kde.neochat.config", 1, 0, "Config", NeoChatConfig::self());
-    qmlRegisterSingletonInstance("org.kde.neochat.accounts", 1, 0, "AccountRegistry", &Controller::instance().accounts());
+    qmlRegisterSingletonInstance("org.kde.neochat", 1, 0, "Controller", &Controller::instance());
+    qmlRegisterSingletonInstance("org.kde.neochat", 1, 0, "NotificationsManager", &NotificationsManager::instance());
+    qmlRegisterSingletonInstance("org.kde.neochat", 1, 0, "Clipboard", &clipboard);
+    qmlRegisterSingletonInstance("org.kde.neochat", 1, 0, "Config", config);
+    qmlRegisterSingletonInstance("org.kde.neochat", 1, 0, "RoomManager", &RoomManager::instance());
+    qmlRegisterSingletonInstance("org.kde.neochat", 1, 0, "FileType", &fileTypeSingleton);
+    qmlRegisterSingletonInstance("org.kde.neochat", 1, 0, "LoginHelper", login);
+    qmlRegisterSingletonInstance("org.kde.neochat", 1, 0, "UrlHelper", &urlHelper);
+    qmlRegisterSingletonInstance("org.kde.neochat", 1, 0, "EmojiModel", &EmojiModel::instance());
+    qmlRegisterSingletonInstance("org.kde.neochat", 1, 0, "AccountRegistry", &Controller::instance().accounts());
+    qmlRegisterSingletonInstance("org.kde.neochat", 1, 0, "SpaceHierarchyCache", &SpaceHierarchyCache::instance());
+    qmlRegisterSingletonInstance("org.kde.neochat", 1, 0, "CustomEmojiModel", &CustomEmojiModel::instance());
+    qmlRegisterSingletonInstance("org.kde.neochat", 1, 0, "Registration", &Registration::instance());
+    qmlRegisterType<ActionsHandler>("org.kde.neochat", 1, 0, "ActionsHandler");
+    qmlRegisterType<ChatDocumentHandler>("org.kde.neochat", 1, 0, "ChatDocumentHandler");
+    qmlRegisterType<RoomListModel>("org.kde.neochat", 1, 0, "RoomListModel");
+    qmlRegisterType<KWebShortcutModel>("org.kde.neochat", 1, 0, "WebShortcutModel");
+    qmlRegisterType<UserListModel>("org.kde.neochat", 1, 0, "UserListModel");
+    qmlRegisterType<MessageEventModel>("org.kde.neochat", 1, 0, "MessageEventModel");
+    qmlRegisterType<ReactionModel>("org.kde.neochat", 1, 0, "ReactionModel");
+    qmlRegisterType<MediaMessageFilterModel>("org.kde.neochat", 1, 0, "MediaMessageFilterModel");
+    qmlRegisterType<MessageFilterModel>("org.kde.neochat", 1, 0, "MessageFilterModel");
+    qmlRegisterType<UserFilterModel>("org.kde.neochat", 1, 0, "UserFilterModel");
+    qmlRegisterType<PublicRoomListModel>("org.kde.neochat", 1, 0, "PublicRoomListModel");
+    qmlRegisterType<UserDirectoryListModel>("org.kde.neochat", 1, 0, "UserDirectoryListModel");
+    qmlRegisterType<ServerListModel>("org.kde.neochat", 1, 0, "ServerListModel");
+    qmlRegisterType<SortFilterRoomListModel>("org.kde.neochat", 1, 0, "SortFilterRoomListModel");
+    qmlRegisterType<SortFilterSpaceListModel>("org.kde.neochat", 1, 0, "SortFilterSpaceListModel");
+    qmlRegisterType<DevicesModel>("org.kde.neochat", 1, 0, "DevicesModel");
+    qmlRegisterType<DevicesProxyModel>("org.kde.neochat", 1, 0, "DevicesProxyModel");
+    qmlRegisterType<LinkPreviewer>("org.kde.neochat", 1, 0, "LinkPreviewer");
+    qmlRegisterType<CompletionModel>("org.kde.neochat", 1, 0, "CompletionModel");
+    qmlRegisterType<StateModel>("org.kde.neochat", 1, 0, "StateModel");
+    qmlRegisterType<StateFilterModel>("org.kde.neochat", 1, 0, "StateFilterModel");
+    qmlRegisterType<SearchModel>("org.kde.neochat", 1, 0, "SearchModel");
+    qmlRegisterType<LiveLocationsModel>("org.kde.neochat", 1, 0, "LiveLocationsModel");
+    qmlRegisterType<LocationsModel>("org.kde.neochat", 1, 0, "LocationsModel");
+    qmlRegisterType<PollHandler>("org.kde.neochat", 1, 0, "PollHandler");
+    qmlRegisterType<PushRuleModel>("org.kde.neochat", 1, 0, "PushRuleModel");
+    qmlRegisterType<StickerModel>("org.kde.neochat", 1, 0, "StickerModel");
+    qmlRegisterType<ImagePacksModel>("org.kde.neochat", 1, 0, "ImagePacksModel");
+    qmlRegisterType<AccountEmoticonModel>("org.kde.neochat", 1, 0, "AccountEmoticonModel");
+    qmlRegisterType<EmoticonFilterModel>("org.kde.neochat", 1, 0, "EmoticonFilterModel");
+    qmlRegisterType<DelegateSizeHelper>("org.kde.neochat", 1, 0, "DelegateSizeHelper");
+    qmlRegisterType<MediaSizeHelper>("org.kde.neochat", 1, 0, "MediaSizeHelper");
+    qmlRegisterUncreatableType<DelegateType>("org.kde.neochat", 1, 0, "DelegateType", "ENUM"_ls);
+    qmlRegisterUncreatableType<PushNotificationKind>("org.kde.neochat", 1, 0, "PushNotificationKind", "ENUM"_ls);
+    qmlRegisterUncreatableType<PushNotificationSection>("org.kde.neochat", 1, 0, "PushNotificationSection", "ENUM"_ls);
+    qmlRegisterUncreatableType<PushNotificationState>("org.kde.neochat", 1, 0, "PushNotificationState", "ENUM"_ls);
+    qmlRegisterUncreatableType<PushNotificationAction>("org.kde.neochat", 1, 0, "PushNotificationAction", "ENUM"_ls);
+    qmlRegisterUncreatableType<NeoChatRoomType>("org.kde.neochat", 1, 0, "NeoChatRoomType", "ENUM"_ls);
+    qmlRegisterUncreatableType<User>("org.kde.neochat", 1, 0, "User", {});
+    qmlRegisterUncreatableType<NeoChatRoom>("org.kde.neochat", 1, 0, "NeoChatRoom", {});
+    qmlRegisterUncreatableType<NeoChatConnection>("org.kde.neochat", 1, 0, "NeoChatConnection", {});
 
-    qmlRegisterUncreatableType<KeyVerificationSession>("com.github.quotient_im.libquotient", 1, 0, "KeyVerificationSession", {});
+    qRegisterMetaType<User *>("User*");
+    qRegisterMetaType<User *>("const User*");
+    qRegisterMetaType<User *>("const Quotient::User*");
+    qRegisterMetaType<Room *>("Room*");
+    qRegisterMetaType<MessageEventType>("MessageEventType");
+    qRegisterMetaType<NeoChatRoom *>("NeoChatRoom*");
+    qRegisterMetaType<User *>("User*");
+    qRegisterMetaType<GetRoomEventsJob *>("GetRoomEventsJob*");
+    qRegisterMetaType<QMimeType>("QMimeType");
+    qRegisterMetaType<KeyVerificationSession *>("KeyVerificationSession*");
+    qmlRegisterUncreatableType<KeyVerificationSession>("org.kde.neochat", 1, 0, "KeyVerificationSession", {});
+    qRegisterMetaType<QVector<EmojiEntry>>("QVector<EmojiEntry>");
+    qmlRegisterSingletonType("org.kde.neochat", 1, 0, "About", [](QQmlEngine *engine, QJSEngine *) -> QJSValue {
+        return engine->toScriptValue(KAboutData::applicationData());
+    });
+    qmlRegisterSingletonType(QUrl("qrc:/OsmLocationPlugin.qml"_ls), "org.kde.neochat", 1, 0, "OsmLocationPlugin");
+    qmlRegisterSingletonType("org.kde.neochat", 1, 0, "LocationHelper", [](QQmlEngine *engine, QJSEngine *) -> QJSValue {
+        return engine->toScriptValue(LocationHelper());
+    });
 
     QQmlApplicationEngine engine;
 
@@ -230,7 +354,7 @@ int main(int argc, char *argv[])
     engine.addImageProvider(QLatin1String("mxc"), new MatrixImageProvider);
     engine.addImageProvider(QLatin1String("blurhash"), new BlurhashImageProvider);
 
-    engine.load(QUrl(QStringLiteral("qrc:/org/kde/neochat/qml/main.qml")));
+    engine.load(QUrl(QStringLiteral("qrc:/main.qml")));
     if (engine.rootObjects().isEmpty()) {
         return -1;
     }

src/mediasizehelper.h

@@ -4,7 +4,6 @@
 #pragma once
 
 #include <QObject>
-#include <QQmlEngine>
 #include <QSize>
 
 /**
@@ -29,7 +28,6 @@
 class MediaSizeHelper : public QObject
 {
     Q_OBJECT
-    QML_ELEMENT
 
     /**
      * @brief The maximum width (in px) the media can be.

src/models/accountemoticonmodel.h

@@ -7,10 +7,9 @@
 
 #include <QAbstractListModel>
 #include <QCoroTask>
-#include <QList>
 #include <QObject>
 #include <QPointer>
-#include <QQmlEngine>
+#include <QVector>
 
 #include <Quotient/connection.h>
 
@@ -24,8 +23,6 @@
 class AccountEmoticonModel : public QAbstractListModel
 {
     Q_OBJECT
-    QML_ELEMENT
-
     /**
      * @brief The connection to get emoticons from.
      */

src/models/actionsmodel.cpp

@@ -3,7 +3,6 @@
 
 #include "actionsmodel.h"
 
-#include "chatbarcache.h"
 #include "controller.h"
 #include "neochatroom.h"
 #include "roommanager.h"
@@ -20,7 +19,7 @@ QStringList rainbowColors{"#ff2b00"_ls, "#ff5500"_ls, "#ff8000"_ls, "#ffaa00"_ls
                           "#00d4ff"_ls, "#00aaff"_ls, "#007fff"_ls, "#0055ff"_ls, "#002bff"_ls, "#0000ff"_ls, "#2a00ff"_ls, "#5500ff"_ls, "#7f00ff"_ls,
                           "#aa00ff"_ls, "#d400ff"_ls, "#ff00ff"_ls, "#ff00d4"_ls, "#ff00aa"_ls, "#ff0080"_ls, "#ff0055"_ls, "#ff002b"_ls, "#ff0000"_ls};
 
-auto leaveRoomLambda = [](const QString &text, NeoChatRoom *room, ChatBarCache *) {
+auto leaveRoomLambda = [](const QString &text, NeoChatRoom *room) {
     if (text.isEmpty()) {
         Q_EMIT room->showMessage(NeoChatRoom::Info, i18n("Leaving this room."));
         room->connection()->leaveRoom(room);
@@ -46,7 +45,7 @@ auto leaveRoomLambda = [](const QString &text, NeoChatRoom *room, ChatBarCache *
     return QString();
 };
 
-auto roomNickLambda = [](const QString &text, NeoChatRoom *room, ChatBarCache *) {
+auto roomNickLambda = [](const QString &text, NeoChatRoom *room) {
     if (text.isEmpty()) {
         Q_EMIT room->showMessage(NeoChatRoom::Error, i18n("No new nickname provided, no changes will happen."));
     } else {
@@ -55,10 +54,10 @@ auto roomNickLambda = [](const QString &text, NeoChatRoom *room, ChatBarCache *)
     return QString();
 };
 
-QList<ActionsModel::Action> actions{
+QVector<ActionsModel::Action> actions{
     Action{
         QStringLiteral("shrug"),
-        [](const QString &message, NeoChatRoom *, ChatBarCache *) {
+        [](const QString &message, NeoChatRoom *) {
             return QStringLiteral("¯\\\\_(ツ)_/¯ %1").arg(message);
         },
         true,
@@ -68,7 +67,7 @@ QList<ActionsModel::Action> actions{
     },
     Action{
         QStringLiteral("lenny"),
-        [](const QString &message, NeoChatRoom *, ChatBarCache *) {
+        [](const QString &message, NeoChatRoom *) {
             return QStringLiteral("( ͡° ͜ʖ ͡°) %1").arg(message);
         },
         true,
@@ -78,7 +77,7 @@ QList<ActionsModel::Action> actions{
     },
     Action{
         QStringLiteral("tableflip"),
-        [](const QString &message, NeoChatRoom *, ChatBarCache *) {
+        [](const QString &message, NeoChatRoom *) {
             return QStringLiteral("(╯°□°）╯︵ ┻━┻ %1").arg(message);
         },
         true,
@@ -88,7 +87,7 @@ QList<ActionsModel::Action> actions{
     },
     Action{
         QStringLiteral("unflip"),
-        [](const QString &message, NeoChatRoom *, ChatBarCache *) {
+        [](const QString &message, NeoChatRoom *) {
             return QStringLiteral("┬──┬ ノ( ゜-゜ノ) %1").arg(message);
         },
         true,
@@ -98,7 +97,7 @@ QList<ActionsModel::Action> actions{
     },
     Action{
         QStringLiteral("rainbow"),
-        [](const QString &text, NeoChatRoom *room, ChatBarCache *chatBarCache) {
+        [](const QString &text, NeoChatRoom *room) {
             QString rainbowText;
             for (int i = 0; i < text.length(); i++) {
                 rainbowText += QStringLiteral("<font color='%2'>%3</font>").arg(rainbowColors[i % rainbowColors.length()], text.at(i));
@@ -107,8 +106,8 @@ QList<ActionsModel::Action> actions{
             room->postMessage(QStringLiteral("/rainbow %1").arg(text),
                               rainbowText,
                               RoomMessageEvent::MsgType::Text,
-                              chatBarCache->replyId(),
-                              chatBarCache->editId());
+                              room->chatBoxReplyId(),
+                              room->chatBoxEditId());
             return QString();
         },
         false,
@@ -118,7 +117,7 @@ QList<ActionsModel::Action> actions{
     },
     Action{
         QStringLiteral("rainbowme"),
-        [](const QString &text, NeoChatRoom *room, ChatBarCache *chatBarCache) {
+        [](const QString &text, NeoChatRoom *room) {
             QString rainbowText;
             for (int i = 0; i < text.length(); i++) {
                 rainbowText += QStringLiteral("<font color='%2'>%3</font>").arg(rainbowColors[i % rainbowColors.length()], text.at(i));
@@ -127,8 +126,8 @@ QList<ActionsModel::Action> actions{
             room->postMessage(QStringLiteral("/rainbow %1").arg(text),
                               rainbowText,
                               RoomMessageEvent::MsgType::Emote,
-                              chatBarCache->replyId(),
-                              chatBarCache->editId());
+                              room->chatBoxReplyId(),
+                              room->chatBoxEditId());
             return QString();
         },
         false,
@@ -138,7 +137,7 @@ QList<ActionsModel::Action> actions{
     },
     Action{
         QStringLiteral("plain"),
-        [](const QString &text, NeoChatRoom *room, ChatBarCache *) {
+        [](const QString &text, NeoChatRoom *room) {
             room->postMessage(text, text.toHtmlEscaped(), RoomMessageEvent::MsgType::Text, {}, {});
             return QString();
         },
@@ -149,13 +148,13 @@ QList<ActionsModel::Action> actions{
     },
     Action{
         QStringLiteral("spoiler"),
-        [](const QString &text, NeoChatRoom *room, ChatBarCache *chatBarCache) {
+        [](const QString &text, NeoChatRoom *room) {
             // Ideally, we would just return rainbowText and let that do the rest, but the colors don't survive markdownToHTML.
             room->postMessage(QStringLiteral("/spoiler %1").arg(text),
                               QStringLiteral("<span data-mx-spoiler>%1</span>").arg(text),
                               RoomMessageEvent::MsgType::Text,
-                              chatBarCache->replyId(),
-                              chatBarCache->editId());
+                              room->chatBoxReplyId(),
+                              room->chatBoxEditId());
             return QString();
         },
         false,
@@ -165,7 +164,7 @@ QList<ActionsModel::Action> actions{
     },
     Action{
         QStringLiteral("me"),
-        [](const QString &text, NeoChatRoom *, ChatBarCache *) {
+        [](const QString &text, NeoChatRoom *) {
             return text;
         },
         true,
@@ -175,7 +174,7 @@ QList<ActionsModel::Action> actions{
     },
     Action{
         QStringLiteral("notice"),
-        [](const QString &text, NeoChatRoom *, ChatBarCache *) {
+        [](const QString &text, NeoChatRoom *) {
             return text;
         },
         true,
@@ -185,7 +184,7 @@ QList<ActionsModel::Action> actions{
     },
     Action{
         QStringLiteral("invite"),
-        [](const QString &text, NeoChatRoom *room, ChatBarCache *) {
+        [](const QString &text, NeoChatRoom *room) {
             static const QRegularExpression mxidRegex(
                 QStringLiteral(R"((^|[][[:space:](){}`'";])([!#@][-a-z0-9_=#/.]{1,252}:\w(?:\w|\.|-)*\.\w+(?::\d{1,5})?))"));
             auto regexMatch = mxidRegex.match(text);
@@ -221,7 +220,7 @@ QList<ActionsModel::Action> actions{
     },
     Action{
         QStringLiteral("join"),
-        [](const QString &text, NeoChatRoom *room, ChatBarCache *) {
+        [](const QString &text, NeoChatRoom *room) {
             QRegularExpression roomRegex(QStringLiteral(R"(^[#!][^:]+:\w(?:\w|\.|-)*\.\w+(?::\d{1,5})?)"));
             auto regexMatch = roomRegex.match(text);
             if (!regexMatch.hasMatch()) {
@@ -245,7 +244,7 @@ QList<ActionsModel::Action> actions{
     },
     Action{
         QStringLiteral("knock"),
-        [](const QString &text, NeoChatRoom *room, ChatBarCache *) {
+        [](const QString &text, NeoChatRoom *room) {
             auto parts = text.split(QLatin1String(" "));
             QString roomName = parts[0];
             QRegularExpression roomRegex(QStringLiteral(R"(^[#!][^:]+:\w(?:\w|\.|-)*\.\w+(?::\d{1,5})?)"));
@@ -277,7 +276,7 @@ QList<ActionsModel::Action> actions{
     },
     Action{
         QStringLiteral("j"),
-        [](const QString &text, NeoChatRoom *room, ChatBarCache *) {
+        [](const QString &text, NeoChatRoom *room) {
             QRegularExpression roomRegex(QStringLiteral(R"(^[#!][^:]+:\w(?:\w|\.|-)*\.\w+(?::\d{1,5})?)"));
             auto regexMatch = roomRegex.match(text);
             if (!regexMatch.hasMatch()) {
@@ -316,7 +315,7 @@ QList<ActionsModel::Action> actions{
     },
     Action{
         QStringLiteral("nick"),
-        [](const QString &text, NeoChatRoom *room, ChatBarCache *) {
+        [](const QString &text, NeoChatRoom *room) {
             if (text.isEmpty()) {
                 Q_EMIT room->showMessage(NeoChatRoom::Error, i18n("No new nickname provided, no changes will happen."));
             } else {
@@ -347,7 +346,7 @@ QList<ActionsModel::Action> actions{
     },
     Action{
         QStringLiteral("ignore"),
-        [](const QString &text, NeoChatRoom *room, ChatBarCache *) {
+        [](const QString &text, NeoChatRoom *room) {
             static const QRegularExpression mxidRegex(
                 QStringLiteral(R"((^|[][[:space:](){}`'";])([!#@][-a-z0-9_=#/.]{1,252}:\w(?:\w|\.|-)*\.\w+(?::\d{1,5})?))"));
             auto regexMatch = mxidRegex.match(text);
@@ -375,7 +374,7 @@ QList<ActionsModel::Action> actions{
     },
     Action{
         QStringLiteral("unignore"),
-        [](const QString &text, NeoChatRoom *room, ChatBarCache *) {
+        [](const QString &text, NeoChatRoom *room) {
             static const QRegularExpression mxidRegex(
                 QStringLiteral(R"((^|[][[:space:](){}`'";])([!#@][-a-z0-9_=#/.]{1,252}:\w(?:\w|\.|-)*\.\w+(?::\d{1,5})?))"));
             auto regexMatch = mxidRegex.match(text);
@@ -403,8 +402,9 @@ QList<ActionsModel::Action> actions{
     },
     Action{
         QStringLiteral("react"),
-        [](const QString &text, NeoChatRoom *room, ChatBarCache *chatBarCache) {
-            if (chatBarCache->replyId().isEmpty()) {
+        [](const QString &text, NeoChatRoom *room) {
+            QString replyEventId = room->chatBoxReplyId();
+            if (replyEventId.isEmpty()) {
                 for (auto it = room->messageEvents().crbegin(); it != room->messageEvents().crend(); it++) {
                     const auto &evt = **it;
                     if (const auto event = eventCast<const RoomMessageEvent>(&evt)) {
@@ -413,7 +413,7 @@ QList<ActionsModel::Action> actions{
                     }
                 }
             }
-            room->toggleReaction(chatBarCache->replyId(), text);
+            room->toggleReaction(replyEventId, text);
             return QString();
         },
         false,
@@ -423,7 +423,7 @@ QList<ActionsModel::Action> actions{
     },
     Action{
         QStringLiteral("ban"),
-        [](const QString &text, NeoChatRoom *room, ChatBarCache *) {
+        [](const QString &text, NeoChatRoom *room) {
             auto parts = text.split(QLatin1String(" "));
             static const QRegularExpression mxidRegex(
                 QStringLiteral(R"((^|[][[:space:](){}`'";])([!#@][-a-z0-9_=#/.]{1,252}:\w(?:\w|\.|-)*\.\w+(?::\d{1,5})?))"));
@@ -462,7 +462,7 @@ QList<ActionsModel::Action> actions{
     },
     Action{
         QStringLiteral("unban"),
-        [](const QString &text, NeoChatRoom *room, ChatBarCache *) {
+        [](const QString &text, NeoChatRoom *room) {
             static const QRegularExpression mxidRegex(
                 QStringLiteral(R"((^|[][[:space:](){}`'";])([!#@][-a-z0-9_=#/.]{1,252}:\w(?:\w|\.|-)*\.\w+(?::\d{1,5})?))"));
             auto regexMatch = mxidRegex.match(text);
@@ -495,7 +495,7 @@ QList<ActionsModel::Action> actions{
     },
     Action{
         QStringLiteral("kick"),
-        [](const QString &text, NeoChatRoom *room, ChatBarCache *) {
+        [](const QString &text, NeoChatRoom *room) {
             auto parts = text.split(QLatin1String(" "));
             static const QRegularExpression mxidRegex(
                 QStringLiteral(R"((^|[][[:space:](){}`'";])([!#@][-a-z0-9_=#/.]{1,252}:\w(?:\w|\.|-)*\.\w+(?::\d{1,5})?))"));
@@ -574,7 +574,7 @@ QHash<int, QByteArray> ActionsModel::roleNames() const
     };
 }
 
-QList<Action> &ActionsModel::allActions() const
+QVector<Action> &ActionsModel::allActions() const
 {
     return actions;
 }

src/models/actionsmodel.h

@@ -7,7 +7,6 @@
 #include <QAbstractListModel>
 #include <Quotient/events/roommessageevent.h>
 
-class ChatBarCache;
 class NeoChatRoom;
 
 /**
@@ -29,7 +28,7 @@ public:
         /**
          * @brief The function to execute when the action is triggered.
          */
-        std::function<QString(const QString &, NeoChatRoom *, ChatBarCache *)> handle;
+        std::function<QString(const QString &, NeoChatRoom *)> handle;
         /**
          * @brief Whether the action is a message type action.
          *
@@ -88,7 +87,7 @@ public:
     /**
      * @brief Return a vector with all supported actions.
      */
-    QList<Action> &allActions() const;
+    QVector<Action> &allActions() const;
 
 private:
     ActionsModel() = default;

src/models/completionmodel.cpp

@@ -87,11 +87,8 @@ QVariant CompletionModel::data(const QModelIndex &index, int role) const
             return m_filterModel->data(filterIndex, RoomListModel::CanonicalAliasRole);
         }
         if (role == IconNameRole) {
-            auto mediaId = m_filterModel->data(filterIndex, RoomListModel::AvatarRole).toString();
-            if (mediaId.isEmpty()) {
-                return QVariant();
-            }
-            return m_room->connection()->makeMediaUrl(QUrl(QStringLiteral("mxc://%1").arg(mediaId)));
+            return QStringLiteral("mxc://%1")
+                .arg(m_roomListModel->connection()->makeMediaUrl(m_filterModel->data(filterIndex, RoomListModel::AvatarRole).toUrl()).toString());
         }
     }
     if (m_autoCompletionType == Emoji) {

src/models/completionmodel.h

@@ -4,7 +4,6 @@
 #pragma once
 
 #include <QConcatenateTablesProxyModel>
-#include <QQmlEngine>
 #include <QSortFilterProxyModel>
 
 #include "roomlistmodel.h"
@@ -25,7 +24,6 @@ class RoomListModel;
 class CompletionModel : public QAbstractListModel
 {
     Q_OBJECT
-    QML_ELEMENT
 
     /**
      * @brief The current text to search for completions.

src/models/customemojimodel.h

@@ -4,7 +4,6 @@
 #pragma once
 
 #include <QAbstractListModel>
-#include <QQmlEngine>
 #include <QRegularExpression>
 #include <memory>
 
@@ -28,8 +27,6 @@ struct CustomEmoji {
 class CustomEmojiModel : public QAbstractListModel
 {
     Q_OBJECT
-    QML_ELEMENT
-    QML_SINGLETON
 
 public:
     /**
@@ -51,11 +48,6 @@ public:
         static CustomEmojiModel _instance;
         return _instance;
     }
-    static CustomEmojiModel *create(QQmlEngine *engine, QJSEngine *)
-    {
-        engine->setObjectOwnership(&instance(), QQmlEngine::CppOwnership);
-        return &instance();
-    }
 
     /**
      * @brief Get the given role value at the given index.

src/models/devicesmodel.h

@@ -5,7 +5,6 @@
 
 #include <QAbstractListModel>
 #include <QPointer>
-#include <QQmlEngine>
 
 #include <Quotient/csapi/definitions/client_device.h>
 
@@ -26,7 +25,6 @@ class Connection;
 class DevicesModel : public QAbstractListModel
 {
     Q_OBJECT
-    QML_ELEMENT
 
     /**
      * @brief The current connection that the model is getting its devices from.
@@ -98,6 +96,6 @@ Q_SIGNALS:
 
 private:
     void fetchDevices();
-    QList<Quotient::Device> m_devices;
+    QVector<Quotient::Device> m_devices;
     QPointer<Quotient::Connection> m_connection;
 };

src/models/devicesproxymodel.h

@@ -3,14 +3,11 @@
 
 #pragma once
 
-#include <QQmlEngine>
 #include <QSortFilterProxyModel>
 
 class DevicesProxyModel : public QSortFilterProxyModel
 {
     Q_OBJECT
-    QML_ELEMENT
-
     Q_PROPERTY(int type READ type WRITE setType NOTIFY typeChanged)
 
 public:

src/models/emojimodel.cpp

@@ -14,8 +14,6 @@
 
 EmojiModel::EmojiModel(QObject *parent)
     : QAbstractListModel(parent)
-    , m_config(KSharedConfig::openStateConfig())
-    , m_configGroup(KConfigGroup(m_config, QStringLiteral("Editor")))
 {
     if (_emojis.isEmpty()) {
 #include "emojis.h"
@@ -63,9 +61,9 @@ QHash<int, QByteArray> EmojiModel::roleNames() const
     return {{ShortNameRole, "shortName"}, {UnicodeRole, "unicode"}};
 }
 
-QStringList EmojiModel::lastUsedEmojis() const
+QVariantList EmojiModel::history() const
 {
-    return m_configGroup.readEntry(QStringLiteral("lastUsedEmojis"), QStringList());
+    return m_settings.value(QStringLiteral("Editor/emojis"), QVariantList()).toList();
 }
 
 QVariantList EmojiModel::filterModel(const QString &filter, bool limit)
@@ -95,21 +93,19 @@ QVariantList EmojiModel::filterModelNoCustom(const QString &filter, bool limit)
 
 void EmojiModel::emojiUsed(const QVariant &modelData)
 {
-    auto list = lastUsedEmojis();
-    const auto emoji = modelData.value<Emoji>();
+    QVariantList list = history();
 
     auto it = list.begin();
     while (it != list.end()) {
-        if (*it == emoji.shortName) {
+        if ((*it).value<Emoji>().unicode == modelData.value<Emoji>().unicode) {
             it = list.erase(it);
         } else {
             it++;
         }
     }
 
-    list.push_front(emoji.shortName);
-
-    m_configGroup.writeEntry(QStringLiteral("lastUsedEmojis"), list);
+    list.push_front(modelData);
+    m_settings.setValue(QStringLiteral("Editor/emojis"), list);
 
     Q_EMIT historyChanged();
 }
@@ -117,11 +113,11 @@ void EmojiModel::emojiUsed(const QVariant &modelData)
 QVariantList EmojiModel::emojis(Category category) const
 {
     if (category == History) {
-        return emojiHistory();
+        return history();
     }
     if (category == HistoryNoCustom) {
         QVariantList list;
-        for (const auto &e : emojiHistory()) {
+        for (const auto &e : history()) {
             auto emoji = qvariant_cast<Emoji>(e);
             if (!emoji.isCustom) {
                 list.append(e);
@@ -221,19 +217,4 @@ QVariantList EmojiModel::categoriesWithCustom() const
     return cats;
 }
 
-QVariantList EmojiModel::emojiHistory() const
-{
-    QVariantList list;
-    for (const auto &historicEmoji : lastUsedEmojis()) {
-        for (const auto &emojiCategory : _emojis) {
-            for (const auto &emoji : emojiCategory) {
-                if (qvariant_cast<Emoji>(emoji).shortName == historicEmoji) {
-                    list.append(emoji);
-                }
-            }
-        }
-    }
-    return list;
-}
-
 #include "moc_emojimodel.cpp"

src/models/emojimodel.h

@@ -3,11 +3,9 @@
 
 #pragma once
 
-#include <KConfigGroup>
-#include <KSharedConfig>
 #include <QAbstractListModel>
 #include <QObject>
-#include <QQmlEngine>
+#include <QSettings>
 
 struct Emoji {
     Emoji(QString unicode, QString shortname, bool isCustom = false)
@@ -24,6 +22,21 @@ struct Emoji {
     }
     Emoji() = default;
 
+    friend QDataStream &operator<<(QDataStream &arch, const Emoji &object)
+    {
+        arch << object.unicode;
+        arch << object.shortName;
+        return arch;
+    }
+
+    friend QDataStream &operator>>(QDataStream &arch, Emoji &object)
+    {
+        arch >> object.unicode;
+        arch >> object.shortName;
+        object.isCustom = object.unicode.startsWith(QStringLiteral("image://"));
+        return arch;
+    }
+
     QString unicode;
     QString shortName;
     QString description;
@@ -46,8 +59,11 @@ Q_DECLARE_METATYPE(Emoji)
 class EmojiModel : public QAbstractListModel
 {
     Q_OBJECT
-    QML_ELEMENT
-    QML_SINGLETON
+
+    /**
+     * @brief Return a list of recently used emojis.
+     */
+    Q_PROPERTY(QVariantList history READ history NOTIFY historyChanged)
 
     /**
      * @brief Return a list of emoji categories.
@@ -67,11 +83,6 @@ public:
         static EmojiModel _instance;
         return _instance;
     }
-    static EmojiModel *create(QQmlEngine *engine, QJSEngine *)
-    {
-        engine->setObjectOwnership(&instance(), QQmlEngine::CppOwnership);
-        return &instance();
-    }
 
     /**
      * @brief Defines the model roles.
@@ -158,11 +169,7 @@ public:
      */
     Q_INVOKABLE QVariantList tones(const QString &baseEmoji) const;
 
-    /**
-     * @brief Return a list of the last used emoji shortnames
-     */
-    QStringList lastUsedEmojis() const;
-
+    Q_INVOKABLE QVariantList history() const;
     QVariantList categories() const;
     QVariantList categoriesWithCustom() const;
 
@@ -175,10 +182,7 @@ public Q_SLOTS:
 private:
     static QHash<Category, QVariantList> _emojis;
 
-    /// Returns QVariants containing the last used Emojis
-    QVariantList emojiHistory() const;
-
-    KSharedConfig::Ptr m_config;
-    KConfigGroup m_configGroup;
+    // TODO: Port away from QSettings
+    QSettings m_settings;
     EmojiModel(QObject *parent = nullptr);
 };

src/models/emoticonfiltermodel.h

@@ -3,7 +3,6 @@
 
 #pragma once
 
-#include <QQmlEngine>
 #include <QSortFilterProxyModel>
 
 /**
@@ -15,7 +14,6 @@
 class EmoticonFilterModel : public QSortFilterProxyModel
 {
     Q_OBJECT
-    QML_ELEMENT
 
     /**
      * @brief Whether stickers should be shown

src/models/imagepacksmodel.cpp

@@ -151,7 +151,7 @@ void ImagePacksModel::setShowEmoticons(bool showEmoticons)
     m_showEmoticons = showEmoticons;
     Q_EMIT showEmoticonsChanged();
 }
-QList<Quotient::ImagePackEventContent::ImagePackImage> ImagePacksModel::images(int index)
+QVector<Quotient::ImagePackEventContent::ImagePackImage> ImagePacksModel::images(int index)
 {
     if (index < 0 || index >= m_events.size()) {
         return {};

src/models/imagepacksmodel.h

@@ -5,9 +5,8 @@
 
 #include "events/imagepackevent.h"
 #include <QAbstractListModel>
-#include <QList>
 #include <QPointer>
-#include <QQmlEngine>
+#include <QVector>
 
 class NeoChatRoom;
 
@@ -22,7 +21,6 @@ class NeoChatRoom;
 class ImagePacksModel : public QAbstractListModel
 {
     Q_OBJECT
-    QML_ELEMENT
 
     /**
      * @brief The current room that the model is being used in.
@@ -86,7 +84,7 @@ public:
     /**
      * @brief Return a vector of the images in the pack at the given index.
      */
-    [[nodiscard]] QList<Quotient::ImagePackEventContent::ImagePackImage> images(int index);
+    [[nodiscard]] QVector<Quotient::ImagePackEventContent::ImagePackImage> images(int index);
 
 Q_SIGNALS:
     void roomChanged();
@@ -96,7 +94,7 @@ Q_SIGNALS:
 
 private:
     QPointer<NeoChatRoom> m_room;
-    QList<Quotient::ImagePackEventContent> m_events;
+    QVector<Quotient::ImagePackEventContent> m_events;
     bool m_showStickers = true;
     bool m_showEmoticons = true;
     void reloadImages();

src/models/keywordnotificationrulemodel.cpp

@@ -35,7 +35,7 @@ void KeywordNotificationRuleModel::updateNotificationRules(const QString &type)
 
     const QJsonObject ruleDataJson = Controller::instance().activeConnection()->accountDataJson("m.push_rules");
     const Quotient::PushRuleset ruleData = Quotient::fromJson<Quotient::PushRuleset>(ruleDataJson["global"].toObject());
-    const QList<Quotient::PushRule> contentRules = ruleData.content;
+    const QVector<Quotient::PushRule> contentRules = ruleData.content;
 
     beginResetModel();
     m_notificationRules.clear();
@@ -78,11 +78,11 @@ void KeywordNotificationRuleModel::addKeyword(const QString &keyword)
         NotificationsManager::instance().initializeKeywordNotificationAction();
     }
 
-    const QList<QVariant> actions = NotificationsManager::instance().getKeywordNotificationActions();
+    const QVector<QVariant> actions = NotificationsManager::instance().getKeywordNotificationActions();
 
     auto job = Controller::instance()
                    .activeConnection()
-                   ->callApi<Quotient::SetPushRuleJob>("global", "content", keyword, actions, "", "", QList<Quotient::PushCondition>(), keyword);
+                   ->callApi<Quotient::SetPushRuleJob>("global", "content", keyword, actions, "", "", QVector<Quotient::PushCondition>(), keyword);
     connect(job, &Quotient::BaseJob::success, this, [this, keyword]() {
         beginInsertRows(QModelIndex(), m_notificationRules.count(), m_notificationRules.count());
         m_notificationRules.append(keyword);

src/models/livelocationsmodel.h

@@ -8,7 +8,6 @@
 
 #include <QAbstractListModel>
 #include <QPointer>
-#include <QQmlEngine>
 #include <QRectF>
 
 struct LiveLocationData {
@@ -25,8 +24,6 @@ bool operator<(const LiveLocationData &lhs, const LiveLocationData &rhs);
 class LiveLocationsModel : public QAbstractListModel
 {
     Q_OBJECT
-    QML_ELEMENT
-
     Q_PROPERTY(NeoChatRoom *room MEMBER m_room NOTIFY roomChanged)
     /** The event id of the beacon start event, ie. the one all suspequent
      *  events use to relate to the same beacon.

src/models/locationsmodel.h

@@ -5,7 +5,6 @@
 
 #include <QAbstractListModel>
 #include <QPointer>
-#include <QQmlEngine>
 #include <QRectF>
 
 #include "neochatroom.h"
@@ -16,7 +15,6 @@
 class LocationsModel : public QAbstractListModel
 {
     Q_OBJECT
-    QML_ELEMENT
 
 public:
     enum Roles {

src/models/mediamessagefiltermodel.h

@@ -3,8 +3,8 @@
 
 #pragma once
 
-#include <QQmlEngine>
 #include <QSortFilterProxyModel>
+#include <qobjectdefs.h>
 
 #include "models/messagefiltermodel.h"
 
@@ -20,8 +20,6 @@ class MessageFilterModel;
 class MediaMessageFilterModel : public QSortFilterProxyModel
 {
     Q_OBJECT
-    QML_ELEMENT
-
 public:
     enum MediaType {
         Image = 0,

src/models/messageeventmodel.cpp

@@ -47,8 +47,6 @@ QHash<int, QByteArray> MessageEventModel::roleNames() const
     roles[ReplyDelegateTypeRole] = "replyDelegateType";
     roles[ReplyDisplayRole] = "replyDisplay";
     roles[ReplyMediaInfoRole] = "replyMediaInfo";
-    roles[IsThreadedRole] = "isThreaded";
-    roles[ThreadRootRole] = "threadRoot";
     roles[ShowAuthorRole] = "showAuthor";
     roles[ShowSectionRole] = "showSection";
     roles[ReadMarkersRole] = "readMarkers";
@@ -57,6 +55,8 @@ QHash<int, QByteArray> MessageEventModel::roleNames() const
     roles[ShowReadMarkersRole] = "showReadMarkers";
     roles[ReactionRole] = "reaction";
     roles[ShowReactionsRole] = "showReactions";
+    roles[SourceRole] = "jsonSource";
+    roles[AuthorIdRole] = "authorId";
     roles[VerifiedRole] = "verified";
     roles[AuthorDisplayNameRole] = "authorDisplayName";
     roles[IsRedactedRole] = "isRedacted";
@@ -268,7 +268,7 @@ int MessageEventModel::timelineBaseIndex() const
     return m_currentRoom ? int(m_currentRoom->pendingEvents().size()) : 0;
 }
 
-void MessageEventModel::refreshEventRoles(int row, const QList<int> &roles)
+void MessageEventModel::refreshEventRoles(int row, const QVector<int> &roles)
 {
     const auto idx = index(row);
     Q_EMIT dataChanged(idx, idx, roles);
@@ -312,7 +312,7 @@ void MessageEventModel::moveReadMarker(const QString &toEventId)
     endMoveRows();
 }
 
-int MessageEventModel::refreshEventRoles(const QString &id, const QList<int> &roles)
+int MessageEventModel::refreshEventRoles(const QString &id, const QVector<int> &roles)
 {
     // On 64-bit platforms, difference_type for std containers is long long
     // but Qt uses int throughout its interfaces; hence casting to int below.
@@ -467,6 +467,10 @@ QVariant MessageEventModel::data(const QModelIndex &idx, int role) const
         return eventHandler.getPlainBody();
     }
 
+    if (role == SourceRole) {
+        return QJsonDocument(evt.fullJson()).toJson();
+    }
+
     if (role == DelegateTypeRole) {
         return eventHandler.getDelegateType();
     }
@@ -588,14 +592,6 @@ QVariant MessageEventModel::data(const QModelIndex &idx, int role) const
         return eventHandler.getReplyMediaInfo();
     }
 
-    if (role == IsThreadedRole) {
-        return eventHandler.isThreaded();
-    }
-
-    if (role == ThreadRootRole) {
-        return eventHandler.threadRoot();
-    }
-
     if (role == ShowAuthorRole) {
         for (auto r = row + 1; r < rowCount(); ++r) {
             auto i = index(r);
@@ -668,6 +664,10 @@ QVariant MessageEventModel::data(const QModelIndex &idx, int role) const
         return m_reactionModels.contains(evt.id());
     }
 
+    if (role == AuthorIdRole) {
+        return evt.senderId();
+    }
+
     if (role == VerifiedRole) {
         if (evt.originalEvent()) {
             auto encrypted = dynamic_cast<const EncryptedEvent *>(evt.originalEvent());

src/models/messageeventmodel.h

@@ -5,7 +5,6 @@
 
 #include <KFormat>
 #include <QAbstractListModel>
-#include <QQmlEngine>
 
 #include "linkpreviewer.h"
 #include "neochatroom.h"
@@ -26,7 +25,6 @@ class ReactionModel;
 class MessageEventModel : public QAbstractListModel
 {
     Q_OBJECT
-    QML_ELEMENT
 
     /**
      * @brief The current room that the model is getting its messages from.
@@ -63,9 +61,6 @@ public:
         ReplyDisplayRole, /**< The body of the message that was replied to. */
         ReplyMediaInfoRole, /**< The media info of the message that was replied to. */
 
-        IsThreadedRole,
-        ThreadRootRole,
-
         ShowAuthorRole, /**< Whether the author's name should be shown. */
         ShowSectionRole, /**< Whether the section header should be shown. */
 
@@ -75,6 +70,9 @@ public:
         ShowReadMarkersRole, /**< Whether there are any other user read markers to be shown. */
         ReactionRole, /**< List model for this event. */
         ShowReactionsRole, /**< Whether there are any reactions to be shown. */
+        SourceRole, /**< The full message source JSON. */
+
+        AuthorIdRole, /**< Matrix ID of the message author. */
 
         VerifiedRole, /**< Whether an encrypted message is sent in a verified session. */
         AuthorDisplayNameRole, /**< The displayname for the event's sender; for name change events, the old displayname. */
@@ -140,8 +138,8 @@ private:
     void fetchMore(const QModelIndex &parent) override;
 
     void refreshLastUserEvents(int baseTimelineRow);
-    void refreshEventRoles(int row, const QList<int> &roles = {});
-    int refreshEventRoles(const QString &eventId, const QList<int> &roles = {});
+    void refreshEventRoles(int row, const QVector<int> &roles = {});
+    int refreshEventRoles(const QString &eventId, const QVector<int> &roles = {});
     void moveReadMarker(const QString &toEventId);
 
     void createEventObjects(const Quotient::RoomMessageEvent *event);

src/models/messagefiltermodel.h

@@ -3,7 +3,6 @@
 
 #pragma once
 
-#include <QQmlEngine>
 #include <QSortFilterProxyModel>
 
 #include "messageeventmodel.h"
@@ -22,8 +21,6 @@
 class MessageFilterModel : public QSortFilterProxyModel
 {
     Q_OBJECT
-    QML_ELEMENT
-
 public:
     /**
      * @brief Defines the model roles.

src/models/publicroomlistmodel.cpp

@@ -124,20 +124,6 @@ void PublicRoomListModel::setKeyword(const QString &value)
     Q_EMIT hasMoreChanged();
 }
 
-bool PublicRoomListModel::showOnlySpaces() const
-{
-    return m_showOnlySpaces;
-}
-
-void PublicRoomListModel::setShowOnlySpaces(bool showOnlySpaces)
-{
-    if (showOnlySpaces == m_showOnlySpaces) {
-        return;
-    }
-    m_showOnlySpaces = showOnlySpaces;
-    Q_EMIT showOnlySpacesChanged();
-}
-
 void PublicRoomListModel::next(int count)
 {
     if (count < 1) {
@@ -150,11 +136,7 @@ void PublicRoomListModel::next(int count)
         return;
     }
 
-    QStringList roomTypes;
-    if (m_showOnlySpaces) {
-        roomTypes += QLatin1String("m.space");
-    }
-    job = m_connection->callApi<QueryPublicRoomsJob>(m_server, count, nextBatch, QueryPublicRoomsJob::Filter{m_keyword, roomTypes});
+    job = m_connection->callApi<QueryPublicRoomsJob>(m_server, count, nextBatch, QueryPublicRoomsJob::Filter{m_keyword, {}});
     Q_EMIT loadingChanged();
 
     connect(job, &BaseJob::finished, this, [this] {