Proof-of-concept QML test

WIP, do not review yet

.kde-ci.yml

@@ -10,7 +10,6 @@ Dependencies:
       'frameworks/ki18n': '@latest-kf6'
       'frameworks/kconfig': '@latest-kf6'
       'frameworks/syntax-highlighting': '@latest-kf6'
-      'frameworks/kiconthemes': '@latest-kf6'
       'frameworks/kitemmodels': '@latest-kf6'
       'frameworks/kquickcharts': '@latest-kf6'
       'frameworks/knotifications': '@latest-kf6'

CMakeLists.txt

@@ -55,7 +55,7 @@ ecm_setup_version(${PROJECT_VERSION}
     VERSION_HEADER ${CMAKE_CURRENT_BINARY_DIR}/neochat-version.h
 )
 
-find_package(Qt6 ${QT_MIN_VERSION} NO_MODULE COMPONENTS Core Quick Gui QuickControls2 Multimedia Svg TextToSpeech WebView)
+find_package(Qt6 ${QT_MIN_VERSION} NO_MODULE COMPONENTS Core Quick Gui QuickControls2 Multimedia Svg TextToSpeech WebView QuickTest)
 set_package_properties(Qt6 PROPERTIES
     TYPE REQUIRED
     PURPOSE "Basic application components"
@@ -65,7 +65,7 @@ if (QT_KNOWN_POLICY_QTP0004)
 qt_policy(SET QTP0004 NEW)
 endif ()
 
-find_package(KF6 ${KF_MIN_VERSION} COMPONENTS Kirigami I18n Notifications Config CoreAddons Sonnet ItemModels ColorScheme IconThemes)
+find_package(KF6 ${KF_MIN_VERSION} COMPONENTS Kirigami I18n Notifications Config CoreAddons Sonnet ItemModels ColorScheme)
 set_package_properties(KF6 PROPERTIES
     TYPE REQUIRED
     PURPOSE "Basic application components"

autotests/CMakeLists.txt

@@ -9,6 +9,21 @@ target_link_libraries(neochat_server PUBLIC Qt::HttpServer QuotientQt6)
 
 add_definitions(-DDATA_DIR="${CMAKE_CURRENT_SOURCE_DIR}/data" )
 
+macro(add_qml_tests)
+    if (WIN32)
+        set(_extra_args -platform offscreen)
+    endif()
+
+    foreach(test ${ARGV})
+        add_test(NAME ${test}
+                COMMAND qmltest
+                ${_extra_args}
+                -input ${test}
+                WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+        )
+    endforeach()
+endmacro()
+
 ecm_add_test(
     neochatroomtest.cpp
     LINK_LIBRARIES neochat Qt::Test
@@ -104,3 +119,14 @@ ecm_add_test(
     LINK_LIBRARIES neochat Qt::Test neochat_server
     TEST_NAME roommanagertest
 )
+
+add_executable(qmltest qmltest.cpp)
+target_link_libraries(qmltest
+        PRIVATE
+        Qt6::Qml
+        Qt6::QuickTest
+        neochat_server
+        neochat
+        neochatplugin)
+
+add_qml_tests(tst_media.qml)

autotests/actionstest.cpp

@@ -63,7 +63,7 @@ void ActionsTest::testActions_data()
     QTest::addColumn<std::optional<QString>>("resultText");
     QTest::addColumn<std::optional<Quotient::RoomMessageEvent::MsgType>>("type");
 
-    QTest::newRow("shrug") << u"/shrug Hello"_s << std::make_optional(u"¯\\\\\\_(ツ)\\_/¯ Hello"_s)
+    QTest::newRow("shrug") << u"/shrug Hello"_s << std::make_optional(u"¯\\\\_(ツ)_/¯ Hello"_s)
                            << std::make_optional(Quotient::RoomMessageEvent::MsgType::Text);
     QTest::newRow("lenny") << u"/lenny Hello"_s << std::make_optional(u"( ͡° ͜ʖ ͡°) Hello"_s) << std::make_optional(Quotient::RoomMessageEvent::MsgType::Text);
     QTest::newRow("tableflip") << u"/tableflip Hello"_s << std::make_optional(u"(╯°□°）╯︵ ┻━┻ Hello"_s)

autotests/qmltest.cpp

@@ -0,0 +1,61 @@
+/*
+ *  SPDX-FileCopyrightText: 2020 Arjen Hiemstra <ahiemstra@heimr.nl>
+ *
+ *  SPDX-License-Identifier: LGPL-2.0-or-later
+ */
+
+#include <KLocalizedContext>
+#include <KLocalizedString>
+#include <QNetworkDiskCache>
+#include <QQmlContext>
+#include <QQmlEngine>
+#include <QQmlNetworkAccessManagerFactory>
+#include <QStandardPaths>
+#include <Quotient/networkaccessmanager.h>
+#include <quicktest.h>
+
+#include "accountmanager.h"
+#include "server.h"
+
+using namespace Quotient;
+using namespace Qt::StringLiterals;
+
+class NetworkAccessManagerFactory : public QQmlNetworkAccessManagerFactory
+{
+    QNetworkAccessManager *create(QObject *) override
+    {
+        auto nam = NetworkAccessManager::instance();
+        QObject::connect(nam, &QNetworkAccessManager::sslErrors, nam, [](auto reply, auto errors) {
+            reply->ignoreSslErrors(errors);
+        });
+        nam->setRedirectPolicy(QNetworkRequest::NoLessSafeRedirectPolicy);
+
+        return nam;
+    }
+};
+
+class Setup : public QObject
+{
+    Q_OBJECT
+
+public:
+    Setup() = default;
+
+    Server server;
+
+public Q_SLOTS:
+    void qmlEngineAvailable(QQmlEngine *engine)
+    {
+        KLocalizedString::setApplicationDomain(QByteArrayLiteral("neochat"));
+
+        engine->setNetworkAccessManagerFactory(new NetworkAccessManagerFactory());
+        engine->rootContext()->setContextObject(new KLocalizedContext(engine));
+
+        server.start();
+        Q_UNUSED(new AccountManager(true));
+    }
+};
+
+QUICK_TEST_MAIN_WITH_SETUP(NeoChat, Setup)
+
+#include "qmltest.moc"

autotests/server.cpp

@@ -12,6 +12,8 @@
 #include <QSslKey>
 #include <QUuid>
 
+#include <QBuffer>
+#include <QImage>
 #include <Quotient/networkaccessmanager.h>
 
 using namespace Qt::Literals::StringLiterals;
@@ -116,6 +118,20 @@ void Server::start()
                    });
 
     m_server.route(u"/_matrix/client/r0/sync"_s, QHttpServerRequest::Method::Get, this, &Server::sync);
+    m_server.route(u"/_matrix/client/v1/media/download/<arg>/<arg>"_s,
+                   QHttpServerRequest::Method::Get,
+                   [](const QString &serverName, const QString &mediaId, QHttpServerResponder &responder) {
+                       qInfo() << serverName << mediaId;
+                       QImage image(128, 128, QImage::Format::Format_RGB32);
+                       image.fill(Qt::white);
+
+                       QByteArray bytes;
+                       QBuffer buffer(&bytes);
+                       buffer.open(QIODevice::WriteOnly);
+                       image.save(&buffer, "PNG");
+
+                       responder.write(&buffer, "image/png", QHttpServerResponder::StatusCode::Ok);
+                   });
 
     QSslConfiguration config;
     QFile key(QStringLiteral(DATA_DIR) + u"/localhost.key"_s);

autotests/timelinemessagemodeltest.cpp

@@ -208,7 +208,7 @@ void TimelineMessageModelTest::idToRow()
     auto room = new TestUtils::TestRoom(connection, u"#myroom:kde.org"_s, u"test-min-sync.json"_s);
     model->setRoom(room);
 
-    QCOMPARE(model->indexForEventId(u"$153456789:example.org"_s).row(), 0);
+    QCOMPARE(model->indexforEventId(u"$153456789:example.org"_s).row(), 0);
 }
 
 void TimelineMessageModelTest::cleanup()

autotests/tst_media.qml

@@ -0,0 +1,73 @@
+/*
+ *  SPDX-FileCopyrightText: 2025 Joshua Goins <josh@redstrate.com>
+ *
+ *  SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
+ */
+
+import QtQuick
+import QtQuick.Controls as QQC2
+import QtTest
+
+import org.kde.kirigami as Kirigami
+import org.kde.neochat.messagecontent
+
+TestCase {
+    id: root
+
+    name: "ImageComponentTest"
+
+    width: 300
+    height: 300
+
+    // Base component to not re-initialize the same variables over and over
+    component BaseImageComponent: ImageComponent {
+        eventId: "dummyevent"
+        display: "dummytext"
+        fileTransferInfo: null
+    }
+
+    Component {
+        id: invalidMxcUrlComponent
+        BaseImageComponent {
+            componentAttributes: QtObject {
+                property bool isSticker: false
+                property bool animated: false
+                // Missing user_id, which is required in libQuotient
+                property string source: "mxc://localhost:1234/AAAAAAAAAAAAAAAAAAAAAAAA?room_id=!AjYwbldYDmSVfGrVHV:localhost&event_id=$vJfWLoXK02im0M3rlFWLosiHojrwWSknLb0JXveEE1o"
+            }
+        }
+    }
+
+    Component {
+        id: validMxcUrlComponent
+        BaseImageComponent {
+            componentAttributes: QtObject {
+                property bool isSticker: false
+                property bool animated: false
+                property string source: "mxc://localhost:1234/AAAAAAAAAAAAAAAAAAAAAAAA?user_id=@user:localhost:1234&room_id=!AjYwbldYDmSVfGrVHV:localhost&event_id=$vJfWLoXK02im0M3rlFWLosiHojrwWSknLb0JXveEE1o"
+            }
+        }
+    }
+
+    function test_invalid() {
+        wait(1000); // Wait for Quotient to grab the right capability
+
+        ignoreWarning("No connection specified, cannot convert mxc request");
+
+        const item = createTemporaryObject(invalidMxcUrlComponent, this);
+        verify(item);
+        compare(item._private.imageItem.status, Image.Loading);
+
+        // It should fail if we didn't specify the connection
+        tryCompare(item._private.imageItem, "status", Image.Error);
+    }
+
+    function test_basic() {
+        wait(1000); // Wait for Quotient to grab the right capability
+
+        const item = createTemporaryObject(validMxcUrlComponent, this);
+        verify(item);
+        compare(item._private.imageItem.status, Image.Loading); // initial load
+        tryCompare(item._private.imageItem, "status", Image.Error);
+    }
+}

org.kde.neochat.appdata.xml

@@ -487,7 +487,6 @@
     <content_attribute id="social-chat">intense</content_attribute>
   </content_rating>
   <releases>
-    <release version="25.12.1" date="2026-01-08"/>
     <release version="25.12.0" date="2025-12-11"/>
     <release version="25.08.3" date="2025-11-06"/>
     <release version="25.08.2" date="2025-10-09"/>

org.kde.neochat.desktop

@@ -108,7 +108,6 @@ Comment[ia]=Conversation en ditecto sur Matrix
 Comment[it]= su Matrix
 Comment[ka]=ჩატი Matrix-ზე
 Comment[ko]=Matrix에서 대화하기
-Comment[lt]=Pokalbiai per Matrix
 Comment[lv]=Tērzējiet „Matrix“ tīklā
 Comment[nl]=Chat op Matrix
 Comment[pl]=Rozmawiaj na Matriksie

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

@@ -22,7 +22,7 @@ SPDX-License-Identifier: CC-BY-SA-4.0
 >carl@carlschwan.eu</email
 ></author>
 <date
->2022‒11‒01</date>
+>2022-11-01</date>
 <releaseinfo
 >22.09</releaseinfo>
 <productname
@@ -111,9 +111,9 @@ SPDX-License-Identifier: CC-BY-SA-4.0
 ><title
 >Telif Hakkı</title>
 <para
->Telif hakkı &copy; 2020–2022 Tobias Fella </para>
+>Telif hakkı &copy; 2020-2022 Tobias Fella </para>
 <para
->Telif hakkı &copy; 2020–2022 Carl Schwan </para>
+>Telif hakkı &copy; 2020-2022 Carl Schwan </para>
 <para
 >Lisans: GNU Genel Kamu Lisansa, 3. sürüm veya sonrası &lt;<ulink url="https://www.gnu.org/licenses/gpl-3.0.html"
 >https://www.gnu.org/licenses/gpl-3.0.html</ulink

src/app/CMakeLists.txt

@@ -3,7 +3,7 @@
 # SPDX-FileCopyrightText: 2020-2021 Tobias Fella <tobias.fella@kde.org>
 # SPDX-License-Identifier: BSD-2-Clause
 
-qt_add_library(neochat STATIC
+add_library(neochat STATIC
     controller.cpp
     controller.h
     roommanager.cpp
@@ -35,10 +35,6 @@ qt_add_library(neochat STATIC
     models/commonroomsmodel.h
     texttospeechhelper.h
     texttospeechhelper.cpp
-    models/limitermodel.cpp
-    models/limitermodel.h
-    supportcontroller.cpp
-    supportcontroller.h
 )
 
 set_source_files_properties(qml/OsmLocationPlugin.qml PROPERTIES
@@ -108,8 +104,6 @@ ecm_add_qml_module(neochat URI org.kde.neochat GENERATE_PLUGIN_SOURCE
         qml/NewPollDialog.qml
         qml/UserMenu.qml
         qml/MeetingDialog.qml
-        qml/SeenByDialog.qml
-        qml/SupportDialog.qml
     DEPENDENCIES
         QtCore
         QtQuick
@@ -146,17 +140,10 @@ if(WIN32)
     set_target_properties(neochat PROPERTIES OUTPUT_NAME "neochatlib")
 endif()
 
-qt_add_executable(neochat-app
+add_executable(neochat-app
     main.cpp
 )
 
-if(ANDROID)
-    set_target_properties(neochat-app PROPERTIES
-        OUTPUT_NAME "neochat-app"
-        PREFIX "lib"
-    )
-endif()
-
 if(TARGET Qt::WebView)
     target_link_libraries(neochat-app PUBLIC Qt::WebView)
     target_compile_definitions(neochat-app PUBLIC -DHAVE_WEBVIEW)
@@ -166,7 +153,6 @@ target_include_directories(neochat-app PRIVATE ${CMAKE_BINARY_DIR})
 
 target_link_libraries(neochat-app PRIVATE
     neochat
-    KF6::IconThemes
 )
 
 ecm_add_app_icon(NEOCHAT_ICON ICONS ${CMAKE_SOURCE_DIR}/128-logo.png)
@@ -197,7 +183,7 @@ else()
 endif()
 
 target_include_directories(neochat PRIVATE ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/models)
-target_link_libraries(neochat PRIVATE neochatplugin Loginplugin Roomsplugin RoomInfoplugin MessageContentplugin Timelineplugin Spacesplugin Chatbarplugin Settingsplugin Devtoolsplugin)
+target_link_libraries(neochat PRIVATE Loginplugin Roomsplugin RoomInfoplugin MessageContentplugin Timelineplugin Spacesplugin Chatbarplugin Settingsplugin Devtoolsplugin)
 target_link_libraries(neochat PUBLIC
     LibNeoChat
     Timeline
@@ -220,7 +206,6 @@ target_link_libraries(neochat PUBLIC
     KF6::ItemModels
     KF6::I18nQml
     KirigamiApp
-    KirigamiAddonsComponents
     QuotientQt6
     Login
     Rooms

src/app/main.cpp

@@ -33,7 +33,6 @@
 #include <KWindowSystem>
 #endif
 
-#include <KIconTheme>
 #include <KLocalizedQmlContext>
 #include <KLocalizedString>
 #include <KirigamiApp>
@@ -103,10 +102,6 @@ int main(int argc, char *argv[])
 {
     QNetworkProxyFactory::setUseSystemConfiguration(true);
 
-    // We currently need to do this ourselves,
-    // KirigamiApp currently called this after constructing the app which breaks icons on Windows.
-    KIconTheme::initTheme();
-
 #ifdef HAVE_WEBVIEW
     QtWebView::initialize();
     QCoreApplication::setAttribute(Qt::AA_ShareOpenGLContexts);

src/app/models/commonroomsmodel.cpp

@@ -5,7 +5,6 @@
 #include "jobs/neochatgetcommonroomsjob.h"
 
 #include <QGuiApplication>
-#include <Quotient/room.h>
 
 using namespace Quotient;
 
@@ -40,22 +39,8 @@ void CommonRoomsModel::setUserId(const QString &userId)
 
 QVariant CommonRoomsModel::data(const QModelIndex &index, int roleName) const
 {
-    auto roomId = m_commonRooms[index.row()];
-    auto room = connection()->room(roomId);
-    if (!room) {
-        return {};
-    }
-
-    switch (roleName) {
-    case Qt::DisplayRole:
-    case RoomNameRole:
-        return room->displayName();
-    case RoomAvatarRole:
-        return room->avatarUrl();
-    case RoomIdRole:
-        return roomId;
-    }
-
+    Q_UNUSED(index)
+    Q_UNUSED(roleName)
     return {};
 }
 
@@ -65,15 +50,6 @@ int CommonRoomsModel::rowCount(const QModelIndex &parent) const
     return m_commonRooms.size();
 }
 
-QHash<int, QByteArray> CommonRoomsModel::roleNames() const
-{
-    return {
-        {RoomIdRole, "roomId"},
-        {RoomNameRole, "roomName"},
-        {RoomAvatarRole, "roomAvatar"},
-    };
-}
-
 void CommonRoomsModel::reload()
 {
     if (!m_connection || m_userId.isEmpty()) {

src/app/models/commonroomsmodel.h

@@ -24,9 +24,7 @@ class CommonRoomsModel : public QAbstractListModel
 
 public:
     enum Roles {
-        RoomIdRole = Qt::UserRole,
-        RoomNameRole,
-        RoomAvatarRole,
+        RoomIdRole = Qt::DisplayRole,
     };
     Q_ENUM(Roles)
 
@@ -41,8 +39,6 @@ public:
     [[nodiscard]] QVariant data(const QModelIndex &index, int roleName) const override;
     [[nodiscard]] Q_INVOKABLE int rowCount(const QModelIndex &parent = {}) const override;
 
-    QHash<int, QByteArray> roleNames() const override;
-
 Q_SIGNALS:
     void connectionChanged();
     void userIdChanged();

src/app/models/limitermodel.cpp

@@ -1,41 +0,0 @@
-// SPDX-FileCopyrightText: 2024 Joshua Goins <josh@redstrate.com>
-// SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
-
-#include "models/limitermodel.h"
-
-LimiterModel::LimiterModel(QObject *parent)
-    : QSortFilterProxyModel(parent)
-{
-    connect(this, &QSortFilterProxyModel::rowsInserted, this, &LimiterModel::extraCountChanged);
-    connect(this, &QSortFilterProxyModel::rowsRemoved, this, &LimiterModel::extraCountChanged);
-    connect(this, &QSortFilterProxyModel::modelReset, this, &LimiterModel::extraCountChanged);
-}
-
-int LimiterModel::maximumCount() const
-{
-    return m_maximumCount;
-}
-
-void LimiterModel::setMaximumCount(int maximumCount)
-{
-    if (m_maximumCount != maximumCount) {
-        m_maximumCount = maximumCount;
-        Q_EMIT maximumCountChanged();
-    }
-}
-
-int LimiterModel::extraCount() const
-{
-    if (sourceModel()) {
-        return std::max(sourceModel()->rowCount() - maximumCount(), 0);
-    }
-    return 0;
-}
-
-bool LimiterModel::filterAcceptsRow(int source_row, const QModelIndex &source_parent) const
-{
-    Q_UNUSED(source_parent)
-    return source_row < maximumCount();
-}
-
-#include "moc_limitermodel.cpp"

src/app/models/limitermodel.h

@@ -1,41 +0,0 @@
-// SPDX-FileCopyrightText: 2024 Joshua Goins <josh@redstrate.com>
-// SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
-
-#pragma once
-
-#include <QQmlEngine>
-#include <QSortFilterProxyModel>
-
-/**
- * @class LimiterModel
- *
- * @brief Takes a source QAbstractItemModel model and only displays a desired maximum amount.
- *
- * Also gives you the remaining (filtered out) items, useful for sticking in a label or somesuch.
- */
-class LimiterModel : public QSortFilterProxyModel
-{
-    Q_OBJECT
-    QML_ELEMENT
-
-    Q_PROPERTY(int maximumCount READ maximumCount WRITE setMaximumCount NOTIFY maximumCountChanged)
-    Q_PROPERTY(int extraCount READ extraCount NOTIFY extraCountChanged)
-
-public:
-    explicit LimiterModel(QObject *parent = nullptr);
-
-    [[nodiscard]] int maximumCount() const;
-    void setMaximumCount(int maximumCount);
-
-    [[nodiscard]] int extraCount() const;
-
-Q_SIGNALS:
-    void maximumCountChanged();
-    void extraCountChanged();
-
-protected:
-    bool filterAcceptsRow(int source_row, const QModelIndex &source_parent) const override;
-
-private:
-    int m_maximumCount = 0;
-};

src/app/neochat.notifyrc

@@ -287,7 +287,6 @@ Name[ia]=Comparti
 Name[it]=Condivisione
 Name[ka]=გაზიარება
 Name[ko]=공유
-Name[lt]=Bendrinti
 Name[lv]=Kopīgot
 Name[nl]=Gedeelde
 Name[nn]=Del
@@ -323,7 +322,6 @@ Comment[ia]=Le exito de compartir un pecietta de contento
 Comment[it]=Il risultato della condivisione di un contenuto
 Comment[ka]=შემცველობის ნაწილის გაზიარების შედეგი
 Comment[ko]=콘텐츠 공유 결과
-Comment[lt]=Turinio dalies bendrinimo rezultatas
 Comment[lv]=Satura kopīgošanas rezultāts
 Comment[nl]=Het resultaat van het delen van een stukje inhoud
 Comment[nn]=Resultatet av deling av innhald

src/app/notificationsmanager.cpp

@@ -11,7 +11,6 @@
 #include <KNotification>
 #include <KNotificationPermission>
 #include <KNotificationReplyAction>
-#include <KirigamiAddons/Components/NameUtils>
 
 #include <QPainter>
 #include <Quotient/accountregistry.h>
@@ -145,9 +144,16 @@ void NotificationsManager::processNotificationJob(QPointer<NeoChatConnection> co
             body = notification["event"_L1]["content"_L1]["body"_L1].toString();
         }
 
+        QImage avatar_image;
+        if (!sender.avatarUrl().isEmpty()) {
+            avatar_image = room->member(sender.id()).avatar(128, 128, {});
+        } else {
+            avatar_image = room->avatar(128);
+        }
         postNotification(dynamic_cast<NeoChatRoom *>(room),
-                         room->member(sender.id()),
+                         sender.displayName(),
                          body,
+                         avatar_image,
                          notification["event"_L1].toObject()["event_id"_L1].toString(),
                          true,
                          pair.first);
@@ -189,8 +195,9 @@ bool NotificationsManager::shouldPostNotification(QPointer<NeoChatConnection> co
 }
 
 void NotificationsManager::postNotification(NeoChatRoom *room,
-                                            const RoomMember &member,
+                                            const QString &sender,
                                             const QString &text,
+                                            const QImage &icon,
                                             const QString &replyEventId,
                                             bool canReply,
                                             qint64 timestamp)
@@ -209,17 +216,17 @@ void NotificationsManager::postNotification(NeoChatRoom *room,
         }
     });
 
-    notification->setTitle(room->displayName());
-
     QString entry;
-    if (room->isDirectChat()) {
+    if (sender == room->displayName()) {
+        notification->setTitle(sender);
         entry = text.toHtmlEscaped();
     } else {
-        entry = i18n("%1: %2", member.displayName(), text.toHtmlEscaped());
+        notification->setTitle(room->displayName());
+        entry = i18n("%1: %2", sender, text.toHtmlEscaped());
     }
 
     notification->setText(entry);
-    notification->setPixmap(createNotificationImage(member, room));
+    notification->setPixmap(createNotificationImage(icon, room));
 
     auto defaultAction = notification->addDefaultAction(i18n("Open NeoChat in this room"));
     connect(defaultAction, &KNotificationAction::activated, this, [notification, room]() {
@@ -246,9 +253,7 @@ void NotificationsManager::postNotification(NeoChatRoom *room,
         notification->setReplyAction(std::move(replyAction));
     }
 
-    if (Controller::instance().accounts()->rowCount() > 1) {
-        notification->setHint(u"x-kde-origin-name"_s, room->localMember().id());
-    }
+    notification->setHint(u"x-kde-origin-name"_s, room->localMember().id());
     notification->sendEvent();
 }
 
@@ -287,10 +292,18 @@ void NotificationsManager::doPostInviteNotification(QPointer<NeoChatRoom> room)
     }
     const auto sender = room->member(roomMemberEvent->senderId());
 
+    QImage avatar_image;
+    if (roomMemberEvent && !room->member(roomMemberEvent->senderId()).avatarUrl().isEmpty()) {
+        avatar_image = room->member(roomMemberEvent->senderId()).avatar(128, 128, {});
+    } else {
+        qWarning() << "using this room's avatar";
+        avatar_image = room->avatar(128);
+    }
+
     KNotification *notification = new KNotification(u"invite"_s);
     notification->setText(i18n("%1 invited you to a room", sender.htmlSafeDisplayName()));
     notification->setTitle(room->displayName());
-    notification->setPixmap(createNotificationImage(sender, room));
+    notification->setPixmap(createNotificationImage(avatar_image, nullptr));
     auto defaultAction = notification->addDefaultAction(i18n("Open this invitation in NeoChat"));
     connect(defaultAction, &KNotificationAction::activated, this, [notification, room]() {
         if (!room) {
@@ -334,9 +347,7 @@ void NotificationsManager::doPostInviteNotification(QPointer<NeoChatRoom> room)
         m_invitations.remove(room->id());
     });
 
-    if (Controller::instance().accounts()->rowCount() > 1) {
-        notification->setHint(u"x-kde-origin-name"_s, room->localMember().id());
-    }
+    notification->setHint(u"x-kde-origin-name"_s, room->localMember().id());
 
     notification->sendEvent();
 }
@@ -396,125 +407,41 @@ void NotificationsManager::postPushNotification(const QByteArray &message)
     }
 }
 
-QPixmap NotificationsManager::createNotificationImage(const Quotient::RoomMember &member, NeoChatRoom *room)
-{
-    QImage senderIcon = member.avatar(avatarDimension, avatarDimension, {});
-    bool senderIconIsPlaceholder = false;
-    if (senderIcon.isNull()) {
-        senderIcon = createPlaceholderImage(member.displayName());
-        senderIconIsPlaceholder = true;
-    }
-
-    QImage icon;
-    if (room->isDirectChat()) {
-        icon = senderIcon;
-    } else {
-        QImage roomIcon = room->avatar(avatarDimension, avatarDimension);
-        bool roomIconIsPlaceholder = false;
-        if (roomIcon.isNull()) {
-            roomIcon = createPlaceholderImage(room->displayName());
-            roomIconIsPlaceholder = true;
-        }
-
-        icon = createCombinedNotificationImage(senderIcon, senderIconIsPlaceholder, roomIcon, roomIconIsPlaceholder);
-    }
-
-    return QPixmap::fromImage(icon);
-}
-
-QImage NotificationsManager::createCombinedNotificationImage(const QImage &senderIcon,
-                                                             const bool senderIconIsPlaceholder,
-                                                             const QImage &roomIcon,
-                                                             const bool roomIconIsPlaceholder)
+QPixmap NotificationsManager::createNotificationImage(const QImage &icon, NeoChatRoom *room)
 {
     // Handle avatars that are lopsided in one dimension
-    const int biggestDimension = std::max(senderIcon.width(), senderIcon.height());
-    const QRectF imageRect = QRect{0, 0, biggestDimension, biggestDimension}.toRectF();
+    const int biggestDimension = std::max(icon.width(), icon.height());
+    const QRect imageRect{0, 0, biggestDimension, biggestDimension};
 
-    QImage roundedImage(imageRect.size().toSize(), QImage::Format_ARGB32);
+    QImage roundedImage(imageRect.size(), QImage::Format_ARGB32);
     roundedImage.fill(Qt::transparent);
 
     QPainter painter(&roundedImage);
     painter.setRenderHint(QPainter::SmoothPixmapTransform);
     painter.setPen(Qt::NoPen);
 
-    if (senderIconIsPlaceholder) {
-        painter.drawImage(imageRect, senderIcon);
-    } else {
-        // Fill background for transparent non-placeholder avatars
-        painter.setBrush(Qt::white);
-        painter.drawRoundedRect(imageRect, imageRect.width(), imageRect.height());
+    // Fill background for transparent avatars
+    painter.setBrush(Qt::white);
+    painter.drawRoundedRect(imageRect, imageRect.width(), imageRect.height());
 
-        painter.setBrush(senderIcon.scaledToHeight(biggestDimension));
-        painter.drawRoundedRect(imageRect, imageRect.width(), imageRect.height());
+    QBrush brush(icon.scaledToHeight(biggestDimension));
+    painter.setBrush(brush);
+    painter.drawRoundedRect(imageRect, imageRect.width(), imageRect.height());
+
+    if (room != nullptr) {
+        const QImage roomAvatar = room->avatar(imageRect.width(), imageRect.height());
+        if (!roomAvatar.isNull() && icon != roomAvatar) {
+            const QRect lowerQuarter{imageRect.center(), imageRect.size() / 2};
+
+            painter.setBrush(Qt::white);
+            painter.drawRoundedRect(lowerQuarter, lowerQuarter.width(), lowerQuarter.height());
+
+            painter.setBrush(roomAvatar.scaled(lowerQuarter.size()));
+            painter.drawRoundedRect(lowerQuarter, lowerQuarter.width(), lowerQuarter.height());
+        }
     }
 
-    const QRectF lowerQuarter{imageRect.center(), imageRect.size() / 2.0};
-
-    if (roomIconIsPlaceholder) {
-        // Ditto for room icons, but we also want to "carve out" the transparent area for readability
-        painter.setCompositionMode(QPainter::CompositionMode_Clear);
-        painter.setBrush(Qt::transparent);
-        painter.drawRoundedRect(lowerQuarter, lowerQuarter.width(), lowerQuarter.height());
-
-        painter.setCompositionMode(QPainter::CompositionMode_SourceOver);
-        painter.drawImage(lowerQuarter, roomIcon);
-    } else {
-        painter.setBrush(Qt::white);
-        painter.drawRoundedRect(lowerQuarter, lowerQuarter.width(), lowerQuarter.height());
-
-        painter.setBrush(roomIcon.scaled(lowerQuarter.size().toSize()));
-        painter.drawRoundedRect(lowerQuarter, lowerQuarter.width(), lowerQuarter.height());
-    }
-
-    return roundedImage;
-}
-
-QImage NotificationsManager::createPlaceholderImage(const QString &name)
-{
-    const QColor color = NameUtils().colorsFromString(name);
-
-    QImage image(avatarDimension, avatarDimension, QImage::Format_ARGB32);
-    image.fill(Qt::transparent);
-
-    QPainter painter(&image);
-    painter.setRenderHint(QPainter::Antialiasing);
-
-    // Draw background
-    QColor backgroundColor = color;
-    backgroundColor.setAlphaF(0.07); // Same as in Kirigami Add-ons.
-
-    painter.setBrush(backgroundColor);
-    painter.setPen(Qt::transparent);
-    painter.drawRoundedRect(image.rect(), image.width(), image.height());
-
-    constexpr float borderWidth = 3.0; // Slightly bigger than in Add-ons so it renders better with QPainter at these dimensions.
-
-    // Draw border
-    painter.setBrush(Qt::transparent);
-    painter.setPen(QPen(color, borderWidth));
-    painter.drawRoundedRect(image.rect().toRectF().marginsRemoved(QMarginsF(borderWidth, borderWidth, borderWidth, borderWidth)),
-                            image.width(),
-                            image.height());
-
-    const QString initials = NameUtils().initialsFromString(name);
-
-    QTextOption option;
-    option.setAlignment(Qt::AlignCenter);
-
-    // Calculation similar to the one found in Kirigami Add-ons.
-    constexpr int largeSpacing = 8; // Same as what's defined in kirigami.
-    constexpr int padding = std::max(0, std::min(largeSpacing, avatarDimension - largeSpacing * 2));
-
-    QFont font;
-    font.setPixelSize((avatarDimension - padding) / 2);
-
-    painter.setBrush(color);
-    painter.setPen(color);
-    painter.setFont(font);
-    painter.drawText(image.rect(), initials, option);
-
-    return image;
+    return QPixmap::fromImage(roundedImage);
 }
 
 #include "moc_notificationsmanager.cpp"

src/app/notificationsmanager.h

@@ -13,11 +13,6 @@
 #include <Quotient/csapi/notifications.h>
 #include <Quotient/jobs/basejob.h>
 
-namespace Quotient
-{
-class RoomMember;
-}
-
 class NeoChatConnection;
 class KNotification;
 class NeoChatRoom;
@@ -72,24 +67,15 @@ private:
     QStringList m_connActiveJob;
     void startNotificationJob(QPointer<NeoChatConnection> connection);
 
-    /**
-     * @return A combined image of the sender and room's avatar.
-     */
-    static QPixmap createNotificationImage(const Quotient::RoomMember &member, NeoChatRoom *room);
-
-    /**
-     * @return The sender and room icon combined together into one image. Used internally by createNotificationImage.
-     */
-    static QImage createCombinedNotificationImage(const QImage &senderIcon, bool senderIconIsPlaceholder, const QImage &roomIcon, bool roomIconIsPlaceholder);
-
-    /**
-     * @return A placeholder avatar image, similar to the one found in Kirigami Add-ons.
-     */
-    static QImage createPlaceholderImage(const QString &name);
-
+    QPixmap createNotificationImage(const QImage &icon, NeoChatRoom *room);
     bool shouldPostNotification(QPointer<NeoChatConnection> connection, const QJsonValue &notification);
-    void
-    postNotification(NeoChatRoom *room, const Quotient::RoomMember &member, const QString &text, const QString &replyEventId, bool canReply, qint64 timestamp);
+    void postNotification(NeoChatRoom *room,
+                          const QString &sender,
+                          const QString &text,
+                          const QImage &icon,
+                          const QString &replyEventId,
+                          bool canReply,
+                          qint64 timestamp);
 
     void doPostInviteNotification(QPointer<NeoChatRoom> room);
 
@@ -98,8 +84,6 @@ private:
 
     bool permissionAsked = false;
 
-    static constexpr int avatarDimension = 128;
-
 private Q_SLOTS:
     void processNotificationJob(QPointer<NeoChatConnection> connection, Quotient::GetNotificationsJob *job, bool initialization);
 };

src/app/qml/AccountMenu.qml

@@ -5,7 +5,6 @@ pragma ComponentBehavior: Bound
 
 import QtQuick
 import QtQuick.Controls as QQC2
-import QtMultimedia
 
 import org.kde.kirigami as Kirigami
 import org.kde.kirigamiaddons.components as KirigamiComponents
@@ -19,10 +18,6 @@ KirigamiComponents.ConvergentContextMenu {
     required property NeoChatConnection connection
     required property Kirigami.ApplicationWindow window
 
-    data: MediaDevices {
-        id: devices
-    }
-
     Kirigami.Action {
         text: i18nc("@action:button", "Show QR Code")
         icon.name: "view-barcode-qr-symbolic"
@@ -38,14 +33,12 @@ KirigamiComponents.ConvergentContextMenu {
     }
 
     Kirigami.Action {
-        text: i18nc("@action:inmenu", "Scan a QR Code")
-        icon.name: "document-scan-symbolic"
-        visible: devices.videoInputs.length > 0
-        onTriggered: (root.Kirigami.PageStack.pageStack as Kirigami.PageRow).pushDialogLayer(Qt.createComponent("org.kde.neochat", "QrScannerPage"), {
+        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, {
             connection: root.connection
-        }, {
-            title: i18nc("@title", "Scan a QR Code")
-        })
+        }) as Kirigami.Dialog).open();
     }
 
     Kirigami.Action {
@@ -62,6 +55,14 @@ KirigamiComponents.ConvergentContextMenu {
         }
     }
 
+    Kirigami.Action {
+        text: i18nc("@action:inmenu", "Devices")
+        icon.name: "computer-symbolic"
+        onTriggered: {
+            NeoChatSettingsView.open('devices');
+        }
+    }
+
     Kirigami.Action {
         text: i18nc("@action:inmenu", "Open Developer Tools")
         icon.name: "tools"
@@ -75,6 +76,14 @@ KirigamiComponents.ConvergentContextMenu {
         })
     }
 
+    Kirigami.Action {
+        text: i18nc("@action:inmenu", "Open Secret Backup")
+        icon.name: "unlock"
+        onTriggered: root.window.pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'UnlockSSSSDialog'), {}, {
+            title: i18nc("@title:window", "Open Key Backup")
+        })
+    }
+
     Kirigami.Action {
         text: i18nc("@action:inmenu", "Verify This Device")
         icon.name: "security-low"
@@ -94,25 +103,10 @@ KirigamiComponents.ConvergentContextMenu {
     }
 
     Kirigami.Action {
-        text: i18nc("@action:inmenu Open support dialog", "Support")
-        icon.name: "help-contents-symbolic"
-        onTriggered: {
-            Qt.createComponent("org.kde.neochat", "SupportDialog").createObject(QQC2.Overlay.overlay, {
-                connection: root.connection,
-            }).open();
-        }
-    }
-
-    Kirigami.Action {
-        separator: true
-    }
-
-    Kirigami.Action {
-        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, {
+        text: i18nc("@action:inmenu", "Logout…")
+        icon.name: "im-kick-user"
+        onTriggered: (Qt.createComponent("org.kde.neochat", "ConfirmLogoutDialog").createObject(QQC2.Overlay.overlay, {
             connection: root.connection
-        }) as Kirigami.Dialog).open();
+        }) as Kirigami.Dialog).open()
     }
 }

src/app/qml/GlobalMenu.qml

@@ -45,12 +45,14 @@ Labs.MenuBar {
         }
         Labs.MenuItem {
             icon.name: "compass-symbolic"
-            text: i18nc("@action:inmenu Explore public rooms and spaces", "Explore")
+            text: i18nc("@action:inmenu", "Explore Rooms")
             enabled: root.connection
             onTriggered: {
                 let dialog = root.appWindow.pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'ExploreRoomsPage'), {
                     connection: root.connection
-                }, {});
+                }, {
+                    title: i18nc("@title", "Explore Rooms")
+                });
                 dialog.roomSelected.connect((roomId, displayName, avatarUrl, alias, topic, memberCount, isJoined) => {
                     RoomManager.resolveResource(roomId.length > 0 ? roomId : alias, isJoined ? "" : "join");
                 });

src/app/qml/InvitationView.qml

@@ -27,17 +27,16 @@ ColumnLayout {
         Layout.fillHeight: true
     }
 
-    KirigamiComponents.AvatarButton {
+    KirigamiComponents.Avatar {
         id: avatar
         Layout.preferredWidth: Kirigami.Units.iconSizes.huge
         Layout.preferredHeight: Kirigami.Units.iconSizes.huge
         Layout.alignment: Qt.AlignHCenter
+        Layout.fillWidth: true
 
         name: root.invitingMember.displayName
         source: NeoChatConfig.hideImages ? undefined : root.invitingMember.avatarUrl
         color: root.invitingMember.color
-
-        onClicked: RoomManager.resolveResource(root.currentRoom.invitingUserId)
     }
 
     Loader {
@@ -139,24 +138,8 @@ ColumnLayout {
         Layout.fillWidth: true
 
         FormCard.FormButtonDelegate {
-            id: viewProfileDelegate
-
-            icon.name: "user-properties-symbolic"
-            text: i18nc("@action:button View this user's profile", "View %1's Profile", root.invitingMember.displayName)
-
-            onClicked: RoomManager.resolveResource(root.currentRoom.invitingUserId)
-        }
-
-        FormCard.FormDelegateSeparator {
-            above: viewProfileDelegate
-            below: ignoreUserDelegate
-        }
-
-        FormCard.FormButtonDelegate {
-            id: ignoreUserDelegate
-
             icon.name: "list-remove-symbolic"
-            text: i18nc("@action:button Ignore the user", "Ignore %1 and Reject Invite", root.invitingMember.displayName)
+            text: i18nc("@action:button Block the user", "Block %1", root.invitingMember.displayName)
 
             onClicked: {
                 root.currentRoom.forget()

src/app/qml/KeyVerificationDialog.qml

@@ -23,63 +23,72 @@ Kirigami.Page {
             name: "cancelled"
             when: root.session.state === KeyVerificationSession.CANCELED
             PropertyChanges {
-                stateLoader.sourceComponent: verificationCanceled
+                target: stateLoader
+                sourceComponent: verificationCanceled
             }
         },
         State {
             name: "waitingForVerification"
             when: root.session.state === KeyVerificationSession.WAITINGFORVERIFICATION
             PropertyChanges {
-                stateLoader.sourceComponent: emojiSas
+                target: stateLoader
+                sourceComponent: emojiSas
             }
         },
         State {
             name: "waitingForReady"
             when: root.session.state === KeyVerificationSession.WAITINGFORREADY
             PropertyChanges {
-                stateLoader.sourceComponent: message
+                target: stateLoader
+                sourceComponent: message
             }
         },
         State {
             name: "incoming"
             when: root.session.state === KeyVerificationSession.INCOMING
             PropertyChanges {
-                stateLoader.sourceComponent: message
+                target: stateLoader
+                sourceComponent: message
             }
         },
         State {
             name: "waitingForKey"
             when: root.session.state === KeyVerificationSession.WAITINGFORKEY
             PropertyChanges {
-                stateLoader.sourceComponent: message
+                target: stateLoader
+                sourceComponent: message
             }
         },
         State {
             name: "waitingForAccept"
             when: root.session.state === KeyVerificationSession.WAITINGFORACCEPT
             PropertyChanges {
-                stateLoader.sourceComponent: message
+                target: stateLoader
+                sourceComponent: message
             }
         },
         State {
             name: "waitingForMac"
             when: root.session.state === KeyVerificationSession.WAITINGFORMAC
             PropertyChanges {
-                stateLoader.sourceComponent: message
+                target: stateLoader
+                sourceComponent: message
             }
         },
         State {
             name: "ready"
             when: root.session.state === KeyVerificationSession.READY
             PropertyChanges {
-                stateLoader.sourceComponent: chooseVerificationComponent
+                target: stateLoader
+                sourceComponent: chooseVerificationComponent
             }
         },
         State {
             name: "done"
             when: root.session.state === KeyVerificationSession.DONE
             PropertyChanges {
-                stateLoader.sourceComponent: message
+                target: stateLoader
+                sourceComponent: message
             }
         }
     ]

src/app/qml/NeochatMaximizeComponent.qml

@@ -154,10 +154,7 @@ Components.AlbumMaximizeComponent {
 
     onOpened: forceActiveFocus()
 
-    onItemRightClicked: {
-        const event = root.currentRoom.findEvent(root.currentEventId);
-        RoomManager.viewEventMenu(root.QQC2.Overlay.overlay, event, root.currentRoom)
-    }
+    onItemRightClicked: RoomManager.viewEventMenu(root.currentEventId, root.currentRoom)
 
     onSaveItem: {
         var dialog = saveAsDialog.createObject(QQC2.Overlay.overlay) as Dialogs.FileDialog;

src/app/qml/QuickSwitcher.qml

@@ -30,13 +30,15 @@ Kirigami.SearchDialog {
     emptyText: i18nc("Placeholder message", "No room found")
     Kirigami.Action {
         id: exploreRoomAction
-        text: i18nc("@action:button Explore public rooms and spaces", "Explore")
+        text: i18nc("@action:button", "Explore rooms")
         icon.name: "compass"
         onTriggered: {
             root.close()
             let dialog = root.window.pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'ExploreRoomsPage'), {
                 connection: root.connection
-            }, {});
+            }, {
+                title: i18nc("@title", "Explore Rooms")
+            });
             dialog.roomSelected.connect((roomId, displayName, avatarUrl, alias, topic, memberCount, isJoined) => {
                 RoomManager.resolveResource(roomId.length > 0 ? roomId : alias, isJoined ? "" : "join");
             });

src/app/qml/ReasonDialog.qml

@@ -6,7 +6,6 @@ import QtQuick.Controls as QQC2
 import QtQuick.Layouts
 
 import org.kde.kirigami as Kirigami
-import org.kde.neochat
 
 Kirigami.Page {
     id: root
@@ -14,8 +13,6 @@ Kirigami.Page {
     required property string placeholder
     required property string actionText
     required property string icon
-    required property bool reporting
-    required property NeoChatConnection connection
 
     signal accepted(reason: string)
 
@@ -24,15 +21,6 @@ Kirigami.Page {
     topPadding: 0
     bottomPadding: 0
 
-    header: Kirigami.InlineMessage {
-        showCloseButton: false
-        visible: root.reporting
-        type: Kirigami.MessageType.Information
-        position: Kirigami.InlineMessage.Position.Header
-
-        text: xi18n("This report will <strong>only</strong> be sent to the administrators of <link>%1</link> (your server).", root.connection.domain)
-    }
-
     QQC2.TextArea {
         id: reason
         placeholderText: root.placeholder
@@ -43,7 +31,7 @@ Kirigami.Page {
         Keys.onReturnPressed: event => {
             if (event.modifiers & Qt.ControlModifier) {
                 root.accepted(reason.text);
-                root.Kirigami.PageStack.closeDialog();
+                root.closeDialog();
             }
         }
 
@@ -64,14 +52,14 @@ Kirigami.Page {
                 QQC2.DialogButtonBox.buttonRole: QQC2.DialogButtonBox.AcceptRole
                 onClicked: {
                     root.accepted(reason.text);
-                    root.Kirigami.PageStack.closeDialog();
+                    root.closeDialog();
                 }
             }
             QQC2.Button {
                 icon.name: "dialog-cancel-symbolic"
                 text: i18nc("@action", "Cancel")
                 QQC2.DialogButtonBox.buttonRole: QQC2.DialogButtonBox.RejectRole
-                onClicked: root.Kirigami.PageStack.closeDialog()
+                onClicked: root.closeDialog()
             }
         }
     }

src/app/qml/RoomPage.qml

@@ -75,12 +75,6 @@ Kirigami.Page {
     focus: true
     padding: 0
 
-    onHeightChanged: {
-        // HACK: See TimelineView for the hack details.
-        // We get the height change here *first* so we are informed this is because of a window resize and not due to the pinned message.
-        (timelineViewLoader.item as TimelineView).resetViewSettling();
-    }
-
     actions: [
         Kirigami.Action {
             id: jitsiMeetingAction
@@ -119,7 +113,7 @@ Kirigami.Page {
             }
         },
         Kirigami.Action {
-            visible: Kirigami.Settings.isMobile || !(root.Kirigami.PageStack.pageStack as Kirigami.PageRow)?.wideMode
+            visible: Kirigami.Settings.isMobile || !(root.Kirigami.PageStack.pageStack as Kirigami.PageRow).wideMode
             icon.name: "view-right-new"
             onTriggered: (root.QQC2.ApplicationWindow.window as Main).openRoomDrawer()
         }
@@ -295,7 +289,7 @@ Kirigami.Page {
 
     footer: Loader {
         id: chatBarLoader
-        height: active ? (item as ChatBar)?.implicitHeight : 0
+        height: active ? (item as ChatBar).implicitHeight : 0
         active: timelineViewLoader.active && !root.currentRoom.readOnly
         sourceComponent: ChatBar {
             id: chatBar
@@ -355,17 +349,14 @@ Kirigami.Page {
             });
         }
 
-        function onShowDelegateMenu(parent: QtObject, room: NeoChatRoom, eventId: string, author, messageComponentType, plainText: string, richText: string, mimeType: string, progressInfo, selectedText: string, hoveredLink: string) {
-            (delegateContextMenu.createObject(parent, {
-                room: room,
+        function onShowDelegateMenu(eventId: string, author, messageComponentType, plainText: string, richText: string, mimeType: string, progressInfo, isThread: bool, selectedText: string, hoveredLink: string) {
+            (delegateContextMenu.createObject(root, {
                 author: author,
                 eventId: eventId,
                 plainText: plainText,
                 mimeType: mimeType,
                 progressInfo: progressInfo,
                 messageComponentType: messageComponentType,
-                selectedText,
-                hoveredLink,
             }) as DelegateContextMenu).popup();
         }
 

src/app/qml/SeenByDialog.qml

@@ -1,90 +0,0 @@
-// SPDX-FileCopyrightText: 2026 Joshua Goins <josh@redstrate.com>
-// SPDX-License-Identifier: GPL-3.0-only
-
-import QtQuick
-import QtQuick.Controls as QQC2
-import QtQuick.Layouts
-
-import org.kde.kirigami as Kirigami
-import org.kde.kirigamiaddons.components as KirigamiComponents
-import org.kde.kirigamiaddons.delegates as Delegates
-
-import org.kde.neochat
-
-Kirigami.Dialog {
-    id: root
-
-    property var model
-
-    standardButtons: Kirigami.Dialog.NoButton
-
-    width: Math.min(QQC2.ApplicationWindow.window.width, Kirigami.Units.gridUnit * 24)
-    maximumHeight: Kirigami.Units.gridUnit * 24
-    title: i18nc("@title:menu Seen by/read marker dialog", "Seen By")
-
-    contentItem: ColumnLayout {
-        spacing: 0
-
-        QQC2.ScrollView {
-            Layout.fillWidth: true
-            Layout.fillHeight: true
-
-            ListView {
-                id: listView
-
-                model: root.model
-                spacing: Kirigami.Units.smallSpacing
-
-                onCountChanged: {
-                    if (listView.count === 0) {
-                        root.close();
-                    }
-                }
-
-                delegate: Delegates.RoundedItemDelegate {
-                    id: userDelegate
-
-                    required property string displayName
-                    required property url avatarUrl
-                    required property color memberColor
-                    required property string userId
-
-                    implicitHeight: Kirigami.Units.gridUnit * 2
-
-                    text: displayName
-                    highlighted: false
-
-                    onClicked: {
-                        root.close();
-                        RoomManager.resolveResource(userDelegate.userId);
-                    }
-
-                    contentItem: RowLayout {
-                        spacing: Kirigami.Units.smallSpacing
-
-                        KirigamiComponents.Avatar {
-                            implicitWidth: height
-                            sourceSize {
-                                height: Kirigami.Units.gridUnit + Kirigami.Units.smallSpacing * 2.5
-                                width: Kirigami.Units.gridUnit + Kirigami.Units.smallSpacing * 2.5
-                            }
-                            source: userDelegate.avatarUrl
-                            name: userDelegate.displayName
-                            color: userDelegate.memberColor
-
-                            Layout.fillHeight: true
-                        }
-                        QQC2.Label {
-                            text: userDelegate.displayName
-                            textFormat: Text.PlainText
-                            elide: Text.ElideRight
-                            clip: true // Intentional to limit insane Unicode in display names
-
-                            Layout.fillWidth: true
-                        }
-                    }
-                }
-            }
-        }
-    }
-}

src/app/qml/SupportDialog.qml

@@ -1,121 +0,0 @@
-// SPDX-FileCopyrightText: 2026 Joshua Goins <josh@redstrate.com>
-// SPDX-License-Identifier: GPL-3.0-only
-
-import QtQuick
-import QtQuick.Controls as QQC2
-import QtQuick.Layouts
-
-import org.kde.kirigami as Kirigami
-import org.kde.kirigamiaddons.formcard as FormCard
-
-import org.kde.neochat
-
-Kirigami.Dialog {
-    id: root
-
-    required property NeoChatConnection connection
-
-    readonly property SupportController supportController: SupportController {
-        connection: root.connection
-    }
-    readonly property bool hasSupportResources: supportController.supportPage.length > 0 && supportController.contacts.length > 0
-
-    title: i18nc("@title Support information", "Support")
-    width: Math.min(Kirigami.Units.gridUnit * 30, QQC2.ApplicationWindow.window.width)
-
-    ColumnLayout {
-        spacing: 0
-
-        FormCard.FormTextDelegate {
-            id: explanationTextDelegate
-
-            text: root.hasSupportResources ?
-                i18nc("@info:label %1 is the domain of the server", "Official support resources provided by %1:", root.connection.domain)
-                : i18nc("@info:label %1 is the domain of the server", "%1 has no support resources.", root.connection.domain)
-        }
-
-        FormCard.FormDelegateSeparator {
-            above: explanationTextDelegate
-            below: openSupportPageDelegate
-            visible: openSupportPageDelegate.visible
-        }
-
-        FormCard.FormLinkDelegate {
-            id: openSupportPageDelegate
-
-            icon.name: "help-contents-symbolic"
-            text: i18nc("@action:button Open support webpage", "Open Support")
-            url: root.supportController.supportPage
-            visible: root.supportController.supportPage.length > 0
-        }
-
-        FormCard.FormDelegateSeparator {
-            above: openSupportPageDelegate
-            visible: root.supportController.contacts.length > 0
-        }
-
-        Repeater {
-            model: root.supportController.contacts
-
-            delegate: FormCard.AbstractFormDelegate {
-                id: contactDelegate
-
-                required property string role
-                required property string matrixId
-                required property string emailAddress
-
-                background: null
-
-                Layout.fillWidth: true
-
-                contentItem: RowLayout {
-                    spacing: Kirigami.Units.largeSpacing
-
-                    Kirigami.Icon {
-                        source: "user"
-                    }
-
-                    QQC2.Label {
-                        text: {
-                            // Translate known keys
-                            if (contactDelegate.role === "m.role.admin") {
-                                return i18nc("@info:label Adminstrator contact", "Admin")
-                            } else if (contactDelegate.role === "m.role.security") {
-                                return i18nc("@info:label Security contact", "Security")
-                            }
-                            return contactDelegate.role;
-                        }
-                        elide: Text.ElideRight
-
-                        Layout.fillWidth: true
-                    }
-
-                    QQC2.ToolButton {
-                        visible: contactDelegate.matrixId.length > 0
-                        icon.name: "document-send-symbolic"
-
-                        onClicked: {
-                            root.close();
-                            root.connection.requestDirectChat(contactDelegate.matrixId);
-                        }
-
-                        QQC2.ToolTip.delay: Kirigami.Units.toolTipDelay
-                        QQC2.ToolTip.visible: hovered
-                        QQC2.ToolTip.text: i18nc("@info:tooltip %1 is a Matrix ID", "Contact via Matrix (%1)", contactDelegate.matrixId)
-                    }
-
-                    QQC2.ToolButton {
-                        visible: contactDelegate.emailAddress.length > 0
-                        icon.name: "mail-sent-symbolic"
-
-                        onClicked: Qt.openUrlExternally("mailto:%1".arg(contactDelegate.emailAddress))
-
-                        QQC2.ToolTip.delay: Kirigami.Units.toolTipDelay
-                        QQC2.ToolTip.visible: hovered
-                        QQC2.ToolTip.text: i18nc("@info:tooltip %1 is an e-mail address", "Contact via e-mail (%1)", contactDelegate.emailAddress)
-                    }
-                }
-            }
-        }
-    }
-}

src/app/qml/UnlockSSSSDialog.qml

@@ -13,7 +13,7 @@ FormCard.FormCardPage {
 
     property bool processing: false
 
-    title: i18nc("@title:window", "Manage Secret Backup")
+    title: i18nc("@title:window", "Load your encrypted messages")
 
     topPadding: Kirigami.Units.gridUnit
     leftPadding: 0

src/app/qml/UserDetailDialog.qml

@@ -20,47 +20,29 @@ Kirigami.Dialog {
     // Make sure that code is prepared to deal with this property being null
     property NeoChatRoom room
     property var user
-    // Used for the "View Main Profile" feature so you can toggle back to the room profile.
-    property NeoChatRoom oldRoom
 
     property NeoChatConnection connection
 
-    property CommonRoomsModel model: CommonRoomsModel {
-        connection: root.connection
-        userId: root.user.id
-    }
-
-    property LimiterModel limiterModel: LimiterModel {
-        maximumCount: 5
-        sourceModel: root.model
-    }
-
-    readonly property bool isSelf: root.user.id === root.connection.localUserId
-    readonly property bool hasMutualRooms: root.model.count > 0
-    readonly property bool isRoomProfile: root.room
-    readonly property string shareUrl: "https://matrix.to/#/" + root.user.id
-
-    leftPadding: Kirigami.Units.largeSpacing * 2
-    rightPadding: Kirigami.Units.largeSpacing * 2
-    topPadding: Kirigami.Units.largeSpacing * 2
-    bottomPadding: Kirigami.Units.largeSpacing * 2
+    leftPadding: 0
+    rightPadding: 0
+    topPadding: 0
+    bottomPadding: 0
 
     standardButtons: Kirigami.Dialog.NoButton
 
     width: Math.min(QQC2.ApplicationWindow.window.width, Kirigami.Units.gridUnit * 24)
     title: i18nc("@title:menu Account details dialog", "Account Details")
 
-    header: null
-
     contentItem: ColumnLayout {
         spacing: 0
-
         RowLayout {
             id: detailRow
-
-            spacing: Kirigami.Units.largeSpacing
-
             Layout.fillWidth: true
+            Layout.leftMargin: Kirigami.Units.largeSpacing
+            Layout.rightMargin: Kirigami.Units.largeSpacing
+            Layout.topMargin: Kirigami.Units.largeSpacing
+            Layout.bottomMargin: Kirigami.Units.largeSpacing
+            spacing: Kirigami.Units.largeSpacing
 
             KirigamiComponents.Avatar {
                 id: avatar
@@ -68,14 +50,7 @@ Kirigami.Dialog {
                 Layout.preferredHeight: Kirigami.Units.iconSizes.huge
 
                 name: root.room ? root.room.member(root.user.id).displayName : root.user.displayName
-                source: {
-                    if (root.room) {
-                        return root.room.member(root.user.id).avatarUrl;
-                    } else if(root.user.avatarUrl.toString() !== '') {
-                        return root.connection.makeMediaUrl(root.user.avatarUrl);
-                    }
-                    return "";
-                }
+                source: root.room ? root.room.member(root.user.id).avatarUrl : root.user.avatarUrl
                 color: root.room ? root.room.member(root.user.id).color : QmlUtils.getUserColor(root.user.hueF)
             }
 
@@ -100,362 +75,242 @@ Kirigami.Dialog {
                     id: idLabel
                     textFormat: TextEdit.PlainText
                     text: idLabelTextMetrics.elidedText
-                    color: Kirigami.Theme.disabledTextColor
 
                     TextMetrics {
                         id: idLabelTextMetrics
                         text: root.user.id
                         elide: Qt.ElideRight
-                        elideWidth: root.availableWidth - avatar.width - detailRow.spacing * 2 - detailRow.Layout.leftMargin - detailRow.Layout.rightMargin
+                        elideWidth: root.availableWidth - avatar.width - qrButton.width - detailRow.spacing * 2 - detailRow.Layout.leftMargin - detailRow.Layout.rightMargin
                     }
                 }
 
-                Kirigami.ActionToolBar {
+                QQC2.Label {
+                    property CommonRoomsModel model: CommonRoomsModel {
+                        connection: root.connection
+                        userId: root.user.id
+                    }
+
+                    text: i18ncp("@info", "One mutual room", "%1 mutual rooms", model.count)
+                    color: Kirigami.Theme.disabledTextColor
+                    visible: model.count > 0
+
                     Layout.topMargin: Kirigami.Units.smallSpacing
-
-                    actions: [
-                        Kirigami.Action {
-                            text: i18nc("@action:intoolbar Message this user directly", "Message")
-                            icon.name: "document-send-symbolic"
-
-                            onTriggered: {
-                                root.close();
-                                root.connection.requestDirectChat(root.user.id);
-                            }
-                        },
-                        Kirigami.Action {
-                            icon.name: "im-invisible-user-symbolic"
-                            text: root.connection.isIgnored(root.user.id) ? i18nc("@action:intoolbar Unignore or 'unblock' this user", "Unignore") : i18nc("@action:intoolbar Ignore or 'block' this user", "Ignore")
-
-                            onTriggered: {
-                                root.close();
-                                root.connection.isIgnored(root.user.id) ? root.connection.removeFromIgnoredUsers(root.user.id) : root.connection.addToIgnoredUsers(root.user.id);
-                            }
-                        },
-                        Kirigami.Action {
-                            text: i18nc("@action:intoolbar Copy shareable link for this user", "Copy Link")
-                            icon.name: "username-copy-symbolic"
-
-                            onTriggered: Clipboard.saveText(root.shareUrl)
-                        },
-                        Kirigami.Action {
-                            text: i18nc("@action:intoolbar Search for this user's messages.", "Search Messages…")
-                            icon.name: "search-symbolic"
-
-                            onTriggered: {
-                                ((root.QQC2.ApplicationWindow.window as Kirigami.ApplicationWindow).pageStack as Kirigami.PageRow).pushDialogLayer(Qt.createComponent('org.kde.neochat', 'RoomSearchPage'), {
-                                room: root.room,
-                                senderId: root.user.id
-                            }, {
-                                title: i18nc("@action:title", "Search")
-                            });
-                                root.close();
-                            }
-                        },
-                        Kirigami.Action {
-                            text: i18nc("@action:intoolbar", "Show QR Code")
-                            icon.name: "view-barcode-qr-symbolic"
-
-                            onTriggered: {
-                                let qrCode = Qt.createComponent('org.kde.neochat', 'QrCodeMaximizeComponent').createObject(QQC2.Overlay.overlay, {
-                                    text: root.shareUrl,
-                                    title: root.room ? root.room.member(root.user.id).displayName : root.user.displayName,
-                                    subtitle: root.user.id,
-                                    avatarColor: root.room?.member(root.user.id).color,
-                                    avatarSource: root.room? root.room.member(root.user.id).avatarUrl : root.user.avatarUrl
-                                }) as QrCodeMaximizeComponent;
-                                root.close();
-                                qrCode.open();
-                            }
-                        },
-                        Kirigami.Action {
-                            text: i18nc("@action:button 'Report' as in 'Report this user to the administrators'", "Report…")
-                            icon.name: "dialog-warning-symbolic"
-                            visible: root.connection.supportsMatrixSpecVersion("v1.13")
-
-                            onTriggered: {
-                                let dialog = ((root.QQC2.ApplicationWindow.window as Kirigami.ApplicationWindow).pageStack as Kirigami.PageRow).pushDialogLayer(Qt.createComponent('org.kde.neochat', 'ReasonDialog'), {
-                                title: i18nc("@title:dialog", "Report User"),
-                                placeholder: i18nc("@info:placeholder", "Optionally give a reason for reporting this user"),
-                                icon: "dialog-warning-symbolic",
-                                actionText: i18nc("@action:button 'Report' as in 'Report this user to the administrators'", "Report"),
-                                reporting: true,
-                                connection: root.connection,
-                            }, {
-                                title: i18nc("@title", "Report User"),
-                                width: Kirigami.Units.gridUnit * 25
-                            }) as ReasonDialog;
-                                dialog.accepted.connect(reason => {
-                                    root.connection.reportUser(root.user.id, reason);
-                                });
-                            }
-                        },
-                        Kirigami.Action {
-                            visible: root.room
-
-                            text: i18nc("@action:button", "View Main Profile")
-                            icon.name: "user-properties-symbolic"
-                            onTriggered: {
-                                root.oldRoom = root.room;
-                                root.room = null;
-                            }
-                        },
-                        Kirigami.Action {
-                            visible: !root.room && root.oldRoom
-
-                            text: i18nc("@action:button", "View Room Profile")
-                            icon.name: "user-properties-symbolic"
-                            onTriggered: {
-                                root.room = root.oldRoom;
-                                root.oldRoom = null;
-                            }
-                        }
-                    ]
                 }
             }
-        }
+            QQC2.AbstractButton {
+                id: qrButton
+                Layout.minimumHeight: avatar.height * 0.75
+                Layout.maximumHeight: avatar.height * 1.5
+                Layout.maximumWidth: avatar.height * 1.5
 
-        Kirigami.Heading {
-            text: i18nc("@title Moderation actions for this user", "Moderation")
-            level: 2
-            visible: root.isRoomProfile && moderationToolbar.actions.filter(function (it) { return it.visible; }).length > 0
-
-            Layout.topMargin: Kirigami.Units.largeSpacing
-        }
-
-        Kirigami.ActionToolBar {
-            id: moderationToolbar
-
-            flat: false
-            visible: root.isRoomProfile
-
-            Layout.fillWidth: true
-            Layout.topMargin: Kirigami.Units.smallSpacing
-
-            actions: [
-                Kirigami.Action {
-                    visible: {
-                        if (root.room) {
-                            return !root.isSelf && root.room.canSendState("kick") && root.room.containsUser(root.user.id) && root.room.memberEffectivePowerLevel(root.user.id) < root.room.memberEffectivePowerLevel(root.connection.localUserId);
-                        }
-                        return false;
-                    }
-
-                    text: i18nc("@action:button Kick the user from the room", "Kick…")
-                    icon.name: "im-kick-user"
-                    onTriggered: {
-                        let dialog = (root.QQC2.ApplicationWindow.window as Kirigami.ApplicationWindow).pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'ReasonDialog'), {
-                            title: i18nc("@title:dialog", "Kick User"),
-                            placeholder: i18nc("@info:placeholder", "Optionally give a reason for kicking this user"),
-                            actionText: i18nc("@action:button 'Kick' as in 'Kick this user from the room'", "Kick"),
-                            icon: "im-kick-user",
-                            reporting: false,
-                            connection: root.connection,
-                        }, {
-                            title: i18nc("@title:dialog", "Kick User"),
-                            width: Kirigami.Units.gridUnit * 25
-                        });
-                        dialog.accepted.connect(reason => {
-                            root.room.kickMember(root.user.id, reason);
-                        });
-                        root.close();
-                    }
-                },
-                Kirigami.Action {
-                    visible: {
-                        if (root.room) {
-                            return !root.isSelf && root.room.canSendState("ban") && !root.room.isUserBanned(root.user.id) && root.room.memberEffectivePowerLevel(root.user.id) < root.room.memberEffectivePowerLevel(root.connection.localUserId);
-                        }
-                        return false;
-                    }
-
-                    text: i18nc("@action:button Ban this user from the room", "Ban…")
-                    icon.name: "im-ban-user"
-                    icon.color: Kirigami.Theme.negativeTextColor
-                    onTriggered: {
-                        let dialog = (root.QQC2.ApplicationWindow.window as Kirigami.ApplicationWindow).pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'ReasonDialog'), {
-                            title: i18nc("@title:dialog", "Ban User"),
-                            placeholder: i18nc("@info:placeholder", "Optionally give a reason for banning this user"),
-                            actionText: i18nc("@action:button 'Ban' as in 'Ban this user'", "Ban"),
-                            icon: "im-ban-user",
-                            reporting: false,
-                            connection: root.connection,
-                        }, {
-                            title: i18nc("@title:dialog", "Ban User"),
-                            width: Kirigami.Units.gridUnit * 25
-                        });
-                        dialog.accepted.connect(reason => {
-                            root.room.ban(root.user.id, reason);
-                        });
-                        root.close();
-                    }
-                },
-                Kirigami.Action {
-                    visible: {
-                        if (root.room) {
-                            return !root.isSelf && root.room.canSendState("ban") && root.room.isUserBanned(root.user.id);
-                        }
-                        return false;
-                    }
-
-                    text: i18nc("@action:button Unban the user from this room", "Unban")
-                    icon.name: "im-irc"
-                    icon.color: Kirigami.Theme.negativeTextColor
-                    onTriggered: {
-                        root.room.unban(root.user.id);
-                        root.close();
-                    }
-                },
-                Kirigami.Action {
-                    visible: (root.user.id === root.connection.localUserId || (root.room?.canSendState("redact") ?? false))
-
-                    text: i18nc("@action:button Remove messages from the user in this room", "Remove Messages…")
-                    icon.name: "delete"
-                    icon.color: Kirigami.Theme.negativeTextColor
-                    onTriggered: {
-                        let dialog = ((root.QQC2.ApplicationWindow.window as Kirigami.ApplicationWindow).pageStack as Kirigami.PageRow).pushDialogLayer(Qt.createComponent('org.kde.neochat', 'ReasonDialog'), {
-                            title: i18nc("@title:dialog", "Remove Messages"),
-                            placeholder: i18nc("@info:placeholder", "Optionally give a reason for removing this user's recent messages"),
-                            actionText: i18nc("@action:button 'Remove' as in 'Remove these messages'", "Remove"),
-                            icon: "delete",
-                            reporting: false,
-                            connection: root.connection,
-                        }, {
-                            title: i18nc("@title", "Remove Messages"),
-                            width: Kirigami.Units.gridUnit * 25
-                        });
-                        dialog.accepted.connect(reason => {
-                            root.room.deleteMessagesByUser(root.user.id, reason);
-                        });
-                        root.close();
-                    }
+                contentItem: Barcode {
+                    id: barcode
+                    barcodeType: Barcode.QRCode
+                    content: "https://matrix.to/#/" + root.user.id
                 }
-            ]
-        }
-
-        Kirigami.Heading {
-            text: i18nc("@title Role such as 'Admin' or 'Moderator' for this user", "Power Level")
-            level: 2
-            visible: root.isRoomProfile
-
-            Layout.topMargin: Kirigami.Units.largeSpacing
-        }
-
-        RowLayout {
-            spacing: Kirigami.Units.smallSpacing
-            visible: root.isRoomProfile
-
-            Layout.topMargin: Kirigami.Units.smallSpacing
-
-            QQC2.Label {
-                text: root.room ? QmlUtils.nameForPowerLevelValue(root.room.memberEffectivePowerLevel(root.user.id)) : ""
-            }
-
-            QQC2.Button {
-                visible: {
-                    if (root.room) {
-                        return root.room.canSendState("m.room.power_levels") && !(root.room.roomCreatorHasUltimatePowerLevel() && root.room.isCreator(root.user.id));
-                    }
-                    return false;
-                }
-                text: i18nc("@action:button Set the power level (such as 'Admin') for this user", "Set Power Level")
-                icon.name: "document-edit-symbolic"
-                display: QQC2.AbstractButton.IconOnly
-
-                QQC2.ToolTip.visible: hovered
-                QQC2.ToolTip.text: text
-                QQC2.ToolTip.delay: Kirigami.Units.toolTipDelay
 
                 onClicked: {
-                    (powerLevelDialog.createObject(this, {
-                        room: root.room,
-                        userId: root.user.id,
-                        powerLevel: root.room.memberEffectivePowerLevel(root.user.id)
-                    }) as PowerLevelDialog).open();
+                    let qrCode = Qt.createComponent('org.kde.neochat', 'QrCodeMaximizeComponent').createObject(QQC2.Overlay.overlay, {
+                        text: barcode.content,
+                        title: root.room ? root.room.member(root.user.id).displayName : root.user.displayName,
+                        subtitle: root.user.id,
+                        avatarColor: root.room?.member(root.user.id).color,
+                        avatarSource: root.room? root.room.member(root.user.id).avatarUrl : root.user.avatarUrl
+                    }) as QrCodeMaximizeComponent;
                     root.close();
+                    qrCode.open();
                 }
 
-                Component {
-                    id: powerLevelDialog
-                    PowerLevelDialog {
-                        id: powerLevelDialog
-                    }
-                }
+                QQC2.ToolTip.visible: hovered
+                QQC2.ToolTip.text: barcode.content
+                QQC2.ToolTip.delay: Kirigami.Units.toolTipDelay
             }
         }
 
-        Kirigami.Heading {
-            text: i18nc("@title The set of common rooms between your current user and the one shown", "Mutual Rooms")
-            level: 4
-            visible: !root.isSelf && root.hasMutualRooms
+        Kirigami.Chip {
+            visible: root.room
+            text: root.room ? QmlUtils.nameForPowerLevelValue(root.room.memberEffectivePowerLevel(root.user.id)) : ""
+            closable: false
+            checkable: false
 
-            Layout.topMargin: Kirigami.Units.largeSpacing
+            Layout.leftMargin: Kirigami.Units.largeSpacing
+            Layout.bottomMargin: Kirigami.Units.largeSpacing
         }
 
-        RowLayout {
-            spacing: Kirigami.Units.smallSpacing
-            visible: !root.isSelf && root.hasMutualRooms
-
-            Layout.topMargin: Kirigami.Units.smallSpacing
-
-            Repeater {
-                model: root.limiterModel
-
-                delegate: KirigamiComponents.AvatarButton {
-                    required property string roomName
-                    required property string roomAvatar
-                    required property string roomId
-
-                    Layout.preferredWidth: Kirigami.Units.iconSizes.medium
-                    Layout.preferredHeight: Kirigami.Units.iconSizes.medium
-
-                    name: roomName
-                    source: roomAvatar
-
-                    onClicked: {
-                        root.close();
-                        RoomManager.resolveResource(roomId);
-                    }
-
-                    QQC2.ToolTip.visible: hovered
-                    QQC2.ToolTip.text: name
-                    QQC2.ToolTip.delay: Kirigami.Units.toolTipDelay
-                }
-            }
-
-            QQC2.Label {
-                text: i18ncp("@info:label And '%1' more rooms you have in common with this user, but are not shown", "and 1 more…", "and %1 more…", root.limiterModel.extraCount)
-                visible: root.limiterModel.extraCount > 0
-                color: Kirigami.Theme.disabledTextColor
-            }
-        }
-
-        Kirigami.Heading {
-            text: i18nc("@title Private note for this user", "Private Note")
-            level: 4
-
-            Layout.topMargin: Kirigami.Units.largeSpacing
-        }
-
-        QQC2.TextArea {
-            id: noteText
-
-            text: root.connection.noteForUser(root.user.id)
-            textFormat: TextEdit.PlainText
-            wrapMode: TextEdit.Wrap
-            placeholderText: i18nc("@info:placeholder", "Only visible to you")
-
-            onTextEdited: editTimer.restart()
-
+        Kirigami.Separator {
             Layout.fillWidth: true
-            Layout.topMargin: Kirigami.Units.smallSpacing
+        }
 
-            // Prevent unnecessary edits by waiting 1 second
-            Timer {
-                id: editTimer
+        FormCard.FormButtonDelegate {
+            visible: root.user.id !== root.connection.localUserId && !!root.user
+            text: !!root.user && root.connection.isIgnored(root.user.id) ? i18n("Unignore this user") : i18n("Ignore this user")
+            icon.name: "im-invisible-user"
+            onClicked: {
+                root.close();
+                root.connection.isIgnored(root.user.id) ? root.connection.removeFromIgnoredUsers(root.user.id) : root.connection.addToIgnoredUsers(root.user.id);
+            }
+        }
 
-                interval: 1000
-                onTriggered: root.connection.setNoteForUser(root.user.id, noteText.text)
+        FormCard.FormButtonDelegate {
+            visible: root.room && root.user.id !== root.connection.localUserId && root.room.canSendState("kick") && root.room.containsUser(root.user.id) && root.room.memberEffectivePowerLevel(root.user.id) < root.room.memberEffectivePowerLevel(root.connection.localUserId)
+
+            text: i18nc("@action:button", "Kick this user")
+            icon.name: "im-kick-user"
+            onClicked: {
+                let dialog = (root.QQC2.ApplicationWindow.window as Kirigami.ApplicationWindow).pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'ReasonDialog'), {
+                    title: i18nc("@title:dialog", "Kick User"),
+                    placeholder: i18nc("@info:placeholder", "Reason for kicking this user"),
+                    actionText: i18nc("@action:button 'Kick' as in 'Kick this user from the room'", "Kick"),
+                    icon: "im-kick-user"
+                }, {
+                    title: i18nc("@title:dialog", "Kick User"),
+                    width: Kirigami.Units.gridUnit * 25
+                });
+                dialog.accepted.connect(reason => {
+                    root.room.kickMember(root.user.id, reason);
+                });
+                root.close();
+            }
+        }
+
+        FormCard.FormButtonDelegate {
+            visible: root.room && root.user.id !== root.connection.localUserId && root.room.canSendState("invite") && !root.room.containsUser(root.user.id)
+
+            enabled: root.room && !root.room.isUserBanned(root.user.id)
+            text: i18nc("@action:button", "Invite this user")
+            icon.name: "list-add-user"
+            onClicked: {
+                root.room.inviteToRoom(root.user.id);
+                root.close();
+            }
+        }
+
+        FormCard.FormButtonDelegate {
+            visible: root.room && root.user.id !== root.connection.localUserId && root.room.canSendState("ban") && !root.room.isUserBanned(root.user.id) && root.room.memberEffectivePowerLevel(root.user.id) < root.room.memberEffectivePowerLevel(root.connection.localUserId)
+
+            text: i18nc("@action:button", "Ban this user")
+            icon.name: "im-ban-user"
+            icon.color: Kirigami.Theme.negativeTextColor
+            onClicked: {
+                let dialog = (root.QQC2.ApplicationWindow.window as Kirigami.ApplicationWindow).pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'ReasonDialog'), {
+                    title: i18nc("@title:dialog", "Ban User"),
+                    placeholder: i18nc("@info:placeholder", "Reason for banning this user"),
+                    actionText: i18nc("@action:button 'Ban' as in 'Ban this user'", "Ban"),
+                    icon: "im-ban-user"
+                }, {
+                    title: i18nc("@title:dialog", "Ban User"),
+                    width: Kirigami.Units.gridUnit * 25
+                });
+                dialog.accepted.connect(reason => {
+                    root.room.ban(root.user.id, reason);
+                });
+                root.close();
+            }
+        }
+
+        FormCard.FormButtonDelegate {
+            visible: root.room && root.user.id !== root.connection.localUserId && root.room.canSendState("ban") && root.room.isUserBanned(root.user.id)
+
+            text: i18nc("@action:button", "Unban this user")
+            icon.name: "im-irc"
+            icon.color: Kirigami.Theme.negativeTextColor
+            onClicked: {
+                root.room.unban(root.user.id);
+                root.close();
+            }
+        }
+
+        FormCard.FormButtonDelegate {
+            visible: root.room && root.room.canSendState("m.room.power_levels")
+            text: i18nc("@action:button", "Set user power level")
+            icon.name: "visibility"
+            onClicked: {
+                (powerLevelDialog.createObject(this, {
+                    room: root.room,
+                    userId: root.user.id,
+                    powerLevel: root.room.memberEffectivePowerLevel(root.user.id)
+                }) as PowerLevelDialog).open();
+                root.close();
+            }
+
+            Component {
+                id: powerLevelDialog
+                PowerLevelDialog {
+                    id: powerLevelDialog
+                }
+            }
+        }
+
+        FormCard.FormButtonDelegate {
+            visible: root.room && (root.user.id === root.connection.localUserId || root.room.canSendState("redact"))
+
+            text: i18nc("@action:button", "Remove recent messages by this user")
+            icon.name: "delete"
+            icon.color: Kirigami.Theme.negativeTextColor
+            onClicked: {
+                let dialog = ((QQC2.ApplicationWindow.window as Kirigami.ApplicationWindow).pageStack as Kirigami.PageRow).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"),
+                    icon: "delete"
+                }, {
+                    title: i18nc("@title", "Remove Messages"),
+                    width: Kirigami.Units.gridUnit * 25
+                });
+                dialog.accepted.connect(reason => {
+                    root.room.deleteMessagesByUser(root.user.id, reason);
+                });
+                root.close();
+            }
+        }
+
+        FormCard.FormButtonDelegate {
+            visible: root.user.id !== root.connection.localUserId
+            text: root.connection.directChatExists(root.user) ? i18nc("%1 is the name of the user.", "Chat with %1", root.room ? root.room.member(root.user.id).htmlSafeDisplayName : QmlUtils.escapeString(root.user.displayName)) : i18n("Invite to private chat")
+            icon.name: "document-send"
+            onClicked: {
+                root.connection.requestDirectChat(root.user.id);
+                root.close();
+            }
+        }
+
+        FormCard.FormButtonDelegate {
+            text: i18nc("@action:button %1 is the name of the user.", "Search room for %1's messages", root.room ? root.room.member(root.user.id).htmlSafeDisplayName : QmlUtils.escapeString(root.user.displayName))
+            icon.name: "search-symbolic"
+            onClicked: {
+                ((QQC2.ApplicationWindow.window as Kirigami.ApplicationWindow).pageStack as Kirigami.PageRow).pushDialogLayer(Qt.createComponent('org.kde.neochat', 'RoomSearchPage'), {
+                    room: root.room,
+                    senderId: root.user.id
+                }, {
+                    title: i18nc("@action:title", "Search")
+                });
+                root.close();
+            }
+        }
+
+        FormCard.FormButtonDelegate {
+            text: i18n("Copy link")
+            icon.name: "username-copy"
+            onClicked: Clipboard.saveText("https://matrix.to/#/" + root.user.id)
+        }
+
+        FormCard.FormButtonDelegate {
+            text: i18nc("@action:button 'Report' as in 'Report this user to the administrators'", "Report…")
+            icon.name: "dialog-warning-symbolic"
+            visible: root.connection.supportsMatrixSpecVersion("v1.13")
+            onClicked: {
+                let dialog = ((QQC2.ApplicationWindow.window as Kirigami.ApplicationWindow).pageStack as Kirigami.PageRow).pushDialogLayer(Qt.createComponent('org.kde.neochat', 'ReasonDialog'), {
+                    title: i18nc("@title:dialog", "Report User"),
+                    placeholder: i18nc("@info:placeholder", "Reason for reporting this user"),
+                    icon: "dialog-warning-symbolic",
+                    actionText: i18nc("@action:button 'Report' as in 'Report this user to the administrators'", "Report")
+                }, {
+                    title: i18nc("@title", "Report User"),
+                    width: Kirigami.Units.gridUnit * 25
+                }) as ReasonDialog;
+                dialog.accepted.connect(reason => {
+                    root.connection.reportUser(root.user.id, reason);
+                });
             }
         }
     }

src/app/roommanager.cpp

@@ -29,28 +29,6 @@
 #include <KIO/OpenUrlJob>
 #endif
 
-/**
- * @brief Stops RoomManager from updating the last room and space config.
- */
-class LastRoomBlocker
-{
-public:
-    explicit LastRoomBlocker(RoomManager *manager)
-        : m_manager(manager)
-    {
-        Q_ASSERT(manager);
-
-        m_manager->m_dontUpdateLastRoom = true;
-    }
-    ~LastRoomBlocker()
-    {
-        m_manager->m_dontUpdateLastRoom = false;
-    }
-
-private:
-    RoomManager *m_manager;
-};
-
 RoomManager::RoomManager(QObject *parent)
     : QObject(parent)
     , m_config(KSharedConfig::openStateConfig())
@@ -304,22 +282,26 @@ void RoomManager::viewEventSource(const QString &eventId)
     Q_EMIT showEventSource(eventId);
 }
 
-void RoomManager::viewEventMenu(QObject *parent, const RoomEvent *event, NeoChatRoom *room, const QString &selectedText, const QString &hoveredLink)
+void RoomManager::viewEventMenu(const QString &eventId, NeoChatRoom *room, const QString &selectedText, const QString &hoveredLink)
 {
-    if (!event) {
-        qWarning() << "Tried to open event menu with empty event";
+    if (eventId.isEmpty()) {
+        qWarning() << "Tried to open event menu with empty event id";
         return;
     }
 
-    Q_EMIT showDelegateMenu(parent,
-                            room,
-                            event->id(),
-                            room->qmlSafeMember(event->senderId()),
-                            MessageComponentType::typeForEvent(*event),
-                            EventHandler::plainBody(room, event),
-                            EventHandler::richBody(room, event),
-                            EventHandler::mediaInfo(room, event)["mimeType"_L1].toString(),
-                            room->fileTransferInfo(event->id()),
+    const auto it = room->findInTimeline(eventId);
+    if (it == room->historyEdge()) {
+        // This is probably a pending event
+        return;
+    }
+    const auto &event = **it;
+    Q_EMIT showDelegateMenu(eventId,
+                            room->qmlSafeMember(event.senderId()),
+                            MessageComponentType::typeForEvent(event),
+                            EventHandler::plainBody(room, &event),
+                            EventHandler::richBody(room, &event),
+                            EventHandler::mediaInfo(room, &event)["mimeType"_L1].toString(),
+                            room->fileTransferInfo(eventId),
                             selectedText,
                             hoveredLink);
 }
@@ -342,6 +324,17 @@ void RoomManager::loadInitialRoom()
         resolveResource(m_arg);
     }
 
+    if (m_isMobile) {
+        QString lastSpace = m_lastRoomConfig.readEntry(u"lastSpace"_s, QString());
+        // We can't have empty keys in KConfig, so we stored it as "Home"
+        if (lastSpace == u"Home"_s) {
+            lastSpace.clear();
+        }
+        setCurrentSpace(lastSpace, false);
+        // We don't want to open a room on startup on mobile
+        return;
+    }
+
     if (m_currentRoom) {
         // we opened a room with the arg parsing already
         return;
@@ -354,14 +347,16 @@ void RoomManager::loadInitialRoom()
 
 void RoomManager::openRoomForActiveConnection()
 {
-    Q_ASSERT(m_connection);
-
+    if (!m_connection) {
+        setCurrentRoom({});
+        setCurrentSpace({}, false);
+        return;
+    }
     auto lastSpace = m_lastRoomConfig.readEntry(u"lastSpace"_s, QString());
     if (lastSpace == u"Home"_s) {
         lastSpace.clear();
     }
-    // We don't want to open a room on startup on mobile
-    setCurrentSpace(lastSpace, !m_isMobile);
+    setCurrentSpace(lastSpace, true);
 }
 
 UriResolveResult RoomManager::visitUser(User *user, const QString &action)
@@ -518,7 +513,7 @@ void RoomManager::setConnection(NeoChatConnection *connection)
     Q_EMIT connectionChanged();
 }
 
-void RoomManager::setCurrentSpace(const QString &spaceId, bool goToLastUsedRoom)
+void RoomManager::setCurrentSpace(const QString &spaceId, bool setRoom)
 {
     m_currentSpaceId = spaceId;
 
@@ -538,65 +533,25 @@ void RoomManager::setCurrentSpace(const QString &spaceId, bool goToLastUsedRoom)
         m_lastRoomConfig.writeEntry(u"lastSpace"_s, spaceId.isEmpty() ? u"Home"_s : spaceId);
     }
 
-    // If we requested to change to the last opened room, do so:
-    if (goToLastUsedRoom) {
-        // We don't want to needlessly update the last room config here, that should only be done during explicit user action.
-        LastRoomBlocker blocker(this);
+    if (!setRoom) {
+        return;
+    }
 
-        // We can't have empty keys in KConfig, so it's stored as "Home":
-        if (const auto &lastRoom = m_lastRoomConfig.readEntry(spaceId.isEmpty() ? u"Home"_s : spaceId, QString()); !lastRoom.isEmpty()) {
-            resolveResource(lastRoom, "no_join"_L1);
-            return;
-        }
+    // We intentionally don't want to open the last room on mobile
+    if (m_isMobile) {
+        return;
+    }
 
-        // If no last room was opened, go to the space home:
-        if (!spaceId.isEmpty() && spaceId != u"DM"_s) {
-            resolveResource(spaceId, "no_join"_L1);
-            return;
-        }
-
-        // Fallback to no room opened:
-        setCurrentRoom({});
+    // We can't have empty keys in KConfig, so it's stored as "Home"
+    if (const auto &lastRoom = m_lastRoomConfig.readEntry(spaceId.isEmpty() ? u"Home"_s : spaceId, QString()); !lastRoom.isEmpty()) {
+        resolveResource(lastRoom, "no_join"_L1);
+        return;
     }
-}
-
-QString RoomManager::findSpaceIdForCurrentRoom() const
-{
-    if (!m_currentRoom) {
-        return m_currentSpaceId;
+    if (!spaceId.isEmpty() && spaceId != u"DM"_s) {
+        resolveResource(spaceId, "no_join"_L1);
+        return;
     }
-    if (m_currentRoom->isDirectChat()) {
-        const auto roomsInSpace = SpaceHierarchyCache::instance().getRoomListForSpace(m_currentSpaceId, false);
-        if (roomsInSpace.contains(m_currentRoom->id())) {
-            return m_currentSpaceId;
-        }
-        return "DM"_L1;
-    }
-    const auto &parentSpaces = SpaceHierarchyCache::instance().parentSpaces(m_currentRoom->id());
-    if (parentSpaces.contains(m_currentSpaceId)) {
-        return m_currentSpaceId;
-    }
-    static auto config = NeoChatConfig::self();
-    if (config->allRoomsInHome()) {
-        return {};
-    }
-    if (const auto &parent = m_connection->room(m_currentRoom->canonicalParent())) {
-        for (const auto &parentParent : SpaceHierarchyCache::instance().parentSpaces(parent->id())) {
-            if (SpaceHierarchyCache::instance().parentSpaces(parentParent).isEmpty()) {
-                return parentParent;
-            }
-        }
-        return parent->id();
-    }
-    for (const auto &space : parentSpaces) {
-        if (SpaceHierarchyCache::instance().parentSpaces(space).isEmpty()) {
-            return space;
-        }
-    }
-    if (m_currentRoom->isSpace()) {
-        return m_currentSpaceId;
-    }
-    return {};
+    setCurrentRoom({});
 }
 
 void RoomManager::setCurrentRoom(const QString &roomId)
@@ -616,25 +571,57 @@ void RoomManager::setCurrentRoom(const QString &roomId)
     }
 
     Q_EMIT currentRoomChanged();
-
-    if (!m_dontUpdateLastRoom) {
+    if (m_connection) {
         if (roomId.isEmpty()) {
             m_lastRoomConfig.deleteEntry(m_currentSpaceId);
-            return;
-        }
-
-        const auto spaceIdForRoom = findSpaceIdForCurrentRoom();
-        // We can't have empty keys in KConfig, so name it "Home"
-        if (spaceIdForRoom.isEmpty()) {
-            m_lastRoomConfig.writeEntry(u"Home"_s, roomId);
         } else {
-            m_lastRoomConfig.writeEntry(spaceIdForRoom, roomId);
-        }
-
-        if (m_currentSpaceId != spaceIdForRoom) {
-            setCurrentSpace(spaceIdForRoom, false);
+            // We can't have empty keys in KConfig, so name it "Home"
+            if (m_currentSpaceId.isEmpty()) {
+                m_lastRoomConfig.writeEntry(u"Home"_s, roomId);
+            } else {
+                m_lastRoomConfig.writeEntry(m_currentSpaceId, roomId);
+            }
         }
     }
+    if (roomId.isEmpty()) {
+        return;
+    }
+    if (m_currentRoom->isSpace()) {
+        return;
+    }
+    if (m_currentRoom->isDirectChat()) {
+        const auto roomsInSpace = SpaceHierarchyCache::instance().getRoomListForSpace(m_currentSpaceId, false);
+        if (!roomsInSpace.contains(m_currentRoom->id()) && m_currentSpaceId != "DM"_L1) {
+            setCurrentSpace("DM"_L1, false);
+        }
+        return;
+    }
+    const auto &parentSpaces = SpaceHierarchyCache::instance().parentSpaces(roomId);
+    if (parentSpaces.contains(m_currentSpaceId)) {
+        return;
+    }
+    static auto config = NeoChatConfig::self();
+    if (config->allRoomsInHome()) {
+        setCurrentSpace({}, false);
+        return;
+    }
+    if (const auto &parent = m_connection->room(m_currentRoom->canonicalParent())) {
+        for (const auto &parentParent : SpaceHierarchyCache::instance().parentSpaces(parent->id())) {
+            if (SpaceHierarchyCache::instance().parentSpaces(parentParent).isEmpty()) {
+                setCurrentSpace(parentParent, false);
+                return;
+            }
+        }
+        setCurrentSpace(parent->id(), false);
+        return;
+    }
+    for (const auto &space : parentSpaces) {
+        if (SpaceHierarchyCache::instance().parentSpaces(space).isEmpty()) {
+            setCurrentSpace(space, false);
+            return;
+        }
+    }
+    setCurrentSpace({}, false);
 }
 
 void RoomManager::clearCurrentRoom()

src/app/roommanager.h

@@ -233,8 +233,7 @@ public:
     /**
      * @brief Show a context menu for the given event.
      */
-    Q_INVOKABLE void
-    viewEventMenu(QObject *parent, const RoomEvent *event, NeoChatRoom *room, const QString &selectedText = {}, const QString &hoveredLink = {});
+    Q_INVOKABLE void viewEventMenu(const QString &eventId, NeoChatRoom *room, const QString &selectedText = {}, const QString &hoveredLink = {});
 
     /**
      * @brief Set a URL to be loaded as the initial room.
@@ -307,9 +306,7 @@ Q_SIGNALS:
     /**
      * @brief Request to show a menu for the given event.
      */
-    void showDelegateMenu(QObject *parent,
-                          NeoChatRoom *room,
-                          const QString &eventId,
+    void showDelegateMenu(const QString &eventId,
                           const NeochatRoomMember *author,
                           MessageComponentType::Type messageComponentType,
                           const QString &plainText,
@@ -340,11 +337,6 @@ Q_SIGNALS:
 
     void currentSpaceChanged();
 
-protected:
-    bool m_dontUpdateLastRoom = false; // Don't set directly, use LastRoomBlocker.
-
-    friend class LastRoomBlocker;
-
 private:
     bool m_isMobile = false;
 
@@ -381,22 +373,8 @@ private:
 
     void setCurrentRoom(const QString &roomId);
 
-    /**
-     * @brief Find the most appropriate space for the currently selected room
-     *
-     * Should be used to figure out what space to switch to after a room change.
-     *
-     * @return The Space ID that the currently set room should be displayed as part of. (or "DM" for DM and "" for Home)
-     */
-    QString findSpaceIdForCurrentRoom() const;
-
-    /**
-     * @brief Sets the current space.
-     *
-     * @param spaceId The ID of the space, "DM" for direct messages or an empty string for Home.
-     * @param goToLastUsedRoom If true, we will navigate to the last opened room in this space.
-     */
-    void setCurrentSpace(const QString &spaceId, bool goToLastUsedRoom = true);
+    // Space ID, "DM", or empty string
+    void setCurrentSpace(const QString &spaceId, bool setRoom = true);
 
     /**
      * @brief Resolve a user URI.

src/app/supportcontroller.cpp

@@ -1,66 +0,0 @@
-// SPDX-FileCopyrightText: 2026 Joshua Goins <josh@redstrate.com>
-// SPDX-License-Identifier: GPL-3.0-only
-
-#include "supportcontroller.h"
-
-#include <Quotient/csapi/support.h>
-
-#include <QDebug>
-
-using namespace Quotient;
-
-void SupportController::setConnection(NeoChatConnection *connection)
-{
-    if (m_connection != connection) {
-        m_connection = connection;
-        Q_EMIT connectionChanged();
-
-        load();
-    }
-}
-
-NeoChatConnection *SupportController::connection() const
-{
-    return m_connection;
-}
-
-QString SupportController::supportPage() const
-{
-    return m_supportPage;
-}
-
-QList<SupportContact> SupportController::contacts() const
-{
-    return m_contacts;
-}
-
-void SupportController::load()
-{
-    if (!m_connection) {
-        qWarning() << "Tried to load support information without a valid connection?";
-        return;
-    }
-
-    m_connection->callApi<GetWellknownSupportJob>()
-        .onResult([this](const auto &job) {
-            m_supportPage = job->supportPage();
-            m_contacts.reserve(job->contacts().size());
-            for (const auto &contact : job->contacts()) {
-                m_contacts.push_back(SupportContact{
-                    .role = contact.role,
-                    .matrixId = contact.matrixId,
-                    .emailAddress = contact.emailAddress,
-                });
-            }
-
-            Q_EMIT loaded();
-        })
-        .onFailure([this](const auto &job) {
-            Q_UNUSED(job)
-
-            // Just do nothing, our properties will be empty.
-            Q_EMIT loaded();
-        });
-}
-
-#include "moc_supportcontroller.cpp"

src/app/supportcontroller.h

@@ -1,48 +0,0 @@
-// SPDX-FileCopyrightText: 2026 Joshua Goins <josh@redstrate.com>
-// SPDX-License-Identifier: GPL-3.0-only
-
-#pragma once
-
-#include "neochatconnection.h"
-
-class SupportContact
-{
-    Q_GADGET
-
-    Q_PROPERTY(QString role MEMBER role)
-    Q_PROPERTY(QString matrixId MEMBER matrixId)
-    Q_PROPERTY(QString emailAddress MEMBER emailAddress)
-
-public:
-    QString role;
-    QString matrixId;
-    QString emailAddress;
-};
-
-class SupportController : public QObject
-{
-    Q_OBJECT
-    QML_ELEMENT
-
-    Q_PROPERTY(NeoChatConnection *connection READ connection WRITE setConnection NOTIFY connectionChanged REQUIRED)
-    Q_PROPERTY(QString supportPage READ supportPage NOTIFY loaded)
-    Q_PROPERTY(QList<SupportContact> contacts READ contacts NOTIFY loaded)
-
-public:
-    void setConnection(NeoChatConnection *connection);
-    NeoChatConnection *connection() const;
-
-    QString supportPage() const;
-    QList<SupportContact> contacts() const;
-
-Q_SIGNALS:
-    void connectionChanged();
-    void loaded();
-
-private:
-    void load();
-
-    QPointer<NeoChatConnection> m_connection = nullptr;
-    QList<SupportContact> m_contacts;
-    QString m_supportPage;
-};

src/chatbar/EmojiDialog.qml

@@ -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, QQC2.ApplicationWindow.window.width)
     contentItem: EmojiPicker {
         id: emojiPicker
         height: 400

src/chatbar/EmojiPicker.qml

@@ -148,7 +148,7 @@ ColumnLayout {
             id: quickReactions
             Layout.fillWidth: true
 
-            model: ["👍", "👎", "😄", "🎉", "😕", "❤️", "🚀", "👀"]
+            model: ["👍", "👎", "😄", "🎉", "😕", "❤", "🚀", "👀"]
 
             delegate: EmojiDelegate {
                 required property string modelData

src/libneochat/chatbarcache.cpp

@@ -150,12 +150,7 @@ Quotient::RoomMember ChatBarCache::relationAuthor() const
     if (m_relationId.isEmpty()) {
         return room->member(QString());
     }
-    const auto [event, _] = room->getEvent(m_relationId);
-    if (event != nullptr) {
-        return room->member(event->senderId());
-    }
-    qWarning() << "Failed to find relation" << m_relationId << "in timeline?";
-    return room->member(QString());
+    return room->member((*room->findInTimeline(m_relationId))->senderId());
 }
 
 bool ChatBarCache::relationAuthorIsPresent() const
@@ -178,8 +173,8 @@ QString ChatBarCache::relationMessage() const
         return {};
     }
 
-    if (auto [event, _] = room->getEvent(m_relationId); event != nullptr) {
-        return EventHandler::markdownBody(event);
+    if (auto event = room->findInTimeline(m_relationId); event != room->historyEdge()) {
+        return EventHandler::markdownBody(&**event);
     }
     return {};
 }
@@ -285,6 +280,11 @@ void ChatBarCache::postMessage()
         return;
     }
 
+    const auto replyIt = room->findInTimeline(replyId());
+    if (replyIt == room->historyEdge()) {
+        isReply = false;
+    }
+
     auto content = std::make_unique<Quotient::EventContent::TextContent>(sendText, u"text/html"_s);
 
     room->post<Quotient::RoomMessageEvent>(text(), *std::get<std::optional<Quotient::RoomMessageEvent::MsgType>>(result), std::move(content), relatesTo);

src/libneochat/enums/powerlevel.cpp

@@ -12,10 +12,6 @@ QString PowerLevel::nameForLevel(Level level)
         return i18n("Moderator");
     case PowerLevel::Admin:
         return i18n("Admin");
-    case PowerLevel::Owner:
-        return i18nc("The person that owns a room", "Owner");
-    case PowerLevel::Creator:
-        return i18nc("The person that created a room", "Creator");
     case PowerLevel::Mute:
         return i18n("Mute");
     case PowerLevel::Custom:
@@ -34,8 +30,6 @@ int PowerLevel::valueForLevel(Level level)
         return 50;
     case PowerLevel::Admin:
         return 100;
-    case PowerLevel::Owner:
-        return 150;
     case PowerLevel::Mute:
         return -1;
     default:
@@ -52,12 +46,8 @@ PowerLevel::Level PowerLevel::levelForValue(int value)
         return PowerLevel::Moderator;
     case 100:
         return PowerLevel::Admin;
-    case 150:
-        return PowerLevel::Owner;
     case -1:
         return PowerLevel::Mute;
-    case std::numeric_limits<int>::max():
-        return PowerLevel::Creator;
     default:
         return PowerLevel::Custom;
     }

src/libneochat/enums/powerlevel.h

@@ -31,12 +31,10 @@ public:
     enum Level {
         Member, /**< A basic member. */
         Moderator, /**< A moderator with enhanced powers. */
-        Admin, /**< Power level 100. */
-        Owner, /**< Power level 150. */
+        Admin, /**< The highest power level in the room. */
         Mute, /**< The level to remove posting privileges. */
         NUMLevels,
         Custom, /**< A non-standard value. Intentionally after NUMLevels so it doesn't appear in the model. */
-        Creator, /**< The user creating the (co-)creating the room. */
     };
     Q_ENUM(Level);
 

src/libneochat/eventhandler.cpp

@@ -697,9 +697,6 @@ QString EventHandler::subtitleText(const NeoChatRoom *room, const Quotient::Room
         qCWarning(EventHandling) << "subtitleText called with event set to nullptr.";
         return {};
     }
-    if (room->isDirectChat()) {
-        return plainBody(room, event, true);
-    }
     return singleLineAuthorDisplayname(room, event) + (event->isStateEvent() ? u" "_s : u": "_s) + plainBody(room, event, true);
 }
 

src/libneochat/models/actionsmodel.cpp

@@ -59,7 +59,7 @@ QList<ActionsModel::Action> actions{
     Action{
         u"shrug"_s,
         [](const QString &message, NeoChatRoom *, ChatBarCache *) {
-            return u"¯\\\\\\_(ツ)\\_/¯ %1"_s.arg(message);
+            return u"¯\\\\_(ツ)_/¯ %1"_s.arg(message);
         },
         Quotient::RoomMessageEvent::MsgType::Text,
         kli18n("<message>"),

src/libneochat/models/roomlistmodel.cpp

@@ -118,10 +118,8 @@ void RoomListModel::connectRoomSignals(NeoChatRoom *room)
     connect(room, &Room::displaynameChanged, this, [this, room] {
         refresh(room, {DisplayNameRole});
     });
-    connect(room, &Room::changed, this, [this, room](Room::Changes changes) {
-        if (changes & (Room::Change::UnreadStats | Room::Change::Highlights)) {
-            refresh(room, {ContextNotificationCountRole, HasHighlightNotificationsRole, NotificationCountRole});
-        }
+    connect(room, &Room::unreadStatsChanged, this, [this, room] {
+        refresh(room, {ContextNotificationCountRole, HasHighlightNotificationsRole, NotificationCountRole});
     });
     connect(room, &Room::notificationCountChanged, this, [this, room] {
         refresh(room);

src/libneochat/neochatconnection.cpp

@@ -77,37 +77,31 @@ void NeoChatConnection::connectSignals()
         Q_EMIT directChatInvitesChanged();
         for (const auto &chatId : additions) {
             if (const auto chat = room(chatId)) {
-                connect(chat, &Room::changed, this, [this](Room::Changes changes) {
-                    if (changes & (Room::Change::UnreadStats | Room::Change::Highlights)) {
-                        refreshBadgeNotificationCount();
-                        Q_EMIT directChatNotificationsChanged();
-                        Q_EMIT directChatsHaveHighlightNotificationsChanged();
-                    }
+                connect(chat, &Room::unreadStatsChanged, this, [this]() {
+                    refreshBadgeNotificationCount();
+                    Q_EMIT directChatNotificationsChanged();
+                    Q_EMIT directChatsHaveHighlightNotificationsChanged();
                 });
             }
         }
         for (const auto &chatId : removals) {
             if (const auto chat = room(chatId)) {
-                disconnect(chat, &Room::changed, this, nullptr);
+                disconnect(chat, &Room::unreadStatsChanged, this, nullptr);
             }
         }
     });
     connect(this, &NeoChatConnection::joinedRoom, this, [this](Room *room) {
         if (room->isDirectChat()) {
-            connect(room, &Room::changed, this, [this](Room::Changes changes) {
-                if (changes & (Room::Change::UnreadStats | Room::Change::Highlights)) {
-                    Q_EMIT directChatNotificationsChanged();
-                    Q_EMIT directChatsHaveHighlightNotificationsChanged();
-                }
+            connect(room, &Room::unreadStatsChanged, this, [this]() {
+                Q_EMIT directChatNotificationsChanged();
+                Q_EMIT directChatsHaveHighlightNotificationsChanged();
             });
         }
         Q_EMIT roomInvitesChanged();
-        connect(room, &Room::changed, this, [this](Room::Changes changes) {
-            if (changes & (Room::Change::UnreadStats | Room::Change::Highlights)) {
-                refreshBadgeNotificationCount();
-                Q_EMIT homeNotificationsChanged();
-                Q_EMIT homeHaveHighlightNotificationsChanged();
-            }
+        connect(room, &Room::unreadStatsChanged, this, [this]() {
+            refreshBadgeNotificationCount();
+            Q_EMIT homeNotificationsChanged();
+            Q_EMIT homeHaveHighlightNotificationsChanged();
         });
     });
     connect(this, &NeoChatConnection::leftRoom, this, [this](Room *room, Room *prev) {
@@ -142,9 +136,9 @@ void NeoChatConnection::connectSignals()
         this,
         [this] {
             callApi<GetVersionsJob>(BackgroundRequest).onResult([this](const auto &job) {
-                m_canCheckMutualRooms = job->unstableFeatures().value("uk.half-shot.msc2666.query_mutual_rooms"_L1, false);
+                m_canCheckMutualRooms = job->unstableFeatures().contains("uk.half-shot.msc2666.query_mutual_rooms"_L1);
                 Q_EMIT canCheckMutualRoomsChanged();
-                m_canEraseData = job->unstableFeatures().value("org.matrix.msc4025"_L1, false) || job->versions().count("v1.10"_L1);
+                m_canEraseData = job->unstableFeatures().contains("org.matrix.msc4025"_L1) || job->versions().count("v1.10"_L1);
                 Q_EMIT canEraseDataChanged();
             });
         },
@@ -614,26 +608,4 @@ void NeoChatConnection::reportUser(const QString &userId, const QString &reason)
     callApi<NeochatReportUserJob>(userId, reason);
 }
 
-bool NeoChatConnection::supportsMatrixSpecVersion(const QString &version)
-{
-    return supportedMatrixSpecVersions().contains(version);
-}
-
-QString NeoChatConnection::noteForUser(const QString &userId)
-{
-    const auto object = accountDataJson(QStringLiteral("org.kde.neochat.user_note"));
-    return object[userId].toString();
-}
-
-void NeoChatConnection::setNoteForUser(const QString &userId, const QString &note)
-{
-    auto object = accountDataJson(QStringLiteral("org.kde.neochat.user_note"));
-    if (note.isEmpty()) {
-        object.remove(userId);
-    } else {
-        object[userId] = note;
-    }
-    setAccountData(QStringLiteral("org.kde.neochat.user_note"), object);
-}
-
 #include "moc_neochatconnection.cpp"

src/libneochat/neochatconnection.h

@@ -229,21 +229,6 @@ public:
       */
     Q_INVOKABLE void reportUser(const QString &userId, const QString &reason);
 
-    /**
-     * @return True if this connection supports the given spec version (e.g. "v1.11").
-     */
-    Q_INVOKABLE bool supportsMatrixSpecVersion(const QString &version);
-
-    /**
-     * @return The private note for this user, if set.
-     */
-    Q_INVOKABLE QString noteForUser(const QString &userId);
-
-    /**
-     * @brief Sets the private note for this user.
-     */
-    Q_INVOKABLE void setNoteForUser(const QString &userId, const QString &note);
-
 Q_SIGNALS:
     void globalUrlPreviewEnabledChanged();
     void labelChanged();

src/libneochat/neochatroom.cpp

@@ -169,7 +169,6 @@ NeoChatRoom::NeoChatRoom(Connection *connection, QString roomId, JoinState joinS
     const auto neochatconnection = static_cast<NeoChatConnection *>(connection);
     Q_ASSERT(neochatconnection);
     connect(neochatconnection, &NeoChatConnection::globalUrlPreviewEnabledChanged, this, &NeoChatRoom::urlPreviewEnabledChanged);
-    connect(this, &Room::fullyReadMarkerMoved, this, &NeoChatRoom::invalidateLastUnreadHighlightId);
 }
 
 bool NeoChatRoom::visible() const
@@ -1186,10 +1185,7 @@ void NeoChatRoom::loadPinnedMessage()
         connection()->callApi<GetOneRoomEventJob>(id(), mostRecentEventId).then([this](const auto &job) {
             auto event = fromJson<event_ptr_tt<RoomEvent>>(job->jsonData());
             if (auto encEv = eventCast<EncryptedEvent>(event.get())) {
-                auto decryptedMessage = decryptMessage(*encEv);
-                if (decryptedMessage) {
-                    event = std::move(decryptedMessage);
-                }
+                event = decryptMessage(*encEv);
             }
             m_pinnedMessage = EventHandler::richBody(this, event.get());
             Q_EMIT pinnedMessageChanged();
@@ -1657,12 +1653,6 @@ void NeoChatRoom::downloadEventFromServer(const QString &eventId)
                 }
 
                 event_ptr_tt<RoomEvent> event = fromJson<event_ptr_tt<RoomEvent>>(job->jsonData());
-                if (auto encEv = eventCast<EncryptedEvent>(event.get())) {
-                    auto decryptedEvent = decryptMessage(*encEv);
-                    if (decryptedEvent) {
-                        event = std::move(decryptedEvent);
-                    }
-                }
                 m_extraEvents.push_back(std::move(event));
                 Q_EMIT extraEventLoaded(eventId);
             },
@@ -1700,11 +1690,6 @@ std::pair<const Quotient::RoomEvent *, bool> NeoChatRoom::getEvent(const QString
     return std::make_pair(extraIt != m_extraEvents.end() ? extraIt->get() : nullptr, false);
 }
 
-const RoomEvent *NeoChatRoom::findEvent(const QString &eventId) const
-{
-    return getEvent(eventId).first;
-}
-
 const RoomEvent *NeoChatRoom::getReplyForEvent(const RoomEvent &event) const
 {
 #if Quotient_VERSION_MINOR > 9
@@ -1858,52 +1843,4 @@ void NeoChatRoom::report(const QString &reason)
     connection()->callApi<NeochatReportRoomJob>(id(), reason);
 }
 
-QString NeoChatRoom::findNextUnreadHighlightId()
-{
-    const QString startEventId = !m_lastUnreadHighlightId.isEmpty() ? m_lastUnreadHighlightId : lastFullyReadEventId();
-    const auto startIt = findInTimeline(startEventId);
-    if (startIt == historyEdge()) {
-        return {};
-    }
-
-    for (auto it = startIt.base(); it != messageEvents().cend(); ++it) {
-        const RoomEvent *ev = it->event();
-        if (highlights.contains(ev)) {
-            m_lastUnreadHighlightId = ev->id();
-            Q_EMIT highlightCycleStartedChanged();
-            return m_lastUnreadHighlightId;
-        }
-    }
-
-    if (!m_lastUnreadHighlightId.isEmpty()) {
-        m_lastUnreadHighlightId.clear();
-        Q_EMIT highlightCycleStartedChanged();
-        return findNextUnreadHighlightId();
-    }
-    return {};
-}
-
-bool NeoChatRoom::highlightCycleStarted() const
-{
-    return !m_lastUnreadHighlightId.isEmpty();
-}
-
-void NeoChatRoom::invalidateLastUnreadHighlightId(const QString &fromEventId, const QString &toEventId)
-{
-    Q_UNUSED(fromEventId);
-
-    if (m_lastUnreadHighlightId.isEmpty()) {
-        return;
-    }
-
-    const auto lastIt = findInTimeline(m_lastUnreadHighlightId);
-    const auto newReadIt = findInTimeline(toEventId);
-
-    // opposite comparision because both are reverse iterators :p
-    if (newReadIt <= lastIt) {
-        m_lastUnreadHighlightId.clear();
-        Q_EMIT highlightCycleStartedChanged();
-    }
-}
-
 #include "moc_neochatroom.cpp"

src/libneochat/neochatroom.h

@@ -208,11 +208,6 @@ class NeoChatRoom : public Quotient::Room
      */
     Q_PROPERTY(QString pinnedMessage READ pinnedMessage NOTIFY pinnedMessageChanged)
 
-    /**
-     * @brief Whether the highlight finding cycle has started.
-     */
-    Q_PROPERTY(bool highlightCycleStarted READ highlightCycleStarted NOTIFY highlightCycleStartedChanged)
-
 public:
     explicit NeoChatRoom(Quotient::Connection *connection, QString roomId, Quotient::JoinState joinState = {});
 
@@ -538,13 +533,6 @@ public:
      */
     std::pair<const Quotient::RoomEvent *, bool> getEvent(const QString &eventId) const;
 
-    /**
-     * @brief Returns the event object with the given ID if available.
-     *
-     * This function works identically to getEvent, except this is usable from QML.
-     */
-    Q_INVOKABLE const Quotient::RoomEvent *findEvent(const QString &eventId) const;
-
     /**
      * @brief Returns the event that is being replied to. This includes events that were manually loaded using NeoChatRoom::loadReply.
      */
@@ -627,7 +615,7 @@ public:
     /**
      * @brief Whether this user is considered a creator of this room. Only applies to post-v12 rooms.
      */
-    Q_INVOKABLE bool isCreator(const QString &userId) const;
+    bool isCreator(const QString &userId) const;
 
     /**
      * @return The most recent pinned message in the room.
@@ -639,19 +627,6 @@ public:
      */
     Q_INVOKABLE void report(const QString &reason);
 
-    /**
-     * @brief Returns the ID of the next unread highlight in the room.
-     *
-     * Each call advances the internal highlight cursor. Once the last unread highlight
-     * is reached, the cycle is reset.
-     */
-    Q_INVOKABLE QString findNextUnreadHighlightId();
-
-    /**
-     * @brief Whether the highlight finding cycle has started.
-     */
-    bool highlightCycleStarted() const;
-
 private:
     bool m_visible = false;
 
@@ -687,15 +662,11 @@ private:
     QString m_pinnedMessage;
     void loadPinnedMessage();
 
-    QString m_lastUnreadHighlightId;
-
 private Q_SLOTS:
     void updatePushNotificationState(QString type);
 
     void cacheLastEvent();
 
-    void invalidateLastUnreadHighlightId(const QString &fromEventId, const QString &toEventId);
-
 Q_SIGNALS:
     void cachedInputChanged();
     void busyChanged();
@@ -721,7 +692,6 @@ Q_SIGNALS:
     void extraEventNotFound(const QString &eventId);
     void inviteTimestampChanged();
     void pinnedMessageChanged();
-    void highlightCycleStartedChanged();
 
     /**
      * @brief Request a message be shown to the user of the given type.

src/libneochat/qml/ExploreRoomsPage.qml

@@ -50,7 +50,7 @@ SearchPage {
      */
     signal roomSelected(string roomId, string displayName, url avatarUrl, string alias, string topic, int memberCount, bool isJoined)
 
-    title: i18nc("@action:title Explore public rooms and spaces", "Explore")
+    title: i18nc("@action:title", "Explore Rooms")
     customPlaceholderText: publicRoomListModel.redirectedText
     customPlaceholderIcon: "data-warning"
 

src/libneochat/spacehierarchycache.cpp

@@ -43,8 +43,8 @@ void SpaceHierarchyCache::cacheSpaceHierarchy()
                 Qt::SingleShotConnection);
         }
 
-        connect(neoChatRoom, &NeoChatRoom::changed, this, [this, neoChatRoom](NeoChatRoom::Changes changes) {
-            if (neoChatRoom != nullptr && (changes & (NeoChatRoom::Change::UnreadStats | NeoChatRoom::Change::Highlights))) {
+        connect(neoChatRoom, &NeoChatRoom::unreadStatsChanged, this, [this, neoChatRoom]() {
+            if (neoChatRoom != nullptr) {
                 const auto parents = parentSpaces(neoChatRoom->id());
                 if (parents.count() > 0) {
                     Q_EMIT spaceNotifcationCountChanged(parents);

src/messagecontent/AudioComponent.qml

@@ -53,19 +53,22 @@ ColumnLayout {
             when: !root.fileTransferInfo.completed && !root.fileTransferInfo.active
 
             PropertyChanges {
-                playButton.icon.name: "media-playback-start"
-                playButton.onClicked: Message.room.downloadFile(root.eventId)
+                target: playButton
+                icon.name: "media-playback-start"
+                onClicked: Message.room.downloadFile(root.eventId)
             }
         },
         State {
             name: "downloading"
             when: root.fileTransferInfo.active && !root.fileTransferInfo.completed
             PropertyChanges {
-                downloadBar.visible: true
+                target: downloadBar
+                visible: true
             }
             PropertyChanges {
-                playButton.icon.name: "media-playback-stop"
-                playButton.onClicked: {
+                target: playButton
+                icon.name: "media-playback-stop"
+                onClicked: {
                     Message.room.cancelFileTransfer(root.eventId);
                 }
             }
@@ -74,8 +77,9 @@ ColumnLayout {
             name: "paused"
             when: root.fileTransferInfo.completed && (audio.playbackState === MediaPlayer.StoppedState || audio.playbackState === MediaPlayer.PausedState)
             PropertyChanges {
-                playButton.icon.name: "media-playback-start"
-                playButton.onClicked: {
+                target: playButton
+                icon.name: "media-playback-start"
+                onClicked: {
                     audio.source = root.fileTransferInfo.localPath;
                     MediaManager.startPlayback();
                     audio.play();
@@ -87,8 +91,11 @@ ColumnLayout {
             when: root.fileTransferInfo.completed && audio.playbackState === MediaPlayer.PlayingState
 
             PropertyChanges {
-                playButton.icon.name: "media-playback-pause"
-                playButton.onClicked: audio.pause()
+                target: playButton
+
+                icon.name: "media-playback-pause"
+
+                onClicked: audio.pause()
             }
         }
     ]

src/messagecontent/CodeComponent.qml

@@ -130,10 +130,7 @@ QQC2.Control {
 
             TapHandler {
                 acceptedDevices: PointerDevice.TouchScreen
-                onLongPressed: {
-                    const event = root.Message.room.findEvent(root.eventId);
-                    RoomManager.viewEventMenu(root.QQC2.Overlay.overlay, event, root.Message.room, root.Message.selectedText, root.Message.hoveredLink);
-                }
+                onLongPressed: RoomManager.viewEventMenu(root.eventId, root.Message.room, root.Message.selectedText, root.Message.hoveredLink);
             }
 
             background: null

src/messagecontent/FileComponent.qml

@@ -73,13 +73,16 @@ ColumnLayout {
                 when: root.fileTransferInfo.completed && autoOpenFile
 
                 PropertyChanges {
-                    openButton.icon.name: "document-open"
-                    openButton.onClicked: openSavedFile()
-                    downloadButton {
-                        icon.name: "download"
-                        QQC2.ToolTip.text: i18nc("tooltip for a button on a message; offers ability to download its file", "Download")
-                        onClicked: saveFileAs()
-                    }
+                    target: openButton
+                    icon.name: "document-open"
+                    onClicked: openSavedFile()
+                }
+
+                PropertyChanges {
+                    target: downloadButton
+                    icon.name: "download"
+                    QQC2.ToolTip.text: i18nc("tooltip for a button on a message; offers ability to download its file", "Download")
+                    onClicked: saveFileAs()
                 }
             },
             State {
@@ -87,12 +90,15 @@ ColumnLayout {
                 when: root.fileTransferInfo.completed && !autoOpenFile
 
                 PropertyChanges {
-                    openButton.visible: false
-                    downloadButton {
-                        icon.name: "document-open"
-                        QQC2.ToolTip.text: i18nc("tooltip for a button on a message; offers ability to open its downloaded file with an appropriate application", "Open File")
-                        onClicked: openSavedFile()
-                    }
+                    target: openButton
+                    visible: false
+                }
+
+                PropertyChanges {
+                    target: downloadButton
+                    icon.name: "document-open"
+                    QQC2.ToolTip.text: i18nc("tooltip for a button on a message; offers ability to open its downloaded file with an appropriate application", "Open File")
+                    onClicked: openSavedFile()
                 }
             },
             State {
@@ -100,13 +106,19 @@ ColumnLayout {
                 when: root.fileTransferInfo.active
 
                 PropertyChanges {
-                    sizeLabel.text: i18nc("file download progress", "%1 / %2", Format.formatByteSize(root.fileTransferInfo.progress), Format.formatByteSize(root.fileTransferInfo.total))
-                    openButton.visible: false
-                    downloadButton {
-                        icon.name: "media-playback-stop"
-                        QQC2.ToolTip.text: i18nc("tooltip for a button on a message; stops downloading the message's file", "Stop Download")
-                        onClicked: Message.room.cancelFileTransfer(root.eventId)
-                    }
+                    target: openButton
+                    visible: false
+                }
+
+                PropertyChanges {
+                    target: sizeLabel
+                    text: i18nc("file download progress", "%1 / %2", Format.formatByteSize(root.fileTransferInfo.progress), Format.formatByteSize(root.fileTransferInfo.total))
+                }
+                PropertyChanges {
+                    target: downloadButton
+                    icon.name: "media-playback-stop"
+                    QQC2.ToolTip.text: i18nc("tooltip for a button on a message; stops downloading the message's file", "Stop Download")
+                    onClicked: Message.room.cancelFileTransfer(root.eventId)
                 }
             }
         ]