GIT_SILENT Sync po/docbooks with svn

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

.flatpak-manifest.json

@@ -20,16 +20,8 @@
         "--talk-name=org.kde.kwalletd5",
         "--talk-name=org.kde.StatusNotifierWatcher",
         "--talk-name=org.freedesktop.secrets",
-        "--talk-name=org.kde.kuiserver",
         "--own-name=org.kde.StatusNotifierItem-2-2"
     ],
-    "cleanup": [
-        "/include",
-        "/lib/*.a",
-        "/lib/cmake",
-        "/lib/pkgconfig",
-        "/share/ndk-modules"
-    ],
     "modules": [
         {
             "name": "kirigamiaddons",
@@ -90,8 +82,8 @@
             "sources": [
                 {
                     "type": "archive",
-                    "url": "https://download.gnome.org/sources/libsecret/0.21/libsecret-0.21.7.tar.xz",
-                    "sha256": "6b452e4750590a2b5617adc40026f28d2f4903de15f1250e1d1c40bfd68ed55e",
+                    "url": "https://download.gnome.org/sources/libsecret/0.21/libsecret-0.21.6.tar.xz",
+                    "sha256": "747b8c175be108c880d3adfb9c3537ea66e520e4ad2dccf5dce58003aeeca090",
                     "x-checker-data": {
                         "type": "gnome",
                         "name": "libsecret",
@@ -164,13 +156,13 @@
             "sources": [
                 {
                     "type": "archive",
-                    "url": "https://download.kde.org/stable/release-service/25.04.3/src/kunifiedpush-25.04.3.tar.xz",
-                    "sha256": "a16ffe4117b14baa02f3b8ae7de9e509a17359c1b67dcd851aef4f3c3661a1df",
+                    "url": "https://download.kde.org/stable/kunifiedpush/kunifiedpush-1.0.0.tar.xz",
+                    "sha256": "2ddeba21306d0307114ec50a2c38159ec62359f9fc6cdd58da30a369fbd550cf",
                     "x-checker-data": {
                         "type": "anitya",
-                        "project-id": 8763,
+                        "project-id": 375055,
                         "stable-only": true,
-                        "url-template": "https://download.kde.org/stable/release-service/$version/src/kunifiedpush-$version.tar.xz"
+                        "url-template": "https://download.kde.org/stable/kunifiedpush/kunifiedpush-$version.tar.xz"
                     }
                 }
             ]

CMakeLists.txt

@@ -8,8 +8,8 @@ cmake_minimum_required(VERSION 3.16)
 
 # KDE Applications version, managed by release script.
 set(RELEASE_SERVICE_VERSION_MAJOR "25")
-set(RELEASE_SERVICE_VERSION_MINOR "11")
-set(RELEASE_SERVICE_VERSION_MICRO "70")
+set(RELEASE_SERVICE_VERSION_MINOR "08")
+set(RELEASE_SERVICE_VERSION_MICRO "0")
 set(RELEASE_SERVICE_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE_VERSION_MINOR}.${RELEASE_SERVICE_VERSION_MICRO}")
 
 project(NeoChat VERSION ${RELEASE_SERVICE_VERSION})

autotests/chatbarcachetest.cpp

@@ -6,7 +6,6 @@
 #include <QObject>
 #include <QTest>
 
-#include <QSignalSpy>
 #include <Quotient/roommember.h>
 #include <Quotient/syncdata.h>
 #include <qtestcase.h>
@@ -33,7 +32,6 @@ private Q_SLOTS:
     void noRoom();
     void badParent();
     void reply();
-    void replyMissingUser();
     void edit();
     void attachment();
 };
@@ -104,33 +102,6 @@ void ChatBarCacheTest::reply()
     QCOMPARE(chatBarCache->relationAuthor(), room->member(u"@example:example.org"_s));
     QCOMPARE(chatBarCache->relationMessage(), u"This is an example\ntext message"_s);
     QCOMPARE(chatBarCache->attachmentPath(), QString());
-    QCOMPARE(chatBarCache->relationAuthorIsPresent(), true);
-}
-
-void ChatBarCacheTest::replyMissingUser()
-{
-    QScopedPointer<ChatBarCache> chatBarCache(new ChatBarCache(room));
-    chatBarCache->setText(u"some text"_s);
-    chatBarCache->setAttachmentPath(u"some/path"_s);
-    chatBarCache->setReplyId(u"$153456789:example.org"_s);
-
-    QCOMPARE(chatBarCache->text(), u"some text"_s);
-    QCOMPARE(chatBarCache->isReplying(), true);
-    QCOMPARE(chatBarCache->replyId(), u"$153456789:example.org"_s);
-    QCOMPARE(chatBarCache->isEditing(), false);
-    QCOMPARE(chatBarCache->editId(), QString());
-    QCOMPARE(chatBarCache->relationAuthor(), room->member(u"@example:example.org"_s));
-    QCOMPARE(chatBarCache->relationMessage(), u"This is an example\ntext message"_s);
-    QCOMPARE(chatBarCache->attachmentPath(), QString());
-    QCOMPARE(chatBarCache->relationAuthorIsPresent(), true);
-
-    QSignalSpy relationAuthorIsPresentSpy(chatBarCache.get(), &ChatBarCache::relationAuthorIsPresentChanged);
-
-    // sync again, which will simulate the reply user leaving the room
-    room->syncNewEvents(u"test-min-sync-extra-sync.json"_s);
-
-    QTRY_COMPARE(relationAuthorIsPresentSpy.count(), 1);
-    QCOMPARE(chatBarCache->relationAuthorIsPresent(), false);
 }
 
 void ChatBarCacheTest::edit()

autotests/data/test-min-sync-extra-sync.json

@@ -1,20 +0,0 @@
-{
-  "state": {
-    "events": [
-      {
-        "content": {
-          "membership": "leave"
-        },
-        "event_id": "$1432735824666PhrSA:example.org",
-        "origin_server_ts": 1432735824666,
-        "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
-        "sender": "@example:example.org",
-        "state_key": "@example:example.org",
-        "type": "m.room.member",
-        "unsigned": {
-          "replaces_state": "$143273582443PhrSn:example.org"
-        }
-      }
-    ]
-  }
-}

autotests/messagecontentmodeltest.cpp

@@ -10,7 +10,7 @@
 #include <Quotient/roommember.h>
 #include <Quotient/syncdata.h>
 
-#include "models/eventmessagecontentmodel.h"
+#include "models/messagecontentmodel.h"
 
 #include "neochatconnection.h"
 #include "testutils.h"
@@ -39,13 +39,13 @@ void MessageContentModelTest::initTestCase()
 void MessageContentModelTest::missingEvent()
 {
     auto room = new TestUtils::TestRoom(connection, u"#firstRoom:kde.org"_s);
-    auto model1 = EventMessageContentModel(room, u"$153456789:example.org"_s);
+    auto model1 = MessageContentModel(room, u"$153456789:example.org"_s);
 
     QCOMPARE(model1.rowCount(), 1);
     QCOMPARE(model1.data(model1.index(0), MessageContentModel::ComponentTypeRole), MessageComponentType::Loading);
     QCOMPARE(model1.data(model1.index(0), MessageContentModel::DisplayRole), u"Loading"_s);
 
-    auto model2 = EventMessageContentModel(room, u"$153456789:example.org"_s, true);
+    auto model2 = MessageContentModel(room, u"$153456789:example.org"_s, true);
 
     QCOMPARE(model2.rowCount(), 1);
     QCOMPARE(model2.data(model2.index(0), MessageContentModel::ComponentTypeRole), MessageComponentType::Loading);

autotests/reactionmodeltest.cpp

@@ -9,7 +9,7 @@
 
 #include <Quotient/events/roommessageevent.h>
 
-#include "models/eventmessagecontentmodel.h"
+#include "models/messagecontentmodel.h"
 #include "testutils.h"
 
 using namespace Quotient;
@@ -21,7 +21,7 @@ class ReactionModelTest : public QObject
 private:
     Connection *connection = nullptr;
     TestUtils::TestRoom *room = nullptr;
-    EventMessageContentModel *parentModel;
+    MessageContentModel *parentModel;
 
 private Q_SLOTS:
     void initTestCase();
@@ -34,7 +34,7 @@ void ReactionModelTest::initTestCase()
 {
     connection = Connection::makeMockConnection(u"@bob:kde.org"_s);
     room = new TestUtils::TestRoom(connection, u"#myroom:kde.org"_s, u"test-reactionmodel-sync.json"_s);
-    parentModel = new EventMessageContentModel(room, "123456"_L1);
+    parentModel = new MessageContentModel(room, "123456"_L1);
 }
 
 void ReactionModelTest::basicReaction()

src/app/controller.cpp

@@ -5,6 +5,7 @@
 #include "controller.h"
 
 #include <Quotient/connection.h>
+#include <qt6keychain/keychain.h>
 
 #include <KLocalizedString>
 
@@ -13,6 +14,7 @@
 
 #include <signal.h>
 
+#include <Quotient/csapi/notifications.h>
 #include <Quotient/events/roommemberevent.h>
 #include <Quotient/qt_connection_util.h>
 #include <Quotient/settings.h>
@@ -22,6 +24,7 @@
 #include "mediasizehelper.h"
 #include "models/actionsmodel.h"
 #include "models/messagemodel.h"
+#include "models/pushrulemodel.h"
 #include "models/roomlistmodel.h"
 #include "models/roomtreemodel.h"
 #include "neochatconfig.h"

src/app/models/commonroomsmodel.h

@@ -7,6 +7,7 @@
 #include <QQmlEngine>
 
 #include "neochatconnection.h"
+#include "neochatroom.h"
 
 #include <Quotient/events/roommessageevent.h>
 #include <Quotient/roommember.h>
@@ -24,7 +25,11 @@ class CommonRoomsModel : public QAbstractListModel
 
 public:
     enum Roles {
-        RoomIdRole = Qt::DisplayRole,
+        TextRole = Qt::DisplayRole,
+        LongitudeRole,
+        LatitudeRole,
+        AssetRole,
+        AuthorRole,
     };
     Q_ENUM(Roles)
 

src/app/neochatconfig.kcfg

@@ -189,10 +189,6 @@
       <label>Don't hide any events in the timeline</label>
       <default>false</default>
     </entry>
-    <entry name="RelateAnyEvent" type="bool">
-      <label>Send relations to any event, including state events and events normally hidden.</label>
-      <default>false</default>
-    </entry>
     <entry name="AlwaysVerifyDevice" type="bool">
       <label>Always allow device verification</label>
       <default>false</default>

src/app/plasma-runner-neochat.desktop

@@ -93,3 +93,4 @@ X-Plasma-API=DBus
 X-Plasma-DBusRunner-Service=org.kde.neochat
 X-Plasma-DBusRunner-Path=/RoomRunner
 X-Plasma-Request-Actions-Once=true
+X-Plasma-Runner-Min-Letter-Count=3

src/app/qml/AccountMenu.qml

@@ -1,10 +1,9 @@
 // SPDX-FileCopyrightText: 2022 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 ComponentBehavior: Bound
-
 import QtQuick
 import QtQuick.Controls as QQC2
+import QtQuick.Layouts
 
 import org.kde.kirigami as Kirigami
 import org.kde.kirigamiaddons.components as KirigamiComponents
@@ -19,17 +18,21 @@ KirigamiComponents.ConvergentContextMenu {
     required property NeoChatConnection connection
     required property Kirigami.ApplicationWindow window
 
-    Kirigami.Action {
+    QQC2.Action {
         text: i18nc("@action:button", "Show QR Code")
         icon.name: "view-barcode-qr-symbolic"
         onTriggered: {
-            (Qt.createComponent('org.kde.neochat', 'QrCodeMaximizeComponent').createObject(QQC2.Overlay.overlay, {
+            let qrMax = Qt.createComponent('org.kde.neochat', 'QrCodeMaximizeComponent').createObject(QQC2.Overlay.overlay, {
                 text: "https://matrix.to/#/" + root.connection.localUser.id,
                 title: root.connection.localUser.displayName,
                 subtitle: root.connection.localUser.id,
                 // Note: User::avatarUrl does not set user_id, and thus cannot be used directly here. Hence the makeMediaUrl.
                 avatarSource: root.connection.localUser.avatarUrl.toString().length > 0 ? root.connection.makeMediaUrl(root.connection.localUser.avatarUrl) : ""
-            }) as QrCodeMaximizeComponent).open();
+            });
+            if (typeof root.closeDialog === "function") {
+                root.closeDialog();
+            }
+            qrMax.open();
         }
     }
 
@@ -37,27 +40,26 @@ KirigamiComponents.ConvergentContextMenu {
         text: i18nc("@action:inmenu", "Switch Account")
         icon.name: "system-switch-user"
         shortcut: "Ctrl+U"
-        onTriggered: (Qt.createComponent("org.kde.neochat", "AccountSwitchDialog").createObject(QQC2.Overlay.overlay, {
+        onTriggered: accountSwitchDialog.createObject(QQC2.Overlay.overlay, {
             connection: root.connection
-        }) as Kirigami.Dialog).open();
+        }).open();
     }
-
-    Kirigami.Action {
-        text: i18nc("@action:inmenu", "Edit This Account")
+    QQC2.Action {
+        text: i18n("Edit This Account")
         icon.name: "document-edit"
         onTriggered: NeoChatSettingsView.openWithInitialProperties("accounts", {initialAccount: root.connection});
     }
 
-    Kirigami.Action {
-        text: i18nc("@action:inmenu", "Notification Settings")
+    QQC2.Action {
+        text: i18n("Notification Settings")
         icon.name: "notifications"
         onTriggered: {
             NeoChatSettingsView.open('notifications');
         }
     }
 
-    Kirigami.Action {
-        text: i18nc("@action:inmenu", "Devices")
+    QQC2.Action {
+        text: i18n("Devices")
         icon.name: "computer-symbolic"
         onTriggered: {
             NeoChatSettingsView.open('devices');
@@ -65,10 +67,10 @@ KirigamiComponents.ConvergentContextMenu {
     }
 
     Kirigami.Action {
-        text: i18nc("@action:inmenu", "Open Developer Tools")
+        text: i18n("Open Developer Tools")
         icon.name: "tools"
         visible: NeoChatConfig.developerTools
-        onTriggered: root.window.pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat.devtools', 'DevtoolsPage'), {
+        onTriggered: pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat.devtools', 'DevtoolsPage'), {
             connection: root.connection
         }, {
             title: i18nc("@title:window", "Developer Tools"),
@@ -86,10 +88,9 @@ KirigamiComponents.ConvergentContextMenu {
         })
     }
 
-    Kirigami.Action {
+    QQC2.Action {
         text: i18nc("@action:inmenu", "Verify This Device")
         icon.name: "security-low"
-        visible: !root.connection.isVerifiedSession()
         onTriggered: {
             root.connection.startSelfVerification();
             const dialog = Qt.createComponent("org.kde.kirigami", "PromptDialog").createObject(QQC2.Overlay.overlay, {
@@ -98,17 +99,19 @@ KirigamiComponents.ConvergentContextMenu {
                 standardButtons: Kirigami.Dialog.Ok
             })
             dialog.open();
-            root.connection.newKeyVerificationSession.connect(() => {
+            root.connection.onNewKeyVerificationSession.connect(() => {
                 dialog.close();
             });
         }
     }
 
-    Kirigami.Action {
-        text: i18nc("@action:inmenu", "Logout…")
+    QQC2.Action {
+        text: i18n("Logout")
         icon.name: "im-kick-user"
-        onTriggered: (Qt.createComponent("org.kde.neochat", "ConfirmLogoutDialog").createObject(QQC2.Overlay.overlay, {
-            connection: root.connection
-        }) as Kirigami.Dialog).open()
+        onTriggered: confirmLogoutDialogComponent.createObject(root).open()
+    }
+
+    readonly property Component confirmLogoutDialogComponent: ConfirmLogoutDialog {
+        connection: root.connection
     }
 }

src/app/qml/AccountSwitchDialog.qml

@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 import QtQuick
-import QtQuick.Controls as QQC2
 import QtQuick.Layouts
 
 import org.kde.kirigami as Kirigami
@@ -17,6 +16,8 @@ Kirigami.Dialog {
 
     required property NeoChatConnection connection
 
+    parent: applicationWindow().overlay
+
     leftPadding: 0
     rightPadding: 0
     topPadding: 0
@@ -24,7 +25,7 @@ Kirigami.Dialog {
 
     standardButtons: Kirigami.Dialog.NoButton
 
-    width: Math.min(QQC2.ApplicationWindow.window.width, Kirigami.Units.gridUnit * 24)
+    width: Math.min(applicationWindow().width, Kirigami.Units.gridUnit * 24)
     title: i18nc("@title: dialog to switch between logged in accounts", "Switch Account")
 
     onVisibleChanged: if (visible) {
@@ -52,7 +53,7 @@ Kirigami.Dialog {
             }
             text: i18nc("@button: login to or register a new account.", "Add Account")
             contentItem: Delegates.SubtitleContentItem {
-                itemDelegate: addDelegate
+                itemDelegate: parent
                 subtitle: i18n("Log in or create a new account")
                 labelItem.textFormat: Text.PlainText
                 subtitleItem.textFormat: Text.PlainText

src/app/qml/AttachmentPane.qml

@@ -33,7 +33,7 @@ ColumnLayout {
         }
         QQC2.ToolButton {
             id: editImageButton
-            visible: root.hasImage
+            visible: hasImage
             icon.name: "document-edit"
             text: i18n("Edit")
             display: QQC2.AbstractButton.IconOnly
@@ -46,9 +46,9 @@ ColumnLayout {
             }
 
             onClicked: {
-                let imageEditor = (Kirigami.PageStack.pageStack as Kirigami.PageRow).pushDialogLayer(imageEditorPage);
+                let imageEditor = applicationWindow().pageStack.pushDialogLayer(imageEditorPage);
                 imageEditor.newPathChanged.connect(function (newPath) {
-                    imageEditor.closeDialog();
+                    applicationWindow().pageStack.layers.pop();
                     root.attachmentPath = newPath;
                 });
             }
@@ -61,7 +61,7 @@ ColumnLayout {
             action: Kirigami.Action {
                 text: i18n("Cancel sending attachment")
                 icon.name: "dialog-close"
-                onTriggered: root.attachmentCancelled()
+                onTriggered: attachmentCancelled()
                 shortcut: "Escape"
             }
             QQC2.ToolTip.text: text
@@ -75,8 +75,8 @@ ColumnLayout {
 
         asynchronous: true
         cache: false // Cache is not needed. Images will rarely be shown repeatedly.
-        source: root.hasImage ? root.attachmentPath : ""
-        visible: root.hasImage
+        source: hasImage ? root.attachmentPath : ""
+        visible: hasImage
         fillMode: Image.PreserveAspectFit
 
         onSourceChanged: {
@@ -114,11 +114,11 @@ ColumnLayout {
             id: mimetypeIcon
             implicitWidth: Kirigami.Units.iconSizes.smallMedium
             implicitHeight: Kirigami.Units.iconSizes.smallMedium
-            source: root.attachmentMimetype.iconName
+            source: attachmentMimetype.iconName
         }
         QQC2.Label {
             id: fileLabel
-            text: root.baseFileName
+            text: baseFileName
         }
     }
 }

src/app/qml/AvatarTabButton.qml

@@ -3,9 +3,12 @@
 // SPDX-License-Identifier: LGPL-2.0-or-later
 
 import QtQuick
+import QtQuick.Layouts
 import QtQuick.Controls as QQC2
+import QtQuick.Templates as T
 import org.kde.kirigami as Kirigami
 import org.kde.kirigamiaddons.delegates as Delegates
+import org.kde.kirigamiaddons.labs.components as KirigamiComponents
 
 Delegates.RoundedItemDelegate {
     id: root

src/app/qml/CollapsedRoomDelegate.qml

@@ -8,6 +8,7 @@ import QtQml.Models
 
 import org.kde.kirigami as Kirigami
 import org.kde.kirigamiaddons.labs.components as KirigamiComponents
+import org.kde.kitemmodels
 
 import org.kde.neochat
 

src/app/qml/FullScreenMap.qml

@@ -59,7 +59,7 @@ ApplicationWindow {
 
         Connections {
             target: mapView.map
-            function onCopyrightLinkActivated(link: string): void {
+            function onCopyrightLinkActivated() {
                 Qt.openUrlExternally(link);
             }
         }

src/app/qml/GlobalMenu.qml

@@ -17,6 +17,23 @@ Labs.MenuBar {
 
     required property NeoChatConnection connection
 
+    Labs.Menu {
+        title: i18nc("menu", "NeoChat")
+
+        Labs.MenuItem {
+            enabled: pageStack.layers.currentItem.title !== i18n("Configure NeoChat…")
+            text: i18nc("menu", "Configure NeoChat…")
+
+            shortcut: StandardKey.Preferences
+            onTriggered: NeoChatSettingsView.open()
+        }
+        Labs.MenuItem {
+            text: i18nc("menu", "Quit NeoChat")
+
+            shortcut: StandardKey.Quit
+            onTriggered: Qt.quit()
+        }
+    }
     Labs.Menu {
         title: i18nc("menu", "File")
 
@@ -57,19 +74,6 @@ Labs.MenuBar {
                 });
             }
         }
-        Labs.MenuItem {
-            enabled: pageStack.layers.currentItem.title !== i18n("Configure NeoChat…")
-            text: i18nc("menu", "Configure NeoChat…")
-
-            shortcut: StandardKey.Preferences
-            onTriggered: NeoChatSettingsView.open()
-        }
-        Labs.MenuItem {
-            text: i18nc("menu", "Quit NeoChat")
-
-            shortcut: StandardKey.Quit
-            onTriggered: Qt.quit()
-        }
     }
     EditMenu {
         title: i18nc("menu", "Edit")

src/app/qml/InvitationView.qml

@@ -52,15 +52,6 @@ ColumnLayout {
                 Layout.alignment: Qt.AlignHCenter
             }
 
-            Kirigami.SelectableLabel {
-                Layout.fillWidth: true
-                font: Kirigami.Theme.smallFont
-                textFormat: TextEdit.PlainText
-                visible: root.currentRoom && root.currentRoom.canonicalAlias
-                text: root.currentRoom && root.currentRoom.canonicalAlias ? root.currentRoom.canonicalAlias : ""
-                color: Kirigami.Theme.disabledTextColor
-            }
-
             Kirigami.Heading {
                 text: root.currentRoom.displayName
 
@@ -79,14 +70,7 @@ ColumnLayout {
             spacing: Kirigami.Units.smallSpacing
 
             Kirigami.Heading {
-                text: root.invitingMember.displayName
-
-                Layout.alignment: Qt.AlignHCenter
-            }
-
-            QQC2.Label {
-                text: root.invitingMember.id
-                color: Kirigami.Theme.disabledTextColor
+                text: root.currentRoom.displayName
 
                 Layout.alignment: Qt.AlignHCenter
             }
@@ -175,7 +159,7 @@ ColumnLayout {
 
             QQC2.Label {
                 color: Kirigami.Theme.disabledTextColor
-                text: xi18nc("@info:label Ensure you are referring to the same translation used for that settings page", "You can reject invitations from unknown users under the <interface>Security & Safety</interface> settings.")
+                text: i18nc("@info:label", "You can reject invitations from unknown users under Security settings.")
                 wrapMode: Text.WordWrap
 
                 // + 5 to prevent it from wrapping unnecessarily

src/app/qml/JoinRoomDialog.qml

@@ -8,6 +8,7 @@ import QtQuick.Layouts
 import org.kde.kirigami as Kirigami
 import org.kde.kirigamiaddons.components as KirigamiComponents
 import org.kde.kirigamiaddons.formcard as FormCard
+import org.kde.prison
 
 import org.kde.neochat
 
@@ -24,7 +25,7 @@ Kirigami.Dialog {
 
     standardButtons: Kirigami.Dialog.NoButton
 
-    width: Math.min(QQC2.ApplicationWindow.window.width, Kirigami.Units.gridUnit * 24)
+    width: Math.min(applicationWindow().width, Kirigami.Units.gridUnit * 24)
     title: i18nc("@title:dialog", "Join Room")
 
     contentItem: ColumnLayout {

src/app/qml/Main.qml

@@ -60,21 +60,21 @@ Kirigami.ApplicationWindow {
 
     Connections {
         target: LoginHelper
-        function onLoaded(): void {
+        function onLoaded() {
             root.load();
         }
     }
 
     Connections {
         target: Registration
-        function onLoaded(): void {
+        function onLoaded() {
             root.load();
         }
     }
 
     Connections {
         target: root.quitAction
-        function onTriggered(): void {
+        function onTriggered() {
             Qt.quit();
         }
     }
@@ -98,40 +98,42 @@ Kirigami.ApplicationWindow {
     Connections {
         target: RoomManager
 
-        function onCurrentRoomChanged(): void {
+        function onCurrentRoomChanged() {
             if (RoomManager.currentRoom && pageStack.depth <= 1 && root.initialized && Kirigami.Settings.isMobile) {
-                let roomPage = pageStack.layers.push(Qt.createComponent('org.kde.neochat', 'RoomPage'));
+                let roomPage = pageStack.layers.push(Qt.createComponent('org.kde.neochat', 'RoomPage'), {
+                    connection: root.connection
+                });
                 roomPage.backRequested.connect(event => {
                     RoomManager.clearCurrentRoom();
                 });
             }
         }
 
-        function onAskJoinRoom(room: NeoChatRoom): void {
+        function onAskJoinRoom(room) {
             Qt.createComponent("org.kde.neochat", "JoinRoomDialog").createObject(root, {
                 room: room,
                 connection: root.connection
             }).open();
         }
 
-        function onShowUserDetail(user, room: NeoChatRoom): void {
+        function onShowUserDetail(user, room) {
             root.showUserDetail(user, room);
         }
 
-        function goToEvent(event: string): void {
+        function goToEvent(event) {
             if (event.length > 0) {
                 roomItem.goToEvent(event);
             }
             roomItem.forceActiveFocus();
         }
 
-        function onAskDirectChatConfirmation(user): void {
+        function onAskDirectChatConfirmation(user) {
             Qt.createComponent("org.kde.neochat", "AskDirectChatConfirmation").createObject(this, {
                 user: user
             }).open();
         }
 
-        function onExternalUrl(url): void {
+        function onExternalUrl(url) {
             let dialog = Qt.createComponent("org.kde.neochat", "ConfirmUrlDialog").createObject(this);
             dialog.link = url;
             dialog.open();
@@ -336,7 +338,7 @@ Kirigami.ApplicationWindow {
         }
     }
     function handleShare(): void {
-        const dialog = root.pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'ChooseRoomDialog'), {
+        const dialog = applicationWindow().pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'ChooseRoomDialog'), {
             connection: root.connection
         }, {
             title: i18nc("@title", "Share"),
@@ -363,7 +365,9 @@ Kirigami.ApplicationWindow {
         RoomManager.loadInitialRoom();
 
         if (!Kirigami.Settings.isMobile) {
-            let roomPage = pageStack.push(Qt.createComponent('org.kde.neochat', 'RoomPage'));
+            let roomPage = pageStack.push(Qt.createComponent('org.kde.neochat', 'RoomPage'), {
+                connection: root.connection
+            });
             roomPage.forceActiveFocus();
         }
 

src/app/qml/MessageSourceSheet.qml

@@ -47,7 +47,7 @@ Kirigami.Page {
             icon.name: "document-edit"
             visible: root.allowEdit
             enabled: room.canSendState(root.type) && (!root.stateKey.startsWith("@") || root.stateKey === root.room.connection.localUserId) && root.type !== "m.room.create"
-            onTriggered: pageStack.pushDialogLayer(Qt.createComponent("org.kde.neochat", "EditStateDialog"), {
+            onTriggered: pageStack.pushDialogLayer(Qt.createComponent("org.kde.neochat", "EditStateDialog.qml"), {
                 room: root.room,
                 type: root.type,
                 stateKey: root.stateKey,

src/app/qml/NeochatMaximizeComponent.qml

@@ -72,7 +72,7 @@ Components.AlbumMaximizeComponent {
 
     Connections {
         target: MediaManager
-        function onPlaybackStarted(): void {
+        function onPlaybackStarted() {
             if (currentItem.playbackState === MediaPlayer.PlayingState) {
                 currentItem.pause();
             }
@@ -82,7 +82,7 @@ Components.AlbumMaximizeComponent {
     Connections {
         target: currentRoom
 
-        function onFileTransferProgress(id: string, progress: int, total: int): void {
+        function onFileTransferProgress(id, progress, total) {
             if (id == root.currentEventId) {
                 root.downloadAction.progress = progress / total * 100.0;
             }
@@ -130,7 +130,7 @@ Components.AlbumMaximizeComponent {
 
     Connections {
         target: RoomManager
-        function onCloseFullScreen(): void {
+        function onCloseFullScreen() {
             root.close();
         }
     }

src/app/qml/NewPollDialog.qml

@@ -34,7 +34,7 @@ Kirigami.Dialog {
         }
     ]
 
-    width: Math.min(QQC2.ApplicationWindow.window.width, Kirigami.Units.gridUnit * 24)
+    width: Math.min(applicationWindow().width, Kirigami.Units.gridUnit * 24)
     title: i18nc("@title: create new poll in the room", "Create Poll")
 
     contentItem: ColumnLayout {

src/app/qml/QrScannerPage.qml

@@ -22,7 +22,7 @@ Kirigami.Page {
 
     Connections {
         target: root.QQC2.ApplicationWindow.window
-        function onClosing(): void {
+        function onClosing() {
             root.destroy();
         }
     }

src/app/qml/QuickSwitcher.qml

@@ -6,6 +6,7 @@ import QtQuick.Controls as QQC2
 import QtQuick.Layouts
 
 import org.kde.kirigami as Kirigami
+import org.kde.kitemmodels
 
 import org.kde.neochat
 

src/app/qml/RecommendedSpaceDialog.qml

@@ -15,6 +15,8 @@ Kirigami.Dialog {
 
     property var connection
 
+    parent: applicationWindow().overlay
+
     leftPadding: 0
     rightPadding: 0
     topPadding: 0
@@ -22,7 +24,7 @@ Kirigami.Dialog {
 
     title: i18nc("@title Join <name of a space>", "Join %1", SpaceHierarchyCache.recommendedSpaceDisplayName)
 
-    width: Math.min(QQC2.ApplicationWindow.window.width, Kirigami.Units.gridUnit * 24)
+    width: Math.min(applicationWindow().width, Kirigami.Units.gridUnit * 24)
 
     contentItem: ColumnLayout {
         FormCard.AbstractFormDelegate {

src/app/qml/RoomPage.qml

@@ -8,6 +8,7 @@ import QtQuick.Layouts
 import QtQuick.Window
 
 import org.kde.kirigami as Kirigami
+import org.kde.kitemmodels
 
 import org.kde.neochat
 
@@ -63,9 +64,9 @@ Kirigami.Page {
 
     actions: [
         Kirigami.Action {
-            visible: Kirigami.Settings.isMobile || !root.Kirigami.PageStack.pageStack.wideMode
+            visible: Kirigami.Settings.isMobile || !applicationWindow().pageStack.wideMode
             icon.name: "view-right-new"
-            onTriggered: (root.QQC2.ApplicationWindow.window as Main).openRoomDrawer()
+            onTriggered: applicationWindow().openRoomDrawer()
         }
     ]
 
@@ -80,9 +81,9 @@ Kirigami.Page {
 
     Connections {
         target: root.currentRoom.connection
-        function onIsOnlineChanged(): void {
+        function onIsOnlineChanged() {
             if (!root.currentRoom.connection.isOnline) {
-                banner.text = i18nc("@info:status", "NeoChat is offline. Please check your network connection.");
+                banner.text = i18n("NeoChat is offline. Please check your network connection.");
                 banner.visible = true;
                 banner.type = Kirigami.MessageType.Error;
             } else {
@@ -137,8 +138,8 @@ Kirigami.Page {
         anchors.centerIn: parent
         sourceComponent: Kirigami.PlaceholderMessage {
             icon.name: "org.kde.neochat"
-            text: i18nc("@title", "Welcome to NeoChat")
-            explanation: i18nc("@info:usagetip", "Select or join a room to get started")
+            text: i18n("Welcome to NeoChat")
+            explanation: i18n("Select or join a room to get started")
         }
     }
 
@@ -162,20 +163,20 @@ Kirigami.Page {
 
     Connections {
         target: RoomManager
-        function onCurrentRoomChanged(): void {
+        function onCurrentRoomChanged() {
             if (root.currentRoom && root.currentRoom.isInvite) {
                 Controller.clearInvitationNotification(root.currentRoom.id);
             }
         }
 
-        function onGoToEvent(eventId: string): void {
+        function onGoToEvent(eventId) {
             (timelineViewLoader.item as TimelineView).goToEvent(eventId);
         }
     }
 
     Connections {
         target: root.currentRoom.connection
-        function onJoinedRoom(room: NeoChatRoom, invited: NeoChatRoom): void {
+        function onJoinedRoom(room, invited) {
             if (root.currentRoom.id === invited.id) {
                 RoomManager.resolveResource(room.id);
             }
@@ -195,22 +196,22 @@ Kirigami.Page {
     Connections {
         target: RoomManager
 
-        function onShowMessage(messageType: Kirigami.MessageType, message: string): void {
+        function onShowMessage(messageType, message) {
             banner.text = message;
             banner.type = messageType;
             banner.visible = true;
         }
 
-        function onShowEventSource(eventId: string): void {
-            (root.Kirigami.PageStack.pageStack as Kirigami.PageRow).pushDialogLayer(Qt.createComponent('org.kde.neochat', 'MessageSourceSheet'), {
+        function onShowEventSource(eventId) {
+            applicationWindow().pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'MessageSourceSheet'), {
                 sourceText: root.currentRoom.getEventJsonSource(eventId)
             }, {
-                title: i18nc("@title:dialog", "Message Source"),
+                title: i18n("Message Source"),
                 width: Kirigami.Units.gridUnit * 25
             });
         }
 
-        function onShowMessageMenu(eventId: string, author, messageComponentType, plainText: string, htmlText: string, selectedText: string, hoveredLink: string, isThread: bool): void {
+        function onShowMessageMenu(eventId, author, messageComponentType, plainText, htmlText, selectedText, hoveredLink, isThread) {
             const contextMenu = messageDelegateContextMenu.createObject(root, {
                 selectedText: selectedText,
                 hoveredLink: hoveredLink,

src/app/qml/ServerComboBox.qml

@@ -67,14 +67,10 @@ QQC2.ComboBox {
             QQC2.ToolButton {
                 visible: serverItem.isAddServerDelegate || serverItem.isDeletable
                 icon.name: serverItem.isAddServerDelegate ? "list-add" : "dialog-close"
-                text: serverItem.isAddServerDelegate ? i18nc("@action:button", "Add new server") : i18nc("@action:button", "Remove server")
+                text: i18nc("@action:button", "Add new server")
                 Accessible.name: text
                 display: QQC2.AbstractButton.IconOnly
 
-                QQC2.ToolTip.text: text
-                QQC2.ToolTip.visible: hovered
-                QQC2.ToolTip.delay: Kirigami.Units.toolTipDelay
-
                 onClicked: {
                     if (root.currentIndex === serverItem.index && serverItem.isDeletable) {
                         root.currentIndex = 0;
@@ -177,7 +173,7 @@ QQC2.ComboBox {
 
                 Connections {
                     target: serverListModel
-                    function onServerCheckComplete(url: string, valid: bool): void {
+                    function onServerCheckComplete(url, valid) {
                         if (url == serverUrlField.text && valid) {
                             serverUrlField.isValidServer = true;
                         }

src/app/qml/ShareAction.qml

@@ -23,6 +23,8 @@ Kirigami.Action {
     text: i18n("Share")
     tooltip: i18n("Share the selected media")
 
+    visible: false
+
     /**
      * This property holds the input data for purpose.
      *
@@ -58,7 +60,7 @@ Kirigami.Action {
                 if (id != root.eventId) {
                     return;
                 }
-                pageStack.pushDialogLayer(Qt.createComponent("org.kde.neochat", "ShareDialog"), {
+                applicationWindow().pageStack.pushDialogLayer(Qt.createComponent("org.kde.neochat", "ShareDialog"), {
                     title: root.text,
                     index: index,
                     model: root._instantiator.model

src/app/qml/UserDetailDialog.qml

@@ -261,7 +261,7 @@ Kirigami.Dialog {
                 icon.name: "delete"
                 icon.color: Kirigami.Theme.negativeTextColor
                 onTriggered: {
-                    let dialog = pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'ReasonDialog'), {
+                    let dialog = applicationWindow().pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'ReasonDialog'), {
                         title: i18nc("@title:dialog", "Remove Messages"),
                         placeholder: i18nc("@info:placeholder", "Reason for removing this user's recent messages"),
                         actionText: i18nc("@action:button 'Remove' as in 'Remove these messages'", "Remove"),

src/app/roommanager.cpp

@@ -236,18 +236,11 @@ void RoomManager::resolveResource(Uri uri, const QString &action)
     }
 }
 
-void RoomManager::maximizeMedia(const QString &eventId)
+void RoomManager::maximizeMedia(int index)
 {
-    if (eventId.isEmpty()) {
-        qWarning() << "Tried to open media for empty event id";
+    if (index < -1 || index > m_mediaMessageFilterModel->rowCount()) {
         return;
     }
-
-    const auto index = m_mediaMessageFilterModel->getRowForEventId(eventId);
-    if (index == -1) {
-        return;
-    }
-
     Q_EMIT showMaximizedMedia(index);
 }
 
@@ -271,17 +264,8 @@ void RoomManager::viewEventSource(const QString &eventId)
 
 void RoomManager::viewEventMenu(const QString &eventId, NeoChatRoom *room, NeochatRoomMember *sender, const QString &selectedText, const QString &hoveredLink)
 {
-    if (eventId.isEmpty()) {
-        qWarning() << "Tried to open event menu with empty event id";
-        return;
-    }
+    const auto &event = **room->findInTimeline(eventId);
 
-    const auto it = room->findInTimeline(eventId);
-    if (it == room->historyEdge()) {
-        // This is probably a pending event
-        return;
-    }
-    const auto &event = **it;
     if (EventHandler::mediaInfo(room, &event).contains("mimeType"_L1)) {
         Q_EMIT showFileMenu(eventId,
                             sender,
@@ -374,6 +358,19 @@ void RoomManager::visitRoom(Room *r, const QString &eventId)
     if (m_currentRoom && !m_currentRoom->editCache()->editId().isEmpty()) {
         m_currentRoom->editCache()->setEditId({});
     }
+    if (m_currentRoom && !m_currentRoom->isSpace() && m_chatDocumentHandler) {
+        // We're doing these things here because it is critical that they are switched at the same time
+        if (m_chatDocumentHandler->document()) {
+            m_currentRoom->mainCache()->setSavedText(m_chatDocumentHandler->document()->textDocument()->toPlainText());
+            m_chatDocumentHandler->setRoom(room);
+            if (room) {
+                m_chatDocumentHandler->document()->textDocument()->setPlainText(room->mainCache()->savedText());
+                room->mainCache()->setText(room->mainCache()->savedText());
+            }
+        } else {
+            m_chatDocumentHandler->setRoom(room);
+        }
+    }
 
     if (!room) {
         setCurrentRoom({});
@@ -473,6 +470,18 @@ bool RoomManager::visitNonMatrix(const QUrl &url)
     return true;
 }
 
+ChatDocumentHandler *RoomManager::chatDocumentHandler() const
+{
+    return m_chatDocumentHandler;
+}
+
+void RoomManager::setChatDocumentHandler(ChatDocumentHandler *handler)
+{
+    m_chatDocumentHandler = handler;
+    m_chatDocumentHandler->setRoom(m_currentRoom);
+    Q_EMIT chatDocumentHandlerChanged();
+}
+
 void RoomManager::setConnection(NeoChatConnection *connection)
 {
     if (m_connection == connection) {

src/app/roommanager.h

@@ -11,6 +11,7 @@
 #include <Quotient/roommember.h>
 #include <Quotient/uriresolver.h>
 
+#include "chatdocumenthandler.h"
 #include "enums/messagecomponenttype.h"
 #include "enums/messagetype.h"
 #include "models/mediamessagefiltermodel.h"
@@ -136,6 +137,13 @@ class RoomManager : public QObject, public UriResolverBase
      */
     Q_PROPERTY(bool hasOpenRoom READ hasOpenRoom NOTIFY currentRoomChanged)
 
+    /**
+     * @brief The ChatDocumentHandler for the open room.
+     *
+     * @sa ChatDocumentHandler
+     */
+    Q_PROPERTY(ChatDocumentHandler *chatDocumentHandler READ chatDocumentHandler WRITE setChatDocumentHandler NOTIFY chatDocumentHandlerChanged)
+
 public:
     virtual ~RoomManager();
     static RoomManager &instance();
@@ -204,8 +212,12 @@ public:
 
     /**
      * @brief Show a media item maximized.
+     *
+     * @param index the index to open the maximize delegate model at. This is the
+     *        index in the MediaMessageFilterModel owned by this RoomManager. A value
+     *        of -1 opens a the default item.
      */
-    Q_INVOKABLE void maximizeMedia(const QString &eventId);
+    Q_INVOKABLE void maximizeMedia(int index);
 
     Q_INVOKABLE void maximizeCode(NeochatRoomMember *author, const QDateTime &time, const QString &codeText, const QString &language);
 
@@ -225,6 +237,9 @@ public:
     Q_INVOKABLE void
     viewEventMenu(const QString &eventId, NeoChatRoom *room, NeochatRoomMember *sender, const QString &selectedText = {}, const QString &hoveredLink = {});
 
+    ChatDocumentHandler *chatDocumentHandler() const;
+    void setChatDocumentHandler(ChatDocumentHandler *handler);
+
     /**
      * @brief Set a URL to be loaded as the initial room.
      */
@@ -327,6 +342,8 @@ Q_SIGNALS:
      */
     void showMessage(MessageType::Type messageType, const QString &message);
 
+    void chatDocumentHandlerChanged();
+
     void connectionChanged();
 
     void directChatsActiveChanged();
@@ -355,6 +372,7 @@ private:
     KConfigGroup m_lastRoomConfig;
     KConfigGroup m_lastSpaceConfig;
     KConfigGroup m_directChatsConfig;
+    QPointer<ChatDocumentHandler> m_chatDocumentHandler;
 
     RoomListModel *m_roomListModel;
     SortFilterRoomListModel *m_sortFilterRoomListModel;

src/app/runner.cpp

@@ -5,8 +5,6 @@
 
 #include <QDBusMetaType>
 
-#include <KWindowSystem>
-
 #include "controller.h"
 #include "models/roomlistmodel.h"
 #include "models/sortfilterroomlistmodel.h"
@@ -88,9 +86,4 @@ void Runner::Run(const QString &id, const QString &actionId)
     WindowController::instance().showAndRaiseWindow(QString());
 }
 
-void Runner::SetActivationToken(const QString &token)
-{
-    KWindowSystem::setCurrentXdgActivationToken(token);
-}
-
 #include "moc_runner.cpp"

src/app/runner.h

@@ -190,8 +190,6 @@ public:
      */
     Q_SCRIPTABLE void Run(const QString &id, const QString &actionId);
 
-    Q_SCRIPTABLE void SetActivationToken(const QString &token);
-
 Q_SIGNALS:
     void roomListModelChanged();
 

src/chatbar/ChatBar.qml

@@ -87,7 +87,7 @@ QQC2.Control {
             displayHint: Kirigami.DisplayHint.IconOnly
 
             onTriggered: {
-                let dialog = (Clipboard.hasImage ? attachDialog : openFileDialog).createObject(root.QQC2.Overlay.overlay);
+                let dialog = (Clipboard.hasImage ? attachDialog : openFileDialog).createObject(applicationWindow().overlay);
                 dialog.chosen.connect(path => _private.chatBarCache.attachmentPath = path);
                 dialog.open();
             }
@@ -197,22 +197,6 @@ QQC2.Control {
             visible: root.currentRoom.mainCache.replyId.length > 0
             sourceComponent: replyPane
         }
-        RowLayout {
-            visible: replyLoader.visible && !root.currentRoom.mainCache.relationAuthorIsPresent
-            spacing: Kirigami.Units.smallSpacing
-
-            Kirigami.Icon {
-                source: "help-hint-symbolic"
-                color: Kirigami.Theme.disabledTextColor
-
-                Layout.preferredWidth: Kirigami.Units.iconSizes.small
-                Layout.preferredHeight: Kirigami.Units.iconSizes.small
-            }
-            QQC2.Label {
-                text: i18nc("@info", "The user you're replying to has left the room, and can't be notified.")
-                color: Kirigami.Theme.disabledTextColor
-            }
-        }
         Loader {
             id: attachLoader
 
@@ -398,6 +382,8 @@ QQC2.Control {
             implicitHeight: replyComponent.implicitHeight
             ReplyComponent {
                 id: replyComponent
+                replyEventId: _private.chatBarCache.replyId
+                replyAuthor: _private.chatBarCache.relationAuthor
                 replyContentModel: ContentProvider.contentModelForEvent(root.currentRoom, _private.chatBarCache.replyId, true)
                 Message.maxContentWidth: replyLoader.item.width
 
@@ -438,6 +424,7 @@ QQC2.Control {
     QtObject {
         id: _private
         property ChatBarCache chatBarCache
+        onChatBarCacheChanged: documentHandler.chatBarCache = chatBarCache
 
         function postMessage() {
             _private.chatBarCache.postMessage();
@@ -499,14 +486,15 @@ QQC2.Control {
 
     ChatDocumentHandler {
         id: documentHandler
-        type: ChatBarType.Room
-        room: root.currentRoom
         document: textField.textDocument
         cursorPosition: textField.cursorPosition
         selectionStart: textField.selectionStart
         selectionEnd: textField.selectionEnd
         mentionColor: Kirigami.Theme.linkColor
         errorColor: Kirigami.Theme.negativeTextColor
+        Component.onCompleted: {
+            RoomManager.chatDocumentHandler = documentHandler;
+        }
     }
 
     Component {

src/chatbar/EmojiDialog.qml

@@ -25,7 +25,7 @@ QQC2.Popup {
 
     Connections {
         target: RoomManager
-        function onCurrentRoomChanged(): void {
+        function onCurrentRoomChanged() {
             root.close();
         }
     }
@@ -65,7 +65,7 @@ QQC2.Popup {
     padding: 2
 
     implicitHeight: Kirigami.Units.gridUnit * 20 + 2 * padding
-    width: Math.min(contentItem.categoryIconSize * 11 + 2 * padding, QQC2.ApplicationWindow.window.width)
+    width: Math.min(contentItem.categoryIconSize * 11 + 2 * padding, applicationWindow().width)
     contentItem: EmojiPicker {
         id: emojiPicker
         height: 400

src/chatbar/ImageEditorPage.qml

@@ -100,7 +100,7 @@ Kirigami.Page {
             }
             Connections {
                 target: selectionTool.selectionArea
-                function onDoubleClicked(): void {
+                function onDoubleClicked() {
                     rootEditorView.crop();
                 }
             }

src/devtools/DebugOptions.qml

@@ -20,13 +20,6 @@ FormCard.FormCard {
 
         onToggled: NeoChatConfig.showAllEvents = checked
     }
-    FormCard.FormCheckDelegate {
-        text: i18nc("@option:check", "Allow sending relations to any event in the timeline")
-        description: i18nc("@info", "This includes state events")
-        checked: NeoChatConfig.relateAnyEvent
-
-        onToggled: NeoChatConfig.relateAnyEvent = checked
-    }
     FormCard.FormCheckDelegate {
         id: roomAccountDataVisibleCheck
         text: i18nc("@option:check Enable the matrix 'threads' feature", "Always allow device verification")

src/devtools/RoomData.qml

@@ -7,6 +7,7 @@ import QtQuick.Window
 
 import org.kde.kirigami as Kirigami
 import org.kde.kirigamiaddons.formcard as FormCard
+import org.kde.kitemmodels
 
 import org.kde.neochat
 

src/devtools/ServerData.qml

@@ -7,6 +7,7 @@ import QtQuick.Layouts
 
 import org.kde.kirigami as Kirigami
 import org.kde.kirigamiaddons.formcard as FormCard
+import org.kde.kitemmodels
 
 import org.kde.neochat
 

src/devtools/StateKeys.qml

@@ -7,6 +7,7 @@ import QtQuick.Window
 
 import org.kde.kirigami as Kirigami
 import org.kde.kirigamiaddons.formcard as FormCard
+import org.kde.kitemmodels
 
 import org.kde.neochat
 

src/libneochat/CMakeLists.txt

@@ -22,7 +22,6 @@ target_sources(LibNeoChat PRIVATE
     texthandler.cpp
     urlhelper.cpp
     utils.cpp
-    enums/chatbartype.h
     enums/messagecomponenttype.h
     enums/messagetype.h
     enums/powerlevel.cpp

src/libneochat/chatbarcache.cpp

@@ -15,18 +15,6 @@ using namespace Qt::StringLiterals;
 ChatBarCache::ChatBarCache(QObject *parent)
     : QObject(parent)
 {
-    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;
-    }
-    connect(room, &NeoChatRoom::memberLeft, this, &ChatBarCache::relationAuthorIsPresentChanged);
-    connect(room, &NeoChatRoom::memberJoined, this, &ChatBarCache::relationAuthorIsPresentChanged);
-    connect(this, &ChatBarCache::relationIdChanged, this, &ChatBarCache::relationAuthorIsPresentChanged);
 }
 
 QString ChatBarCache::text() const
@@ -149,11 +137,6 @@ Quotient::RoomMember ChatBarCache::relationAuthor() const
     return room->member((*room->findInTimeline(m_relationId))->senderId());
 }
 
-bool ChatBarCache::relationAuthorIsPresent() const
-{
-    return relationAuthor().membershipState() == Quotient::Membership::Join;
-}
-
 QString ChatBarCache::relationMessage() const
 {
     if (parent() == nullptr) {

src/libneochat/chatbarcache.h

@@ -99,13 +99,6 @@ class ChatBarCache : public QObject
      */
     Q_PROPERTY(Quotient::RoomMember relationAuthor READ relationAuthor NOTIFY relationIdChanged)
 
-    /**
-     * @brief If the author for the message being replied to is still present in the room.
-     *
-     * @sa Quotient::RoomMember
-     */
-    Q_PROPERTY(bool relationAuthorIsPresent READ relationAuthorIsPresent NOTIFY relationAuthorIsPresentChanged)
-
     /**
      * @brief The content of the related message.
      *
@@ -160,7 +153,6 @@ public:
     void setEditId(const QString &editId);
 
     Quotient::RoomMember relationAuthor() const;
-    bool relationAuthorIsPresent() const;
 
     QString relationMessage() const;
 
@@ -204,7 +196,6 @@ Q_SIGNALS:
     void threadIdChanged(const QString &oldThreadId, const QString &newThreadId);
     void attachmentPathChanged();
     void mentionAdded(const QString &mention);
-    void relationAuthorIsPresentChanged();
 
 private:
     QString m_text = QString();

src/libneochat/chatdocumenthandler.cpp

@@ -14,7 +14,6 @@
 #include <Sonnet/BackgroundChecker>
 #include <Sonnet/Settings>
 
-#include "chatbartype.h"
 #include "chatdocumenthandler_logging.h"
 #include "eventhandler.h"
 
@@ -68,11 +67,7 @@ public:
         if (!room) {
             return;
         }
-        const auto chatchache = handler->chatBarCache();
-        if (!chatchache) {
-            return;
-        }
-        auto mentions = chatchache->mentions();
+        auto mentions = handler->chatBarCache()->mentions();
         mentions->erase(std::remove_if(mentions->begin(),
                                        mentions->end(),
                                        [this](auto &mention) {
@@ -110,6 +105,18 @@ ChatDocumentHandler::ChatDocumentHandler(QObject *parent)
     , m_highlighter(new SyntaxHighlighter(this))
     , m_completionModel(new CompletionModel(this))
 {
+    connect(this, &ChatDocumentHandler::roomChanged, this, [this]() {
+        m_completionModel->setRoom(m_room);
+        static QPointer<NeoChatRoom> previousRoom = nullptr;
+        if (previousRoom) {
+            disconnect(m_chatBarCache, &ChatBarCache::textChanged, this, nullptr);
+        }
+        previousRoom = m_room;
+        connect(m_chatBarCache, &ChatBarCache::textChanged, this, [this]() {
+            int start = completionStartIndex();
+            m_completionModel->setText(getText().mid(start, cursorPosition() - start), getText().mid(start));
+        });
+    });
     connect(this, &ChatDocumentHandler::documentChanged, this, [this]() {
         if (!m_document) {
             m_highlighter->setDocument(nullptr);
@@ -146,20 +153,6 @@ int ChatDocumentHandler::completionStartIndex() const
     return start;
 }
 
-ChatBarType::Type ChatDocumentHandler::type() const
-{
-    return m_type;
-}
-
-void ChatDocumentHandler::setType(ChatBarType::Type type)
-{
-    if (type == m_type) {
-        return;
-    }
-    m_type = type;
-    Q_EMIT typeChanged();
-}
-
 QQuickTextDocument *ChatDocumentHandler::document() const
 {
     return m_document;
@@ -205,36 +198,22 @@ void ChatDocumentHandler::setRoom(NeoChatRoom *room)
         return;
     }
 
-    if (m_room && m_type != ChatBarType::None) {
-        m_room->cacheForType(m_type)->disconnect(this);
-        if (!m_room->isSpace() && m_document && m_type == ChatBarType::Room) {
-            m_room->mainCache()->setSavedText(document()->textDocument()->toPlainText());
-        }
-    }
-
     m_room = room;
-
-    m_completionModel->setRoom(m_room);
-    if (m_room && m_type != ChatBarType::None) {
-        connect(m_room->cacheForType(m_type), &ChatBarCache::textChanged, this, [this]() {
-            int start = completionStartIndex();
-            m_completionModel->setText(getText().mid(start, cursorPosition() - start), getText().mid(start));
-        });
-        if (!m_room->isSpace() && m_document && m_type == ChatBarType::Room) {
-            document()->textDocument()->setPlainText(room->mainCache()->savedText());
-            m_room->mainCache()->setText(room->mainCache()->savedText());
-        }
-    }
-
     Q_EMIT roomChanged();
 }
 
 ChatBarCache *ChatDocumentHandler::chatBarCache() const
 {
-    if (!m_room || m_type == ChatBarType::None) {
-        return nullptr;
+    return m_chatBarCache;
+}
+
+void ChatDocumentHandler::setChatBarCache(ChatBarCache *chatBarCache)
+{
+    if (m_chatBarCache == chatBarCache) {
+        return;
     }
-    return m_room->cacheForType(m_type);
+    m_chatBarCache = chatBarCache;
+    Q_EMIT chatBarCacheChanged();
 }
 
 void ChatDocumentHandler::complete(int index)
@@ -334,20 +313,20 @@ void ChatDocumentHandler::setSelectionEnd(int position)
 
 QString ChatDocumentHandler::getText() const
 {
-    if (!m_room || m_type == ChatBarType::None) {
-        qCWarning(ChatDocumentHandling) << "getText called with no ChatBarCache available. ChatBarType: " << m_type << " Room: " << m_room;
+    if (!m_chatBarCache) {
+        qCWarning(ChatDocumentHandling) << "getText called with m_chatBarCache set to nullptr.";
         return {};
     }
-    return m_room->cacheForType(m_type)->text();
+    return m_chatBarCache->text();
 }
 
 void ChatDocumentHandler::pushMention(const Mention mention) const
 {
-    if (!m_room || m_type == ChatBarType::None) {
-        qCWarning(ChatDocumentHandling) << "pushMention called with no ChatBarCache available. ChatBarType: " << m_type << " Room: " << m_room;
+    if (!m_chatBarCache) {
+        qCWarning(ChatDocumentHandling) << "pushMention called with m_chatBarCache set to nullptr.";
         return;
     }
-    m_room->cacheForType(m_type)->mentions()->push_back(mention);
+    m_chatBarCache->mentions()->push_back(mention);
 }
 
 QColor ChatDocumentHandler::mentionColor() const
@@ -386,7 +365,7 @@ void ChatDocumentHandler::updateMentions(QQuickTextDocument *document, const QSt
 {
     setDocument(document);
 
-    if (editId.isEmpty() || m_type == ChatBarType::None || !m_room) {
+    if (editId.isEmpty() || !m_chatBarCache || !m_room) {
         return;
     }
 
@@ -395,7 +374,7 @@ void ChatDocumentHandler::updateMentions(QQuickTextDocument *document, const QSt
             // Replaces the mentions that are baked into the HTML but plaintext in the original markdown
             const QRegularExpression re(uR"lit(<a\shref="https:\/\/matrix.to\/#\/([\S]*)"\s?>([\S]*)<\/a>)lit"_s);
 
-            m_room->cacheForType(m_type)->mentions()->clear();
+            m_chatBarCache->mentions()->clear();
 
             int linkSize = 0;
             auto matches = re.globalMatch(EventHandler::rawMessageBody(*roomMessageEvent));

src/libneochat/chatdocumenthandler.h

@@ -9,7 +9,6 @@
 #include <QTextCursor>
 
 #include "chatbarcache.h"
-#include "enums/chatbartype.h"
 #include "models/completionmodel.h"
 #include "neochatroom.h"
 
@@ -63,11 +62,6 @@ class ChatDocumentHandler : public QObject
     Q_OBJECT
     QML_ELEMENT
 
-    /**
-     * @brief The QQuickTextDocument that is being handled.
-     */
-    Q_PROPERTY(ChatBarType::Type type READ type WRITE setType NOTIFY typeChanged)
-
     /**
      * @brief The QQuickTextDocument that is being handled.
      */
@@ -101,6 +95,11 @@ 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.
      */
@@ -114,9 +113,6 @@ class ChatDocumentHandler : public QObject
 public:
     explicit ChatDocumentHandler(QObject *parent = nullptr);
 
-    ChatBarType::Type type() const;
-    void setType(ChatBarType::Type type);
-
     [[nodiscard]] QQuickTextDocument *document() const;
     void setDocument(QQuickTextDocument *document);
 
@@ -132,7 +128,8 @@ public:
     [[nodiscard]] NeoChatRoom *room() const;
     void setRoom(NeoChatRoom *room);
 
-    ChatBarCache *chatBarCache() const;
+    [[nodiscard]] ChatBarCache *chatBarCache() const;
+    void setChatBarCache(ChatBarCache *chatBarCache);
 
     Q_INVOKABLE void complete(int index);
 
@@ -150,10 +147,10 @@ public:
     Q_INVOKABLE void updateMentions(QQuickTextDocument *document, const QString &editId);
 
 Q_SIGNALS:
-    void typeChanged();
     void documentChanged();
     void cursorPositionChanged();
     void roomChanged();
+    void chatBarCacheChanged();
     void selectionStartChanged();
     void selectionEndChanged();
     void errorColorChanged();
@@ -162,10 +159,10 @@ Q_SIGNALS:
 private:
     int completionStartIndex() const;
 
-    ChatBarType::Type m_type = ChatBarType::None;
     QPointer<QQuickTextDocument> m_document;
 
     QPointer<NeoChatRoom> m_room;
+    QPointer<ChatBarCache> m_chatBarCache;
 
     QColor m_mentionColor;
     QColor m_errorColor;

src/libneochat/enums/chatbartype.h

@@ -1,31 +0,0 @@
-// SPDX-FileCopyrightText: 2025 James Graham <james.h.graham@protonmail.com>
-// SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
-
-#pragma once
-
-#include <QObject>
-#include <QQmlEngine>
-
-/**
- * @class ChatBarType
- *
- * This class is designed to define the ChatBarType enumeration.
- */
-class ChatBarType : public QObject
-{
-    Q_OBJECT
-    QML_ELEMENT
-    QML_UNCREATABLE("")
-
-public:
-    /**
-     * @brief The type of chatbar.
-     */
-    enum Type {
-        Room = 0, /**< A standard room chatbar for creating new messages. */
-        Edit, /**< A chatbar for editing an existing message. */
-        Thread, /**< A chatbar for creating a new threaded message. */
-        None, /**< Undefined. */
-    };
-    Q_ENUM(Type);
-};

src/libneochat/enums/messagecomponenttype.h

@@ -70,23 +70,13 @@ public:
      *
      * @param event the event to return a type for.
      *
-     * @param isInReply whether this event is to be treated like a replied-to event (i.e., a basic text fallback should be shown if no other type is used)
-     *
      * @sa Type
      */
-    static Type typeForEvent(const Quotient::RoomEvent &event, bool isInReply = false)
+    static Type typeForEvent(const Quotient::RoomEvent &event)
     {
         using namespace Quotient;
 
-        if (event.isRedacted()) {
-            return MessageComponentType::Text;
-        }
-
         if (const auto e = eventCast<const RoomMessageEvent>(&event)) {
-            if (e->rawMsgtype() == u"m.key.verification.request"_s) {
-                return MessageComponentType::Verification;
-            }
-
             switch (e->msgtype()) {
             case MessageEventType::Emote:
                 return MessageComponentType::Text;
@@ -113,8 +103,7 @@ public:
             if (event.matrixType() == u"org.matrix.msc3672.beacon_info"_s) {
                 return MessageComponentType::LiveLocation;
             }
-            // In the (unlikely) case that this is a reply to a state event, we do want to show something
-            return isInReply ? MessageComponentType::Text : MessageComponentType::Other;
+            return MessageComponentType::Other;
         }
         if (is<const EncryptedEvent>(event)) {
             return MessageComponentType::Encrypted;
@@ -127,8 +116,7 @@ public:
             return MessageComponentType::Poll;
         }
 
-        // In the (unlikely) case that this is a reply to an unusual event, we do want to show something
-        return isInReply ? MessageComponentType::Text : MessageComponentType::Other;
+        return MessageComponentType::Other;
     }
 
     /**

src/libneochat/eventhandler.cpp

@@ -198,10 +198,6 @@ bool EventHandler::isHidden(const NeoChatRoom *room, const Quotient::RoomEvent *
 
 Qt::TextFormat EventHandler::messageBodyInputFormat(const Quotient::RoomMessageEvent &event)
 {
-    if (event.isRedacted() && !event.isStateEvent()) {
-        return Qt::RichText;
-    }
-
     if (event.mimeType().name() == "text/plain"_L1) {
         return Qt::PlainText;
     } else {
@@ -211,11 +207,6 @@ Qt::TextFormat EventHandler::messageBodyInputFormat(const Quotient::RoomMessageE
 
 QString EventHandler::rawMessageBody(const Quotient::RoomMessageEvent &event)
 {
-    if (event.isRedacted() && !event.isStateEvent()) {
-        auto reason = event.redactedBecause()->reason();
-        return (reason.isEmpty()) ? i18n("<i>[This message was deleted]</i>") : i18n("<i>[This message was deleted: %1]</i>", reason.toHtmlEscaped());
-    }
-
     QString body;
 
     if (event.has<EventContent::FileContent>()) {
@@ -457,12 +448,6 @@ QString EventHandler::getBody(const NeoChatRoom *room, const Quotient::RoomEvent
         [](const PollStartEvent &e) {
             return e.question();
         },
-        [](const EncryptedEvent &) {
-            return i18nc("@info In room list", "Encrypted event");
-        },
-        [](const ReactionEvent &e) {
-            return i18nc("[user] reacted with <emoji>", "reacted with %1", e.key());
-        },
         i18n("Unknown event"));
 }
 

src/libneochat/messagecomponent.h

@@ -7,12 +7,12 @@
 
 struct MessageComponent {
     MessageComponentType::Type type = MessageComponentType::Other;
-    QString display;
+    QString content;
     QVariantMap attributes;
 
     bool operator==(const MessageComponent &right) const
     {
-        return type == right.type && display == right.display && attributes == right.attributes;
+        return type == right.type && content == right.content && attributes == right.attributes;
     }
 
     bool isEmpty() const

src/libneochat/models/userlistmodel.cpp

@@ -100,10 +100,6 @@ QVariant UserListModel::data(const QModelIndex &index, int role) const
         return plEvent->powerLevelForUser(memberId);
     }
     if (role == PowerLevelStringRole) {
-        if (m_currentRoom->roomCreatorHasUltimatePowerLevel() && m_currentRoom->isCreator(memberId)) {
-            return i18nc("@info the person that created this room", "Creator");
-        }
-
         auto pl = m_currentRoom->currentState().get<RoomPowerLevelsEvent>();
         // User might not in the room yet, in this case pl can be nullptr.
         // e.g. When invited but user not accepted or denied the invitation.

src/libneochat/neochatconnection.cpp

@@ -558,9 +558,4 @@ bool NeoChatConnection::enablePushNotifications() const
     return m_pushNotificationsEnabled;
 }
 
-bool NeoChatConnection::isVerifiedSession() const
-{
-    return isVerifiedDevice(userId(), deviceId());
-}
-
 #include "moc_neochatconnection.cpp"

src/libneochat/neochatconnection.h

@@ -206,11 +206,6 @@ public:
 
     LinkPreviewer *previewerForLink(const QUrl &link);
 
-    /**
-     * @return True if this connection is a verified session.
-     */
-    Q_INVOKABLE bool isVerifiedSession() const;
-
 Q_SIGNALS:
     void globalUrlPreviewEnabledChanged();
     void labelChanged();

src/libneochat/neochatroom.cpp

@@ -2,15 +2,12 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
 #include "neochatroom.h"
-#include "chatbartype.h"
 
 #include <QFileInfo>
 #include <QMediaMetaData>
 #include <QMediaPlayer>
 #include <QMimeDatabase>
 #include <QTemporaryFile>
-#include <QVideoFrame>
-#include <QVideoSink>
 
 #include <Quotient/events/eventcontent.h>
 #include <Quotient/events/eventrelation.h>
@@ -248,37 +245,11 @@ QCoro::Task<void> NeoChatRoom::doUploadFile(QUrl url, QString body, std::optiona
     } else if (mime.name().startsWith("audio/"_L1)) {
         content = new EventContent::AudioContent(url, fileInfo.size(), mime, fileInfo.fileName());
     } else if (mime.name().startsWith("video/"_L1)) {
-        QVideoSink sink;
-
         QMediaPlayer player;
         player.setSource(url);
-        player.setVideoSink(&sink);
         co_await qCoro(&player, &QMediaPlayer::mediaStatusChanged);
-
-        // Get the first video frame to use as a thumbnail.
-        player.play();
-        co_await qCoro(&player, &QMediaPlayer::positionChanged);
-
-        QTemporaryFile file;
-        file.setFileTemplate(QStringLiteral("XXXXXX.jpg"));
-        file.open();
-
-        const auto thumbnailImage = sink.videoFrame().toImage();
-        Q_UNUSED(thumbnailImage.save(file.fileName()))
-        player.stop(); // We have to delay the stop() because it will invalidate our image
-
-        const auto thumbnailFileInfo = QFileInfo(file.fileName());
-
-        // Upload the thumbnail
-        const auto job = connection()->uploadFile(thumbnailFileInfo.absoluteFilePath());
-        co_await qCoro(job.get(), &BaseJob::finished);
-
-        const auto resolution = player.metaData().value(QMediaMetaData::Resolution).toSize();
+        auto resolution = player.metaData().value(QMediaMetaData::Resolution).toSize();
         content = new EventContent::VideoContent(url, fileInfo.size(), mime, resolution, fileInfo.fileName());
-        content->thumbnail = EventContent::Thumbnail(job->contentUri(),
-                                                     thumbnailFileInfo.size(),
-                                                     QMimeDatabase().mimeTypeForName(QStringLiteral("image/jpeg")),
-                                                     thumbnailImage.size());
     } else {
         content = new EventContent::FileContent(url, fileInfo.size(), mime, fileInfo.fileName());
     }
@@ -388,14 +359,9 @@ const RoomEvent *NeoChatRoom::lastEvent(std::function<bool(const RoomEvent *)> f
         if (auto lastEvent = eventCast<const RoomMessageEvent>(event)) {
             return lastEvent;
         }
-
         if (auto lastEvent = eventCast<const PollStartEvent>(event)) {
             return lastEvent;
         }
-
-        if (auto lastEvent = eventCast<const EncryptedEvent>(event)) {
-            return lastEvent;
-        }
     }
 
     if (m_cachedEvent != nullptr) {
@@ -475,19 +441,20 @@ void NeoChatRoom::onRedaction(const RoomEvent &prevEvent, const RoomEvent & /*af
     }
 }
 
-QDateTime NeoChatRoom::lastActiveTime() const
+QDateTime NeoChatRoom::lastActiveTime()
 {
-    // Find the last relevant event:
-    if (const auto event = lastEvent(m_hiddenFilter)) {
+    if (timelineSize() == 0) {
+        if (m_cachedEvent != nullptr) {
+            return m_cachedEvent->originTimestamp();
+        }
+        return QDateTime();
+    }
+
+    if (auto event = lastEvent()) {
         return event->originTimestamp();
     }
 
-    // If nothing is loaded yet, and there is no cached event:
-    if (timelineSize() == 0) {
-        return {};
-    }
-
-    // No message found, take last event:
+    // no message found, take last event
     return messageEvents().rbegin()->get()->originTimestamp();
 }
 
@@ -565,9 +532,6 @@ bool NeoChatRoom::containsUser(const QString &userID) const
 
 bool NeoChatRoom::canSendEvent(const QString &eventType) const
 {
-    if (roomCreatorHasUltimatePowerLevel() && isCreator(localMember().id())) {
-        return true;
-    }
     auto plEvent = currentState().get<RoomPowerLevelsEvent>();
     if (!plEvent) {
         return false;
@@ -580,9 +544,6 @@ bool NeoChatRoom::canSendEvent(const QString &eventType) const
 
 bool NeoChatRoom::canSendState(const QString &eventType) const
 {
-    if (roomCreatorHasUltimatePowerLevel() && isCreator(localMember().id())) {
-        return true;
-    }
     auto plEvent = currentState().get<RoomPowerLevelsEvent>();
     if (!plEvent) {
         return false;
@@ -1320,19 +1281,6 @@ void NeoChatRoom::copyEventMedia(const QString &eventId)
     }
 }
 
-FileTransferInfo NeoChatRoom::cachedFileTransferInfo(const QString &eventId) const
-{
-    if (eventId.isEmpty()) {
-        return {};
-    }
-
-    const auto eventResult = getEvent(eventId);
-    if (!eventResult.first) {
-        return {};
-    }
-    return cachedFileTransferInfo(eventResult.first);
-}
-
 FileTransferInfo NeoChatRoom::cachedFileTransferInfo(const Quotient::RoomEvent *event) const
 {
     QString mxcUrl;
@@ -1391,20 +1339,6 @@ ChatBarCache *NeoChatRoom::threadCache() const
     return m_threadCache;
 }
 
-ChatBarCache *NeoChatRoom::cacheForType(ChatBarType::Type type) const
-{
-    switch (type) {
-    case ChatBarType::Room:
-        return m_mainCache;
-    case ChatBarType::Edit:
-        return m_editCache;
-    case ChatBarType::Thread:
-        return m_threadCache;
-    default:
-        return nullptr;
-    }
-}
-
 void NeoChatRoom::replyLastMessage()
 {
     const auto &timelineBottom = messageEvents().rbegin();
@@ -1736,14 +1670,8 @@ void NeoChatRoom::setRoomState(const QString &type, const QString &stateKey, con
 
 NeochatRoomMember *NeoChatRoom::qmlSafeMember(const QString &memberId)
 {
-    if (memberId.isEmpty()) {
-        return nullptr;
-    }
-
     if (!m_memberObjects.contains(memberId)) {
-        auto member = m_memberObjects.emplace(memberId, std::make_unique<NeochatRoomMember>(this, memberId)).first->second.get();
-        QQmlEngine::setObjectOwnership(member, QQmlEngine::CppOwnership);
-        return member;
+        return m_memberObjects.emplace(memberId, std::make_unique<NeochatRoomMember>(this, memberId)).first->second.get();
     }
 
     return m_memberObjects[memberId].get();
@@ -1803,20 +1731,4 @@ void NeoChatRoom::setHiddenFilter(std::function<bool(const Quotient::RoomEvent *
     NeoChatRoom::m_hiddenFilter = hiddenFilter;
 }
 
-bool NeoChatRoom::roomCreatorHasUltimatePowerLevel() const
-{
-    bool ok = false;
-    auto version = this->version().toInt(&ok);
-    // This is terrible. For non-numeric room versions, I don't think there's a way of knowing whether they're pre- or post hydra.
-    // We just assume they are. Shouldn't matter for normal users anyway.
-    return !ok || version > 11;
-}
-
-bool NeoChatRoom::isCreator(const QString &userId) const
-{
-    auto createEvent = currentState().get<RoomCreateEvent>();
-    return roomCreatorHasUltimatePowerLevel() && createEvent
-        && (createEvent->senderId() == userId || createEvent->contentPart<QStringList>(u"additional_creators"_s).contains(userId));
-}
-
 #include "moc_neochatroom.cpp"

src/libneochat/neochatroom.h

@@ -12,7 +12,6 @@
 
 #include <QCoroTask>
 
-#include "enums/chatbartype.h"
 #include "enums/messagetype.h"
 #include "enums/pushrule.h"
 #include "events/pollevent.h"
@@ -209,7 +208,7 @@ public:
     bool visible() const;
     void setVisible(bool visible);
 
-    [[nodiscard]] QDateTime lastActiveTime() const;
+    [[nodiscard]] QDateTime lastActiveTime();
 
     /**
      * @brief Get the last interesting event.
@@ -485,8 +484,6 @@ public:
 
     ChatBarCache *threadCache() const;
 
-    ChatBarCache *cacheForType(ChatBarType::Type type) const;
-
     /**
      * @brief Reply to the last message sent in the timeline.
      *
@@ -547,15 +544,7 @@ public:
      * @brief Return the cached file transfer information for the event.
      *
      * If we downloaded the file previously, return a struct with Completed status
-     * and the local file path stored in KSharedConfig
-     */
-    Quotient::FileTransferInfo cachedFileTransferInfo(const QString &eventId) const;
-
-    /**
-     * @brief Return the cached file transfer information for the event.
-     *
-     * If we downloaded the file previously, return a struct with Completed status
-     * and the local file path stored in KSharedConfig
+     * and the local file path stored in KSharedCOnfig
      */
     Quotient::FileTransferInfo cachedFileTransferInfo(const Quotient::RoomEvent *event) const;
 
@@ -600,18 +589,6 @@ public:
 
     static void setHiddenFilter(std::function<bool(const Quotient::RoomEvent *)> hiddenFilter);
 
-    /**
-     * @brief Whether this room has a room version where the creator is treated as having an ultimate power level
-     *
-     * For unusual room versions, this information might be wrong.
-     */
-    bool roomCreatorHasUltimatePowerLevel() const;
-
-    /**
-     * @brief Whether this user is considered a creator of this room. Only applies to post-v12 rooms.
-     */
-    bool isCreator(const QString &userId) const;
-
 private:
     bool m_visible = false;