Add Prison dependency to QML modules so Prison is deployed on Windows

Otherwise we get an error because the DLL isn't found.

.craft.ini

@@ -2,5 +2,7 @@
 ; SPDX-License-Identifier: CC0-1.0
 
 [BlueprintSettings]
+kde/frameworks/extra-cmake-modules.version=master
+kde/unreleased/kirigami-addons.version=master
 kde/applications/neochat.packageAppx=True
 libs/qt.qtMajorVersion=6

.flatpak-manifest.json

@@ -2,7 +2,7 @@
     "id": "org.kde.neochat",
     "branch": "master",
     "runtime": "org.kde.Platform",
-    "runtime-version": "6.9",
+    "runtime-version": "6.8",
     "sdk": "org.kde.Sdk",
     "command": "neochat",
     "tags": [
@@ -149,6 +149,27 @@
             ],
             "builddir": true
         },
+        {
+            "name": "qcoro",
+            "buildsystem": "cmake-ninja",
+            "config-opts": [
+                "-DQCORO_BUILD_EXAMPLES=OFF",
+                "-DBUILD_TESTING=OFF"
+            ],
+            "sources": [
+                {
+                    "type": "archive",
+                    "url": "https://github.com/danvratil/qcoro/archive/refs/tags/v0.11.0.tar.gz",
+                    "sha256": "9942c5b4c533192f6c5954dc6d10178b3829075e6a621b67df73f0a4b74d8297",
+                    "x-checker-data": {
+                        "type": "anitya",
+                        "project-id": 236236,
+                        "stable-only": true,
+                        "url-template": "https://github.com/danvratil/qcoro/archive/refs/tags/v$version.tar.gz"
+                    }
+                }
+            ]
+        },
         {
             "name": "kunifiedpush",
             "buildsystem": "cmake-ninja",

CMakeLists.txt

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

autotests/eventhandlertest.cpp

@@ -130,8 +130,7 @@ void EventHandlerTest::timeString()
              QLocale().toString(QDateTime::fromMSecsSinceEpoch(1432735824654, QTimeZone(QTimeZone::UTC)).toLocalTime().time(), QLocale::ShortFormat));
     QCOMPARE(EventHandler::timeString(room, event, true),
              format.formatRelativeDate(QDateTime::fromMSecsSinceEpoch(1432735824654, QTimeZone(QTimeZone::UTC)).toLocalTime().date(), QLocale::ShortFormat));
-    QCOMPARE(EventHandler::timeString(room, event, u"hh:mm"_s),
-             QDateTime::fromMSecsSinceEpoch(1432735824654, QTimeZone(QTimeZone::LocalTime)).toString(u"hh:mm"_s));
+    QCOMPARE(EventHandler::timeString(room, event, u"hh:mm"_s), QDateTime::fromMSecsSinceEpoch(1432735824654, QTimeZone(QTimeZone::UTC)).toString(u"hh:mm"_s));
 
     const auto txID = room->postJson("m.room.message"_L1, event->fullJson());
     QCOMPARE(room->pendingEvents().size(), 1);

autotests/texthandlertest.cpp

@@ -61,7 +61,6 @@ private Q_SLOTS:
     void receiveRichStrikethrough();
     void receiveRichtextIn();
     void receiveRichMxcUrl();
-    void receiveRichPlainUrl_data();
     void receiveRichPlainUrl();
     void receiveRichEdited_data();
     void receiveRichEdited();
@@ -451,32 +450,6 @@ void TextHandlerTest::receiveRichMxcUrl()
     QCOMPARE(testTextHandler.handleRecieveRichText(Qt::RichText, room, room->messageEvents().at(0).get()), testOutputString);
 }
 
-void TextHandlerTest::receiveRichPlainUrl_data()
-{
-    QTest::addColumn<QString>("input");
-    QTest::addColumn<QString>("output");
-
-    // This is an actual link that caused trouble which is why it's so long. Keeping
-    // so we can confirm consistent behaviour for complex urls.
-    QTest::addRow("link 1")
-        << u"https://matrix.to/#/!RvzunyTWZGfNxJVQqv:matrix.org/$-9TJVTh5PvW6MvIhFDwteiyLBVGriinueO5eeIazQS8?via=libera.chat&amp;via=matrix.org&amp;via=fedora.im <a href=\"https://matrix.to/#/!RvzunyTWZGfNxJVQqv:matrix.org/$-9TJVTh5PvW6MvIhFDwteiyLBVGriinueO5eeIazQS8?via=libera.chat&amp;via=matrix.org&amp;via=fedora.im\">Link already rich</a>"_s
-        << u"<a href=\"https://matrix.to/#/!RvzunyTWZGfNxJVQqv:matrix.org/$-9TJVTh5PvW6MvIhFDwteiyLBVGriinueO5eeIazQS8?via=libera.chat&amp;via=matrix.org&amp;via=fedora.im\">https://matrix.to/#/!RvzunyTWZGfNxJVQqv:matrix.org/$-9TJVTh5PvW6MvIhFDwteiyLBVGriinueO5eeIazQS8?via=libera.chat&amp;via=matrix.org&amp;via=fedora.im</a> <a href=\"https://matrix.to/#/!RvzunyTWZGfNxJVQqv:matrix.org/$-9TJVTh5PvW6MvIhFDwteiyLBVGriinueO5eeIazQS8?via=libera.chat&amp;via=matrix.org&amp;via=fedora.im\">Link already rich</a>"_s;
-
-    // Another real case. The linkification wasn't handling it when a single link
-    // contains what looks like and email. It was broken into 3 but needs to
-    // be just single link.
-    QTest::addRow("link 2")
-        << u"https://lore.kernel.org/lkml/CAHk-=wio46vC4t6xXD-sFqjoPwFm_u515jm3suzmkGxQTeA1_A@mail.gmail.com/"_s
-        << u"<a href=\"https://lore.kernel.org/lkml/CAHk-=wio46vC4t6xXD-sFqjoPwFm_u515jm3suzmkGxQTeA1_A@mail.gmail.com/\">https://lore.kernel.org/lkml/CAHk-=wio46vC4t6xXD-sFqjoPwFm_u515jm3suzmkGxQTeA1_A@mail.gmail.com/</a>"_s;
-
-    QTest::addRow("email") << uR"(email@example.com <a href="mailto:email@example.com">Link already rich</a>)"_s
-                           << uR"(<a href="mailto:email@example.com">email@example.com</a> <a href="mailto:email@example.com">Link already rich</a>)"_s;
-    QTest::addRow("mxid")
-        << u"@user:kde.org <a href=\"https://matrix.to/#/@user:kde.org\">Link already rich</a>"_s
-        << u"<b><a href=\"https://matrix.to/#/@user:kde.org\">@user:kde.org</a></b> <b><a href=\"https://matrix.to/#/@user:kde.org\">Link already rich</a></b>"_s;
-    QTest::addRow("mxid with prefix") << u"a @user:kde.org b"_s << u"a <b><a href=\"https://matrix.to/#/@user:kde.org\">@user:kde.org</a></b> b"_s;
-}
-
 /**
  * For when your rich input string has a plain text url left in.
  *
@@ -485,13 +458,46 @@ void TextHandlerTest::receiveRichPlainUrl_data()
  */
 void TextHandlerTest::receiveRichPlainUrl()
 {
-    QFETCH(QString, input);
-    QFETCH(QString, output);
+    // This is an actual link that caused trouble which is why it's so long. Keeping
+    // so we can confirm consistent behaviour for complex urls.
+    const QString testInputStringLink1 =
+        u"https://matrix.to/#/!RvzunyTWZGfNxJVQqv:matrix.org/$-9TJVTh5PvW6MvIhFDwteiyLBVGriinueO5eeIazQS8?via=libera.chat&amp;via=matrix.org&amp;via=fedora.im <a href=\"https://matrix.to/#/!RvzunyTWZGfNxJVQqv:matrix.org/$-9TJVTh5PvW6MvIhFDwteiyLBVGriinueO5eeIazQS8?via=libera.chat&amp;via=matrix.org&amp;via=fedora.im\">Link already rich</a>"_s;
+    const QString testOutputStringLink1 =
+        u"<a href=\"https://matrix.to/#/!RvzunyTWZGfNxJVQqv:matrix.org/$-9TJVTh5PvW6MvIhFDwteiyLBVGriinueO5eeIazQS8?via=libera.chat&amp;via=matrix.org&amp;via=fedora.im\">https://matrix.to/#/!RvzunyTWZGfNxJVQqv:matrix.org/$-9TJVTh5PvW6MvIhFDwteiyLBVGriinueO5eeIazQS8?via=libera.chat&amp;via=matrix.org&amp;via=fedora.im</a> <a href=\"https://matrix.to/#/!RvzunyTWZGfNxJVQqv:matrix.org/$-9TJVTh5PvW6MvIhFDwteiyLBVGriinueO5eeIazQS8?via=libera.chat&amp;via=matrix.org&amp;via=fedora.im\">Link already rich</a>"_s;
+
+    // Another real case. The linkification wasn't handling it when a single link
+    // contains what looks like and email. It was been broken into 3 but needs to
+    // be just single link.
+    const QString testInputStringLink2 = u"https://lore.kernel.org/lkml/CAHk-=wio46vC4t6xXD-sFqjoPwFm_u515jm3suzmkGxQTeA1_A@mail.gmail.com/"_s;
+    const QString testOutputStringLink2 =
+        u"<a href=\"https://lore.kernel.org/lkml/CAHk-=wio46vC4t6xXD-sFqjoPwFm_u515jm3suzmkGxQTeA1_A@mail.gmail.com/\">https://lore.kernel.org/lkml/CAHk-=wio46vC4t6xXD-sFqjoPwFm_u515jm3suzmkGxQTeA1_A@mail.gmail.com/</a>"_s;
+
+    QString testInputStringEmail = uR"(email@example.com <a href="mailto:email@example.com">Link already rich</a>)"_s;
+    QString testOutputStringEmail = uR"(<a href="mailto:email@example.com">email@example.com</a> <a href="mailto:email@example.com">Link already rich</a>)"_s;
+
+    QString testInputStringMxId = u"@user:kde.org <a href=\"https://matrix.to/#/@user:kde.org\">Link already rich</a>"_s;
+    QString testOutputStringMxId =
+        u"<b><a href=\"https://matrix.to/#/@user:kde.org\">@user:kde.org</a></b> <b><a href=\"https://matrix.to/#/@user:kde.org\">Link already rich</a></b>"_s;
+
+    QString testInputStringMxIdWithPrefix = u"a @user:kde.org b"_s;
+    QString testOutputStringMxIdWithPrefix = u"a <b><a href=\"https://matrix.to/#/@user:kde.org\">@user:kde.org</a></b> b"_s;
 
     TextHandler testTextHandler;
-    testTextHandler.setData(input);
+    testTextHandler.setData(testInputStringLink1);
 
-    QCOMPARE(testTextHandler.handleRecieveRichText(Qt::RichText), output);
+    QCOMPARE(testTextHandler.handleRecieveRichText(Qt::RichText), testOutputStringLink1);
+
+    testTextHandler.setData(testInputStringLink2);
+    QCOMPARE(testTextHandler.handleRecieveRichText(Qt::RichText), testOutputStringLink2);
+
+    testTextHandler.setData(testInputStringEmail);
+    QCOMPARE(testTextHandler.handleRecieveRichText(Qt::RichText), testOutputStringEmail);
+
+    testTextHandler.setData(testInputStringMxId);
+    QCOMPARE(testTextHandler.handleRecieveRichText(Qt::RichText), testOutputStringMxId);
+
+    testTextHandler.setData(testInputStringMxIdWithPrefix);
+    QCOMPARE(testTextHandler.handleRecieveRichText(Qt::RichText), testOutputStringMxIdWithPrefix);
 }
 
 void TextHandlerTest::receiveRichEdited_data()

autotests/timelinemessagemodeltest.cpp

@@ -57,7 +57,7 @@ void TimelineMessageModelTest::switchEmptyRoom()
     auto firstRoom = new TestUtils::TestRoom(connection, u"#firstRoom:kde.org"_s);
     auto secondRoom = new TestUtils::TestRoom(connection, u"#secondRoom:kde.org"_s);
 
-    QSignalSpy spy(model, SIGNAL(roomChanged(NeoChatRoom *, NeoChatRoom *)));
+    QSignalSpy spy(model, SIGNAL(roomChanged()));
 
     QCOMPARE(model->room(), nullptr);
     model->setRoom(firstRoom);
@@ -77,7 +77,7 @@ void TimelineMessageModelTest::switchSyncedRoom()
     auto firstRoom = new TestUtils::TestRoom(connection, u"#firstRoom:kde.org"_s, u"test-messageventmodel-sync.json"_s);
     auto secondRoom = new TestUtils::TestRoom(connection, u"#secondRoom:kde.org"_s, u"test-messageventmodel-sync.json"_s);
 
-    QSignalSpy spy(model, SIGNAL(roomChanged(NeoChatRoom *, NeoChatRoom *)));
+    QSignalSpy spy(model, SIGNAL(roomChanged()));
 
     QCOMPARE(model->room(), nullptr);
     model->setRoom(firstRoom);
@@ -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->eventIdToRow(u"$153456789:example.org"_s), 0);
 }
 
 void TimelineMessageModelTest::cleanup()

org.kde.neochat.appdata.xml

@@ -477,8 +477,6 @@
     <content_attribute id="social-chat">intense</content_attribute>
   </content_rating>
   <releases>
-    <release version="25.04.3" date="2025-07-03"/>
-    <release version="25.04.2" date="2025-06-05"/>
     <release version="25.04.1" date="2025-05-08"/>
     <release version="25.04.0" date="2025-04-17"/>
     <release version="24.12.3" date="2025-03-06"/>

src/CMakeLists.txt

@@ -9,7 +9,6 @@ add_subdirectory(libneochat)
 add_subdirectory(login)
 add_subdirectory(rooms)
 add_subdirectory(roominfo)
-add_subdirectory(messagecontent)
 add_subdirectory(timeline)
 add_subdirectory(spaces)
 add_subdirectory(chatbar)

src/app/CMakeLists.txt

@@ -20,6 +20,8 @@ add_library(neochat STATIC
     windowcontroller.h
     models/serverlistmodel.cpp
     models/serverlistmodel.h
+    logger.cpp
+    logger.h
     models/notificationsmodel.cpp
     models/notificationsmodel.h
     proxycontroller.cpp
@@ -59,7 +61,9 @@ ecm_add_qml_module(neochat URI org.kde.neochat GENERATE_PLUGIN_SOURCE
         qml/RoomPage.qml
         qml/ManualRoomDialog.qml
         qml/ExplorerDelegate.qml
+        qml/ImageEditorPage.qml
         qml/NeochatMaximizeComponent.qml
+        qml/TypingPane.qml
         qml/QuickSwitcher.qml
         qml/AttachmentPane.qml
         qml/QuickFormatBar.qml
@@ -104,11 +108,12 @@ ecm_add_qml_module(neochat URI org.kde.neochat GENERATE_PLUGIN_SOURCE
     DEPENDENCIES
         QtCore
         QtQuick
+        org.kde.prison
+        org.kde.prison.scanner
     IMPORTS
         org.kde.neochat.libneochat
         org.kde.neochat.rooms
         org.kde.neochat.roominfo
-        org.kde.neochat.messagecontent
         org.kde.neochat.timeline
         org.kde.neochat.spaces
         org.kde.neochat.settings
@@ -177,7 +182,7 @@ else()
 endif()
 
 target_include_directories(neochat PRIVATE ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/models)
-target_link_libraries(neochat PRIVATE Loginplugin Roomsplugin RoomInfoplugin MessageContentplugin Timelineplugin Spacesplugin Chatbarplugin Settingsplugin Devtoolsplugin)
+target_link_libraries(neochat PRIVATE Loginplugin Roomsplugin RoomInfoplugin Timelineplugin Spacesplugin Chatbarplugin Settingsplugin Devtoolsplugin)
 target_link_libraries(neochat PUBLIC
     LibNeoChat
     Timeline
@@ -202,7 +207,6 @@ target_link_libraries(neochat PUBLIC
     QuotientQt6
     Login
     Rooms
-    MessageContent
     Spaces
 )
 
@@ -357,10 +361,3 @@ install(TARGETS neochat-app ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
 if (NOT ANDROID AND NOT WIN32 AND NOT APPLE)
     install(FILES plasma-runner-neochat.desktop DESTINATION ${KDE_INSTALL_DATAROOTDIR}/krunner/dbusplugins)
 endif()
-
-if (APPLE)
-    set_target_properties(neochat-app PROPERTIES MACOSX_BUNDLE_GUI_IDENTIFIER "org.kde.neochat")
-    set_target_properties(neochat-app PROPERTIES MACOSX_BUNDLE_BUNDLE_NAME "NeoChat")
-    set_target_properties(neochat-app PROPERTIES MACOSX_BUNDLE_SHORT_VERSION_STRING ${RELEASE_SERVICE_VERSION})
-    set_target_properties(neochat-app PROPERTIES MACOSX_BUNDLE_BUNDLE_VERSION ${RELEASE_SERVICE_VERSION})
-endif ()

src/app/controller.cpp

@@ -407,9 +407,4 @@ void Controller::markImageShown(const QString &eventId)
     m_shownImages.append(eventId);
 }
 
-void Controller::markImageHidden(const QString &eventId)
-{
-    m_shownImages.removeAll(eventId);
-}
-
 #include "moc_controller.cpp"

src/app/controller.h

@@ -99,7 +99,6 @@ public:
 
     Q_INVOKABLE bool isImageShown(const QString &eventId);
     Q_INVOKABLE void markImageShown(const QString &eventId);
-    Q_INVOKABLE void markImageHidden(const QString &eventId);
 
 private:
     explicit Controller(QObject *parent = nullptr);

src/app/logger.cpp

@@ -0,0 +1,223 @@
+// SPDX-FileCopyrightText: 1997 Matthias Kalle Dalheimer <kalle@kde.org>
+// SPDX-FileCopyrightText: 2002 Holger Freyther <freyther@kde.org>
+// SPDX-FileCopyrightText: 2008 Volker Krause <vkrause@kde.org>
+// SPDX-FileCopyrightText: 2023 Tobias Fella <fella@posteo.de>
+// SPDX-License-Identifier: LGPL-2.0-or-later
+
+#include "logger.h"
+
+#include <QDateTime>
+#include <QDir>
+#include <QFileInfo>
+#include <QLoggingCategory>
+#include <QMutex>
+#include <QStandardPaths>
+
+using namespace Qt::StringLiterals;
+
+static QLoggingCategory::CategoryFilter oldCategoryFilter = nullptr;
+static QtMessageHandler oldHandler = nullptr;
+static bool e2eeDebugEnabled = false;
+
+class FileDebugStream : public QIODevice
+{
+    Q_OBJECT
+public:
+    FileDebugStream()
+        : mType(QtCriticalMsg)
+    {
+        open(WriteOnly);
+    }
+
+    bool isSequential() const override
+    {
+        return true;
+    }
+    qint64 readData(char *, qint64) override
+    {
+        return 0;
+    }
+    qint64 readLineData(char *, qint64) override
+    {
+        return 0;
+    }
+
+    qint64 writeData(const char *data, qint64 len) override
+    {
+        if (!mFileName.isEmpty()) {
+            QFile outputFile(mFileName);
+            outputFile.open(QIODevice::WriteOnly | QIODevice::Append | QIODevice::Unbuffered);
+            outputFile.write(data, len);
+            outputFile.putChar('\n');
+            outputFile.close();
+        }
+
+        return len;
+    }
+
+    void setFileName(const QString &fileName)
+    {
+        mFileName = fileName;
+    }
+
+    void setType(QtMsgType type)
+    {
+        mType = type;
+    }
+
+private:
+    QString mFileName;
+    QtMsgType mType;
+};
+
+class DebugPrivate
+{
+public:
+    DebugPrivate()
+        : origHandler(nullptr)
+    {
+    }
+
+    ~DebugPrivate()
+    {
+        qInstallMessageHandler(origHandler);
+        file.close();
+    }
+
+    void log(QtMsgType type, const QMessageLogContext &context, const QString &message)
+    {
+        QMutexLocker locker(&mutex);
+        QByteArray buf;
+        QTextStream str(&buf);
+        str << QDateTime::currentDateTime().toString(Qt::ISODate) << u" ["_s;
+        switch (type) {
+        case QtDebugMsg:
+            str << u"DEBUG"_s;
+            break;
+        case QtInfoMsg:
+            str << u"INFO "_s;
+            break;
+        case QtWarningMsg:
+            str << u"WARN "_s;
+            break;
+        case QtFatalMsg:
+            str << u"FATAL"_s;
+            break;
+        case QtCriticalMsg:
+            str << u"CRITICAL"_s;
+            break;
+        }
+        str << u"] "_s << context.category << u": "_s;
+        if (context.file && *context.file && context.line) {
+            str << context.file << u":"_s << context.line << u": "_s;
+        }
+        if (context.function && *context.function) {
+            str << context.function << u": "_s;
+        }
+        str << message << u"\n"_s;
+        str.flush();
+        file.write(buf.constData(), buf.size());
+        file.flush();
+
+        if (oldHandler && (!context.category || (strcmp(context.category, "quotient.e2ee") != 0 || e2eeDebugEnabled))) {
+            oldHandler(type, context, message);
+        }
+    }
+
+    void setName(const QString &appName)
+    {
+        name = appName;
+
+        if (file.isOpen()) {
+            file.close();
+        }
+        const auto &filePath = u"%1%2%3"_s.arg(QStandardPaths::writableLocation(QStandardPaths::AppDataLocation), QDir::separator(), appName);
+
+        QDir dir(QStandardPaths::writableLocation(QStandardPaths::AppDataLocation) + QDir::separator());
+        auto entryList = dir.entryList({appName + u".*"_s});
+        std::sort(entryList.begin(), entryList.end(), [](const auto &left, const auto &right) {
+            auto leftIndex = left.split(u"."_s).last().toInt();
+            auto rightIndex = right.split(u"."_s).last().toInt();
+            return leftIndex > rightIndex;
+        });
+        for (const auto &entry : entryList) {
+            bool ok = false;
+            const auto index = entry.split(u"."_s).last().toInt(&ok);
+            if (!ok) {
+                continue;
+            }
+            QFileInfo info(QStandardPaths::writableLocation(QStandardPaths::AppDataLocation) + QDir::separator() + entry);
+            if (info.exists()) {
+                QFile file(info.absoluteFilePath());
+                if (index > 50) {
+                    file.remove();
+                    continue;
+                }
+                const auto &newName = u"%1.%2"_s.arg(filePath, QString::number(index + 1));
+                const auto success = file.copy(newName);
+                if (success) {
+                    file.remove();
+                } else {
+                    qFatal("Cannot rename log file '%s' to '%s': %s",
+                           qUtf8Printable(file.fileName()),
+                           qUtf8Printable(newName),
+                           qUtf8Printable(file.errorString()));
+                }
+            }
+        }
+
+        QFileInfo finfo(filePath);
+        if (!finfo.absoluteDir().exists()) {
+            QDir().mkpath(finfo.absolutePath());
+        }
+        file.setFileName(filePath + u".0"_s);
+        file.open(QIODevice::WriteOnly | QIODevice::Unbuffered);
+    }
+
+    void setOrigHandler(QtMessageHandler origHandler_)
+    {
+        origHandler = origHandler_;
+    }
+
+    QMutex mutex;
+    QFile file;
+    QString name;
+    QtMessageHandler origHandler;
+    QByteArray loggingCategory;
+};
+
+Q_GLOBAL_STATIC(DebugPrivate, sInstance)
+
+void messageHandler(QtMsgType type, const QMessageLogContext &context, const QString &message)
+{
+    switch (type) {
+    case QtDebugMsg:
+    case QtInfoMsg:
+    case QtWarningMsg:
+    case QtCriticalMsg:
+        sInstance()->log(type, context, message);
+        break;
+    case QtFatalMsg:
+        sInstance()->log(QtInfoMsg, context, message);
+    }
+}
+
+void filter(QLoggingCategory *category)
+{
+    if (qstrcmp(category->categoryName(), "quotient.e2ee") == 0) {
+        category->setEnabled(QtDebugMsg, true);
+    } else if (oldCategoryFilter) {
+        oldCategoryFilter(category);
+    }
+}
+
+void initLogging()
+{
+    e2eeDebugEnabled = QLoggingCategory("quotient.e2ee", QtInfoMsg).isEnabled(QtDebugMsg);
+    oldCategoryFilter = QLoggingCategory::installFilter(filter);
+    oldHandler = qInstallMessageHandler(messageHandler);
+    sInstance->setOrigHandler(oldHandler);
+    sInstance->setName(u"neochat.log"_s);
+}
+
+#include "logger.moc"

src/app/logger.h

@@ -0,0 +1,9 @@
+// SPDX-FileCopyrightText: 2023 Tobias Fella <tobias.fella@kde.org>
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+/**
+ * Initlalize logging to file and enables some additional categories, which will only be logged to the file
+ */
+void initLogging();

src/app/main.cpp

@@ -49,6 +49,7 @@
 #include "blurhashimageprovider.h"
 #include "colorschemer.h"
 #include "controller.h"
+#include "logger.h"
 #include "login.h"
 #include "registration.h"
 #include "roommanager.h"
@@ -137,11 +138,6 @@ int main(int argc, char *argv[])
     font.setHintingPreference(QFont::PreferNoHinting);
     app.setFont(font);
 #endif
-
-#ifdef Q_OS_MACOS
-    QApplication::setStyle(u"breeze"_s);
-#endif
-
     KLocalizedString::setApplicationDomain(QByteArrayLiteral("neochat"));
 
     QGuiApplication::setOrganizationName("KDE"_L1);
@@ -181,6 +177,8 @@ int main(int argc, char *argv[])
     KCrash::initialize();
 #endif
 
+    initLogging();
+
     Connection::setEncryptionDefault(true);
     Connection::setDirectChatEncryptionDefault(true);
 
@@ -197,9 +195,6 @@ int main(int argc, char *argv[])
     parser.addPositionalArgument(u"urls"_s, i18n("Supports matrix: url scheme"));
     parser.addOption(QCommandLineOption("ignore-ssl-errors"_L1, i18n("Ignore all SSL Errors, e.g., unsigned certificates.")));
 
-    QCommandLineOption replaceOption({QStringLiteral("replace")}, i18nc("command line description", "Replace an existing instance"));
-    parser.addOption(replaceOption);
-
     QCommandLineOption testOption("test"_L1, i18n("Only used for autotests"));
     testOption.setFlags(QCommandLineOption::HiddenFromHelp);
     parser.addOption(testOption);
@@ -236,7 +231,7 @@ int main(int argc, char *argv[])
 #endif
 
 #ifdef HAVE_KDBUSADDONS
-    KDBusService service(KDBusService::Unique | (parser.isSet(replaceOption) ? KDBusService::Replace : KDBusService::StartupOption(0)));
+    KDBusService service(KDBusService::Unique);
 #endif
 
     const auto accountManager = std::make_unique<AccountManager>(parser.isSet("test"_L1));
@@ -244,6 +239,13 @@ int main(int argc, char *argv[])
     LoginHelper::instance().setAccountManager(accountManager.get());
     Registration::instance().setAccountManager(accountManager.get());
 
+    Q_IMPORT_QML_PLUGIN(org_kde_neochat_settingsPlugin)
+    Q_IMPORT_QML_PLUGIN(org_kde_neochat_roomsPlugin)
+    Q_IMPORT_QML_PLUGIN(org_kde_neochat_timelinePlugin)
+    Q_IMPORT_QML_PLUGIN(org_kde_neochat_devtoolsPlugin)
+    Q_IMPORT_QML_PLUGIN(org_kde_neochat_loginPlugin)
+    Q_IMPORT_QML_PLUGIN(org_kde_neochat_chatbarPlugin)
+
     qml_register_types_org_kde_neochat();
     qmlRegisterUncreatableMetaObject(Quotient::staticMetaObject, "Quotient", 1, 0, "JoinRule", u"Access to JoinRule enum only"_s);
 

src/app/neochatconfig.kcfg

@@ -78,12 +78,6 @@
       <label>Use a compact room list layout</label>
       <default>false</default>
     </entry>
-    <entry name="MarkReadCondition" type="Enum">
-      <label>The sort order for the rooms in the list.</label>
-      <choices name="::TimelineMarkReadCondition::Condition">
-      </choices>
-      <default>2</default>
-    </entry>
     <entry name="ShowStateEvent" type="bool">
       <label>Show state events in the timeline</label>
       <default>true</default>
@@ -211,10 +205,6 @@
       <label>Enable add phone numbers as 3PIDs</label>
       <default>false</default>
     </entry>
-    <entry name="Calls" type="bool">
-      <label>Enable audio and video calling</label>
-      <default>false</default>
-    </entry>
   </group>
   <group name="Security">
     <entry name="RejectUnknownInvites" type="bool">

src/app/qml/AccountMenu.qml

@@ -36,18 +36,14 @@ KirigamiComponents.ConvergentContextMenu {
         }
     }
 
-    Kirigami.Action {
-        text: i18nc("@action:inmenu", "Switch Account")
-        icon.name: "system-switch-user"
-        shortcut: "Ctrl+U"
-        onTriggered: accountSwitchDialog.createObject(QQC2.Overlay.overlay, {
-            connection: root.connection
-        }).open();
-    }
     QQC2.Action {
         text: i18n("Edit This Account")
         icon.name: "document-edit"
-        onTriggered: NeoChatSettingsView.openWithInitialProperties("accounts", {initialAccount: root.connection});
+        onTriggered: pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat.settings', 'AccountEditorPage'), {
+            connection: root.connection
+        }, {
+            title: i18n("Account editor")
+        })
     }
 
     QQC2.Action {
@@ -106,7 +102,7 @@ KirigamiComponents.ConvergentContextMenu {
     }
 
     QQC2.Action {
-        text: i18n("Logout…")
+        text: i18n("Logout")
         icon.name: "im-kick-user"
         onTriggered: confirmLogoutDialogComponent.createObject(root).open()
     }

src/app/qml/InvitationView.qml

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

src/app/qml/Main.qml

@@ -41,7 +41,6 @@ Kirigami.ApplicationWindow {
             showExisting: true
             onConnectionChosen: root.load()
         }
-        columnView.columnResizeMode: pageStack.wideMode ? Kirigami.ColumnView.DynamicColumns : Kirigami.ColumnView.SingleColumn
         globalToolBar.canContainHandles: true
         globalToolBar {
             style: Kirigami.ApplicationHeaderStyle.ToolBar

src/app/qml/MessageSourceSheet.qml

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

src/app/qml/NeochatMaximizeComponent.qml

@@ -139,7 +139,7 @@ Components.AlbumMaximizeComponent {
         id: saveAsDialog
         Dialogs.FileDialog {
             fileMode: Dialogs.FileDialog.SaveFile
-            currentFolder: NeoChatConfig.lastSaveDirectory.length > 0 ? NeoChatConfig.lastSaveDirectory : Core.StandardPaths.writableLocation(Core.StandardPaths.DownloadLocation)
+            currentFolder: root.saveFolder
             onAccepted: {
                 NeoChatConfig.lastSaveDirectory = currentFolder;
                 NeoChatConfig.save();

src/app/qml/ReasonDialog.qml

@@ -28,14 +28,6 @@ Kirigami.Page {
         placeholderText: root.placeholder
         anchors.fill: parent
         wrapMode: TextEdit.Wrap
-        focus: true
-
-        Keys.onReturnPressed: event => {
-            if (event.modifiers & Qt.ControlModifier) {
-                root.accepted(reason.text);
-                root.closeDialog();
-            }
-        }
 
         background: Rectangle {
             color: Kirigami.Theme.backgroundColor
@@ -58,7 +50,6 @@ Kirigami.Page {
                 }
             }
             QQC2.Button {
-                icon.name: "dialog-cancel-symbolic"
                 text: i18nc("@action", "Cancel")
                 QQC2.DialogButtonBox.buttonRole: QQC2.DialogButtonBox.RejectRole
                 onClicked: root.closeDialog()

src/app/qml/RoomPage.qml

@@ -11,14 +11,15 @@ import org.kde.kirigami as Kirigami
 import org.kde.kitemmodels
 
 import org.kde.neochat
+import org.kde.neochat.chatbar
 
 Kirigami.Page {
     id: root
 
-    /**
-     * @brief The NeoChatRoom the delegate is being displayed in.
-     */
-    readonly property NeoChatRoom currentRoom: RoomManager.currentRoom
+    /// Not readonly because of the separate window view.
+    property NeoChatRoom currentRoom: RoomManager.currentRoom
+
+    required property NeoChatConnection connection
 
     /**
      * @brief The TimelineModel to use.
@@ -58,6 +59,11 @@ Kirigami.Page {
      */
     property MediaMessageFilterModel mediaMessageFilterModel: RoomManager.mediaMessageFilterModel
 
+    property bool loading: !root.currentRoom || (root.currentRoom.timelineSize === 0 && !root.currentRoom.allHistoryLoaded)
+
+    /// Disable cancel shortcut. Used by the separate window since it provides its own cancel implementation.
+    property bool disableCancelShortcut: false
+
     title: root.currentRoom ? root.currentRoom.displayName : ""
     focus: true
     padding: 0
@@ -80,9 +86,9 @@ Kirigami.Page {
     }
 
     Connections {
-        target: root.currentRoom.connection
+        target: root.connection
         function onIsOnlineChanged() {
-            if (!root.currentRoom.connection.isOnline) {
+            if (!root.connection.isOnline) {
                 banner.text = i18n("NeoChat is offline. Please check your network connection.");
                 banner.visible = true;
                 banner.type = Kirigami.MessageType.Error;
@@ -103,15 +109,18 @@ Kirigami.Page {
     Loader {
         id: timelineViewLoader
         anchors.fill: parent
-        active: root.currentRoom && !root.currentRoom.isInvite && !root.currentRoom.isSpace
-        // We need the loader to be active but invisible while the room is loading messages so signals in TimelineView work.
-        visible: !root.loading
+        active: root.currentRoom && !root.currentRoom.isInvite && !root.loading && !root.currentRoom.isSpace
         sourceComponent: TimelineView {
             id: timelineView
+            currentRoom: root.currentRoom
+            page: root
+            timelineModel: root.timelineModel
             messageFilterModel: root.messageFilterModel
-            compactLayout: NeoChatConfig.compactLayout
-            fileDropEnabled: !Controller.isFlatpak
-            markReadCondition: NeoChatConfig.markReadCondition
+            onFocusChatBar: {
+                if (chatBarLoader.item) {
+                    chatBarLoader.item.forceActiveFocus();
+                }
+            }
         }
     }
 
@@ -143,6 +152,14 @@ Kirigami.Page {
         }
     }
 
+    Loader {
+        active: root.loading && !invitationLoader.active && RoomManager.currentRoom && !spaceLoader.active
+        anchors.centerIn: parent
+        sourceComponent: Kirigami.LoadingPlaceholder {
+            anchors.centerIn: parent
+        }
+    }
+
     background: Rectangle {
         Kirigami.Theme.colorSet: Kirigami.Theme.View
         Kirigami.Theme.inherit: false
@@ -157,7 +174,12 @@ Kirigami.Page {
             id: chatBar
             width: parent.width
             currentRoom: root.currentRoom
-            connection: root.currentRoom.connection
+            connection: root.connection
+            onMessageSent: {
+                if (!timelineViewLoader.item.atYEnd) {
+                    timelineViewLoader.item.goToLastMessage();
+                }
+            }
         }
     }
 
@@ -174,8 +196,21 @@ Kirigami.Page {
         }
     }
 
+    Shortcut {
+        sequence: StandardKey.Cancel
+        onActivated: {
+            if (!timelineViewLoader.item.atYEnd || !root.currentRoom.partiallyReadStats.empty()) {
+                timelineViewLoader.item.goToLastMessage();
+                root.currentRoom.markAllMessagesAsRead();
+            } else {
+                applicationWindow().pageStack.get(0).forceActiveFocus();
+            }
+        }
+        enabled: !root.disableCancelShortcut
+    }
+
     Connections {
-        target: root.currentRoom.connection
+        target: root.connection
         function onJoinedRoom(room, invited) {
             if (root.currentRoom.id === invited.id) {
                 RoomManager.resolveResource(room.id);
@@ -261,7 +296,7 @@ Kirigami.Page {
         id: messageDelegateContextMenu
         MessageDelegateContextMenu {
             room: root.currentRoom
-            connection: root.currentRoom.connection
+            connection: root.connection
         }
     }
 
@@ -269,7 +304,7 @@ Kirigami.Page {
         id: fileDelegateContextMenu
         FileDelegateContextMenu {
             room: root.currentRoom
-            connection: root.currentRoom.connection
+            connection: root.connection
         }
     }
 

src/app/qml/UserDetailDialog.qml

@@ -80,6 +80,7 @@ Kirigami.Dialog {
                         text: root.user.id
                         elide: Qt.ElideRight
                         elideWidth: root.availableWidth - avatar.width - qrButton.width - detailRow.spacing * 2 - detailRow.Layout.leftMargin - detailRow.Layout.rightMargin
+                        onElideWidthChanged: console.warn(root.availableWidth, avatar.width, qrButton.width, elideWidth, elidedText)
                     }
                 }
 

src/app/roommanager.cpp

@@ -59,9 +59,9 @@ RoomManager::RoomManager(QObject *parent)
     m_directChatsConfig = m_config->group(u"DirectChatsActive"_s);
 
     connect(this, &RoomManager::currentRoomChanged, this, [this]() {
-        m_userListModel->setRoom(m_currentRoom);
         m_timelineModel->setRoom(m_currentRoom);
         m_sortFilterRoomTreeModel->setCurrentRoom(m_currentRoom);
+        m_userListModel->setRoom(m_currentRoom);
     });
 
     connect(&Controller::instance(), &Controller::activeConnectionChanged, this, [this](NeoChatConnection *connection) {
@@ -96,7 +96,6 @@ RoomManager::RoomManager(QObject *parent)
             m_messageFilterModel->invalidate();
         }
     });
-    connect(m_timelineModel->timelineMessageModel(), &MessageModel::modelResetComplete, this, &RoomManager::activateUserModel);
     MessageFilterModel::setShowAllEvents(NeoChatConfig::self()->showAllEvents());
     connect(NeoChatConfig::self(), &NeoChatConfig::ShowAllEventsChanged, this, [this] {
         MessageFilterModel::setShowAllEvents(NeoChatConfig::self()->showAllEvents());
@@ -236,18 +235,11 @@ void RoomManager::resolveResource(Uri uri, const QString &action)
     }
 }
 
-void RoomManager::maximizeMedia(const QString &eventId)
+void RoomManager::maximizeMedia(int index)
 {
-    if (eventId.isEmpty()) {
-        qWarning() << "Tried to open media for empty event id";
+    if (index < -1 || index > m_mediaMessageFilterModel->rowCount()) {
         return;
     }
-
-    const auto index = m_mediaMessageFilterModel->getRowForEventId(eventId);
-    if (index == -1) {
-        return;
-    }
-
     Q_EMIT showMaximizedMedia(index);
 }
 
@@ -271,10 +263,6 @@ void RoomManager::viewEventSource(const QString &eventId)
 
 void RoomManager::viewEventMenu(const QString &eventId, NeoChatRoom *room, NeochatRoomMember *sender, const QString &selectedText, const QString &hoveredLink)
 {
-    if (eventId.isEmpty()) {
-        qWarning() << "Tried to open event menu with empty event id";
-        return;
-    }
     const auto &event = **room->findInTimeline(eventId);
 
     if (EventHandler::mediaInfo(room, &event).contains("mimeType"_L1)) {
@@ -404,9 +392,7 @@ void RoomManager::joinRoom(Quotient::Connection *account, const QString &roomAli
 
     // If no one gives us a homeserver suggestion, try the server specified in the alias/id.
     // Otherwise joining a remote room not on our homeserver will fail.
-    // This is a hack and we're not supposed to do it. With room ids not containing the server going forward, it won't work anymore for new room versions.
-    // FIXME: Let's keep it around anyway for now, remove it at some point, though
-    if (vias.empty() && roomAliasOrId.contains(':'_L1)) {
+    if (vias.empty()) {
         vias.append(roomAliasOrId.mid(roomAliasOrId.lastIndexOf(':'_L1) + 1));
     }
 

src/app/roommanager.h

@@ -212,8 +212,12 @@ public:
 
     /**
      * @brief Show a media item maximized.
+     *
+     * @param index the index to open the maximize delegate model at. This is the
+     *        index in the MediaMessageFilterModel owned by this RoomManager. A value
+     *        of -1 opens a the default item.
      */
-    Q_INVOKABLE void maximizeMedia(const QString &eventId);
+    Q_INVOKABLE void maximizeMedia(int index);
 
     Q_INVOKABLE void maximizeCode(NeochatRoomMember *author, const QDateTime &time, const QString &codeText, const QString &language);
 

src/chatbar/CMakeLists.txt

@@ -15,5 +15,4 @@ ecm_add_qml_module(Chatbar GENERATE_PLUGIN_SOURCE
         EmojiPicker.qml
         EmojiDialog.qml
         EmojiTonesPicker.qml
-        ImageEditorPage.qml
 )

src/chatbar/ChatBar.qml

@@ -160,6 +160,11 @@ QQC2.Control {
         }
     ]
 
+    /**
+     * @brief A message has been sent from the chat bar.
+     */
+    signal messageSent
+
     spacing: 0
 
     Kirigami.Theme.colorSet: Kirigami.Theme.View
@@ -431,6 +436,7 @@ QQC2.Control {
             repeatTimer.stop();
             root.currentRoom.markAllMessagesAsRead();
             textField.clear();
+            messageSent();
         }
 
         function formatText(format, selectionStart, selectionEnd) {

src/chatbar/EmojiPicker.qml

@@ -207,7 +207,7 @@ ColumnLayout {
             padding: Kirigami.Units.largeSpacing
 
             contentItem: Image {
-                source: model.url
+                source: model.avatarUrl
                 fillMode: Image.PreserveAspectFit
                 sourceSize.width: width
                 sourceSize.height: height

src/devtools/FeatureFlagPage.qml

@@ -36,13 +36,4 @@ FormCard.FormCard {
             NeoChatConfig.save();
         }
     }
-    FormCard.FormCheckDelegate {
-        text: i18nc("@option:check Enable the matrix feature for audio and video calling", "Calls")
-        checked: NeoChatConfig.calls
-
-        onToggled: {
-            NeoChatConfig.calls = checked;
-            NeoChatConfig.save();
-        }
-    }
 }

src/libneochat/CMakeLists.txt

@@ -28,7 +28,6 @@ target_sources(LibNeoChat PRIVATE
     enums/pushrule.h
     enums/roomsortparameter.cpp
     enums/roomsortorder.h
-    enums/timelinemarkreadcondition.h
     events/imagepackevent.cpp
     events/pollevent.cpp
     jobs/neochatgetcommonroomsjob.cpp
@@ -49,6 +48,11 @@ target_sources(LibNeoChat PRIVATE
 ecm_add_qml_module(LibNeoChat GENERATE_PLUGIN_SOURCE
     URI org.kde.neochat.libneochat
     OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/src/org/kde/neochat/libneochat
+    DEPENDENCIES
+        QtCore
+        QtQuick
+        org.kde.prison
+        org.kde.prison.scanner
     QML_FILES
         qml/GroupChatDrawerHeader.qml
         qml/LocationMapItem.qml

src/libneochat/enums/messagecomponenttype.h

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

src/libneochat/enums/timelinemarkreadcondition.h

@@ -1,32 +0,0 @@
-// SPDX-FileCopyrightText: 2025 James Graham <james.h.graham@protonmail.com>
-// SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
-
-#pragma once
-
-#include <QObject>
-#include <QQmlEngine>
-
-/**
- * @class TimelineMarkReadCondition
- *
- * This class is designed to define the TimelineMarkReadCondition enumeration.
- */
-class TimelineMarkReadCondition : public QObject
-{
-    Q_OBJECT
-    QML_ELEMENT
-    QML_UNCREATABLE("")
-
-public:
-    /**
-     * @brief The condition for marking messages as read.
-     */
-    enum Condition {
-        Never = 0, /**< Messages should never be marked automatically. */
-        Entry, /**< Messages should be marked automatically on entry to the room. */
-        EntryVisible, /**< Messages should be marked automatically on entry to the room if all messages are visible. */
-        Exit, /**< Messages should be marked automatically on exiting the room. */
-        ExitVisible, /**< Messages should be marked automatically on exiting the room if all messages are visible. */
-    };
-    Q_ENUM(Condition);
-};

src/libneochat/eventhandler.cpp

@@ -435,25 +435,12 @@ QString EventHandler::getBody(const NeoChatRoom *room, const Quotient::RoomEvent
             return i18nc("[User] configured <name> widget", "configured %1 widget", e.contentJson()["name"_L1].toString());
         },
         [prettyPrint](const StateEvent &e) {
-            if (e.matrixType() == "org.matrix.msc3401.call.member"_L1) {
-                if (e.contentJson().isEmpty()) {
-                    return i18nc("[User] left a [voice/video] call", "left a call");
-                } else {
-                    return i18nc("[User] joined a [voice/video] call", "joined a call");
-                }
-            }
             return e.stateKey().isEmpty() ? i18n("updated %1 state", e.matrixType())
                                           : i18n("updated %1 state for %2", e.matrixType(), prettyPrint ? e.stateKey().toHtmlEscaped() : e.stateKey());
         },
         [](const PollStartEvent &e) {
             return e.question();
         },
-        [](const EncryptedEvent &) {
-            return i18nc("@info In room list", "Encrypted event");
-        },
-        [](const ReactionEvent &e) {
-            return i18nc("[user] reacted with <emoji>", "reacted with %1", e.key());
-        },
         i18n("Unknown event"));
 }
 
@@ -647,14 +634,7 @@ QString EventHandler::genericBody(const NeoChatRoom *room, const Quotient::RoomE
             }
             return i18n("%1 configured a widget", senderString);
         },
-        [senderString](const StateEvent &e) {
-            if (e.matrixType() == "org.matrix.msc3401.call.member"_L1) {
-                if (e.contentJson().isEmpty()) {
-                    return i18nc("[User] left a [voice/video] call", "%1 left a call", senderString);
-                } else {
-                    return i18nc("[User] joined a [voice/video] call", "%1 joined a call", senderString);
-                }
-            }
+        [senderString](const StateEvent &) {
             return i18n("%1 updated the state", senderString);
         },
         [senderString](const PollStartEvent &) {

src/libneochat/messagecomponent.h

@@ -10,7 +10,7 @@ struct MessageComponent {
     QString content;
     QVariantMap attributes;
 
-    bool operator==(const MessageComponent &right) const
+    int operator==(const MessageComponent &right) const
     {
         return type == right.type && content == right.content && attributes == right.attributes;
     }

src/libneochat/models/actionsmodel.cpp

@@ -31,7 +31,13 @@ auto leaveRoomLambda = [](const QString &text, NeoChatRoom *room, ChatBarCache *
         Q_EMIT room->showMessage(MessageType::Information, i18n("Leaving this room."));
         room->forget();
     } else {
-        // FIXME: re-add sanity check for roomId/alias
+        QRegularExpression roomRegex(uR"(^[#!][^:]+:\w(?:\w|\.|-)*\.\w+(?::\d{1,5})?)"_s);
+        auto regexMatch = roomRegex.match(text);
+        if (!regexMatch.hasMatch()) {
+            Q_EMIT room->showMessage(MessageType::Error,
+                                     i18nc("'<text>' does not look like a room id or alias.", "'%1' does not look like a room id or alias.", text));
+            return QString();
+        }
         auto leaving = dynamic_cast<NeoChatRoom *>(room->connection()->room(text));
         if (!leaving) {
             leaving = dynamic_cast<NeoChatRoom *>(room->connection()->roomByAlias(text));
@@ -211,7 +217,13 @@ QList<ActionsModel::Action> actions{
     Action{
         u"join"_s,
         [](const QString &text, NeoChatRoom *room, ChatBarCache *) {
-            // FIXME: re-add sanity check for roomId/alias
+            QRegularExpression roomRegex(uR"(^[#!][^:]+:\w(?:\w|\.|-)*\.\w+(?::\d{1,5})?)"_s);
+            auto regexMatch = roomRegex.match(text);
+            if (!regexMatch.hasMatch()) {
+                Q_EMIT room->showMessage(MessageType::Error,
+                                         i18nc("'<text>' does not look like a room id or alias.", "'%1' does not look like a room id or alias.", text));
+                return QString();
+            }
             auto targetRoom = text.startsWith(QLatin1Char('!')) ? room->connection()->room(text) : room->connection()->roomByAlias(text);
             if (targetRoom) {
                 ActionsModel::instance().resolveResource(targetRoom->id());
@@ -230,18 +242,25 @@ QList<ActionsModel::Action> actions{
         [](const QString &text, NeoChatRoom *room, ChatBarCache *) {
             auto parts = text.split(u" "_s);
             QString roomName = parts[0];
-            // FIXME: re-add sanity check for roomId/alias
-            if (const auto targetRoom = text.startsWith(QLatin1Char('!')) ? room->connection()->room(text) : room->connection()->roomByAlias(text)) {
+            QRegularExpression roomRegex(uR"(^[#!][^:]+:\w(?:\w|\.|-)*\.\w+(?::\d{1,5})?)"_s);
+            auto regexMatch = roomRegex.match(roomName);
+            if (!regexMatch.hasMatch()) {
+                Q_EMIT room->showMessage(MessageType::Error,
+                                         i18nc("'<text>' does not look like a room id or alias.", "'%1' does not look like a room id or alias.", text));
+                return QString();
+            }
+            auto targetRoom = text.startsWith(QLatin1Char('!')) ? room->connection()->room(text) : room->connection()->roomByAlias(text);
+            if (targetRoom) {
                 ActionsModel::instance().resolveResource(targetRoom->id());
                 return QString();
             }
             Q_EMIT room->showMessage(MessageType::Information, i18nc("Knocking room <roomname>.", "Knocking room %1.", text));
             auto connection = dynamic_cast<NeoChatConnection *>(room->connection());
-            const auto knownServer = roomName.contains(":"_L1) ? QStringList{roomName.mid(roomName.indexOf(":"_L1) + 1)} : QStringList();
+            const auto knownServer = roomName.mid(roomName.indexOf(":"_L1) + 1);
             if (parts.length() >= 2) {
-                ActionsModel::instance().knockRoom(connection, roomName, parts[1], knownServer);
+                ActionsModel::instance().knockRoom(connection, roomName, parts[1], QStringList{knownServer});
             } else {
-                ActionsModel::instance().knockRoom(connection, roomName, QString(), knownServer);
+                ActionsModel::instance().knockRoom(connection, roomName, QString(), QStringList{knownServer});
             }
             return QString();
         },
@@ -252,7 +271,13 @@ QList<ActionsModel::Action> actions{
     Action{
         u"j"_s,
         [](const QString &text, NeoChatRoom *room, ChatBarCache *) {
-            // FIXME: re-add sanity check for roomId/alias
+            QRegularExpression roomRegex(uR"(^[#!][^:]+:\w(?:\w|\.|-)*\.\w+(?::\d{1,5})?)"_s);
+            auto regexMatch = roomRegex.match(text);
+            if (!regexMatch.hasMatch()) {
+                Q_EMIT room->showMessage(MessageType::Error,
+                                         i18nc("'<text>' does not look like a room id or alias.", "'%1' does not look like a room id or alias.", text));
+                return QString();
+            }
             if (room->connection()->room(text) || room->connection()->roomByAlias(text)) {
                 Q_EMIT room->showMessage(MessageType::Information, i18nc("You are already in room <roomname>.", "You are already in room %1.", text));
                 return QString();

src/libneochat/models/userlistmodel.cpp

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

src/libneochat/neochatroom.cpp

@@ -359,14 +359,9 @@ const RoomEvent *NeoChatRoom::lastEvent(std::function<bool(const RoomEvent *)> f
         if (auto lastEvent = eventCast<const RoomMessageEvent>(event)) {
             return lastEvent;
         }
-
         if (auto lastEvent = eventCast<const PollStartEvent>(event)) {
             return lastEvent;
         }
-
-        if (auto lastEvent = eventCast<const EncryptedEvent>(event)) {
-            return lastEvent;
-        }
     }
 
     if (m_cachedEvent != nullptr) {
@@ -446,19 +441,20 @@ void NeoChatRoom::onRedaction(const RoomEvent &prevEvent, const RoomEvent & /*af
     }
 }
 
-QDateTime NeoChatRoom::lastActiveTime() const
+QDateTime NeoChatRoom::lastActiveTime()
 {
-    // Find the last relevant event:
-    if (const auto event = lastEvent(m_hiddenFilter)) {
+    if (timelineSize() == 0) {
+        if (m_cachedEvent != nullptr) {
+            return m_cachedEvent->originTimestamp();
+        }
+        return QDateTime();
+    }
+
+    if (auto event = lastEvent()) {
         return event->originTimestamp();
     }
 
-    // If nothing is loaded yet, and there is no cached event:
-    if (timelineSize() == 0) {
-        return {};
-    }
-
-    // No message found, take last event:
+    // no message found, take last event
     return messageEvents().rbegin()->get()->originTimestamp();
 }
 
@@ -536,9 +532,6 @@ bool NeoChatRoom::containsUser(const QString &userID) const
 
 bool NeoChatRoom::canSendEvent(const QString &eventType) const
 {
-    if (roomCreatorHasUltimatePowerLevel() && isCreator(localMember().id())) {
-        return true;
-    }
     auto plEvent = currentState().get<RoomPowerLevelsEvent>();
     if (!plEvent) {
         return false;
@@ -551,9 +544,6 @@ bool NeoChatRoom::canSendEvent(const QString &eventType) const
 
 bool NeoChatRoom::canSendState(const QString &eventType) const
 {
-    if (roomCreatorHasUltimatePowerLevel() && isCreator(localMember().id())) {
-        return true;
-    }
     auto plEvent = currentState().get<RoomPowerLevelsEvent>();
     if (!plEvent) {
         return false;
@@ -1224,38 +1214,34 @@ QByteArray NeoChatRoom::getEventJsonSource(const QString &eventId)
 void NeoChatRoom::openEventMediaExternally(const QString &eventId)
 {
     const auto evtIt = findInTimeline(eventId);
-    if (evtIt == messageEvents().rend()) {
-        return;
-    }
-
-    // TODO: Also allow stickers here, once that's fixed in libQuotient
-    if (!is<RoomMessageEvent>(**evtIt) || !evtIt->viewAs<RoomMessageEvent>()->has<EventContent::FileContentBase>()) {
-        return;
-    }
-
-    const auto transferInfo = cachedFileTransferInfo(evtIt->viewAs<RoomEvent>());
-    if (transferInfo.completed()) {
-        UrlHelper helper;
-        helper.openUrl(transferInfo.localPath);
-        return;
-    }
-    downloadFile(eventId,
-                 QUrl(QStandardPaths::writableLocation(QStandardPaths::CacheLocation) + u'/'
-                      + evtIt->event()->id().replace(u':', u'_').replace(u'/', u'_').replace(u'+', u'_') + fileNameToDownload(eventId)));
-    connect(
-        this,
-        &Room::fileTransferCompleted,
-        this,
-        [this, eventId](QString id, QUrl localFile, FileSourceInfo fileMetadata) {
-            Q_UNUSED(localFile);
-            Q_UNUSED(fileMetadata);
-            if (id == eventId) {
-                auto transferInfo = fileTransferInfo(eventId);
+    if (evtIt != messageEvents().rend() && is<RoomMessageEvent>(**evtIt)) {
+        const auto event = evtIt->viewAs<RoomMessageEvent>();
+        if (event->has<EventContent::FileContent>()) {
+            const auto transferInfo = cachedFileTransferInfo(event);
+            if (transferInfo.completed()) {
                 UrlHelper helper;
                 helper.openUrl(transferInfo.localPath);
+            } else {
+                downloadFile(eventId,
+                             QUrl(QStandardPaths::writableLocation(QStandardPaths::CacheLocation) + u'/'
+                                  + event->id().replace(u':', u'_').replace(u'/', u'_').replace(u'+', u'_') + fileNameToDownload(eventId)));
+                connect(
+                    this,
+                    &Room::fileTransferCompleted,
+                    this,
+                    [this, eventId](QString id, QUrl localFile, FileSourceInfo fileMetadata) {
+                        Q_UNUSED(localFile);
+                        Q_UNUSED(fileMetadata);
+                        if (id == eventId) {
+                            auto transferInfo = fileTransferInfo(eventId);
+                            UrlHelper helper;
+                            helper.openUrl(transferInfo.localPath);
+                        }
+                    },
+                    static_cast<Qt::ConnectionType>(Qt::SingleShotConnection));
             }
-        },
-        static_cast<Qt::ConnectionType>(Qt::SingleShotConnection));
+        }
+    }
 }
 
 void NeoChatRoom::copyEventMedia(const QString &eventId)
@@ -1680,14 +1666,8 @@ void NeoChatRoom::setRoomState(const QString &type, const QString &stateKey, con
 
 NeochatRoomMember *NeoChatRoom::qmlSafeMember(const QString &memberId)
 {
-    if (memberId.isEmpty()) {
-        return nullptr;
-    }
-
     if (!m_memberObjects.contains(memberId)) {
-        auto member = m_memberObjects.emplace(memberId, std::make_unique<NeochatRoomMember>(this, memberId)).first->second.get();
-        QQmlEngine::setObjectOwnership(member, QQmlEngine::CppOwnership);
-        return member;
+        return m_memberObjects.emplace(memberId, std::make_unique<NeochatRoomMember>(this, memberId)).first->second.get();
     }
 
     return m_memberObjects[memberId].get();
@@ -1747,20 +1727,4 @@ void NeoChatRoom::setHiddenFilter(std::function<bool(const Quotient::RoomEvent *
     NeoChatRoom::m_hiddenFilter = hiddenFilter;
 }
 
-bool NeoChatRoom::roomCreatorHasUltimatePowerLevel() const
-{
-    bool ok = false;
-    auto version = this->version().toInt(&ok);
-    // This is terrible. For non-numeric room versions, I don't think there's a way of knowing whether they're pre- or post hydra.
-    // We just assume they are. Shouldn't matter for normal users anyway.
-    return !ok || version > 11;
-}
-
-bool NeoChatRoom::isCreator(const QString &userId) const
-{
-    auto createEvent = currentState().get<RoomCreateEvent>();
-    return roomCreatorHasUltimatePowerLevel() && createEvent
-        && (createEvent->senderId() == userId || createEvent->contentPart<QStringList>(u"additional_creators"_s).contains(userId));
-}
-
 #include "moc_neochatroom.cpp"

src/libneochat/neochatroom.h

@@ -208,7 +208,7 @@ public:
     bool visible() const;
     void setVisible(bool visible);
 
-    [[nodiscard]] QDateTime lastActiveTime() const;
+    [[nodiscard]] QDateTime lastActiveTime();
 
     /**
      * @brief Get the last interesting event.
@@ -557,7 +557,7 @@ public:
      *          responsibility of the caller to ensure that they only ask for objects
      *          for real senders.
      */
-    Q_INVOKABLE NeochatRoomMember *qmlSafeMember(const QString &memberId);
+    NeochatRoomMember *qmlSafeMember(const QString &memberId);
 
     /**
      * @brief Pin a message in the room.
@@ -589,18 +589,6 @@ public:
 
     static void setHiddenFilter(std::function<bool(const Quotient::RoomEvent *)> hiddenFilter);
 
-    /**
-     * @brief Whether this room has a room version where the creator is treated as having an ultimate power level
-     *
-     * For unusual room versions, this information might be wrong.
-     */
-    bool roomCreatorHasUltimatePowerLevel() const;
-
-    /**
-     * @brief Whether this user is considered a creator of this room. Only applies to post-v12 rooms.
-     */
-    bool isCreator(const QString &userId) const;
-
 private:
     bool m_visible = false;
 

src/libneochat/texthandler.cpp

@@ -570,9 +570,8 @@ QVariantMap TextHandler::getAttributes(const QString &tag, const QString &tagStr
 QList<MessageComponent>
 TextHandler::textComponents(QString string, Qt::TextFormat inputFormat, const NeoChatRoom *room, const Quotient::RoomEvent *event, bool isEdited)
 {
-    if (string.trimmed().isEmpty() && event->is<Quotient::RoomMessageEvent>()
-        && !eventCast<const Quotient::RoomMessageEvent>(event)->has<Quotient::EventContent::FileContentBase>()) {
-        return {MessageComponent{MessageComponentType::Text, i18n("<i>This event does not have any content.</i>"), {}}};
+    if (string.isEmpty()) {
+        return {};
     }
 
     // Strip mx-reply if present.
@@ -591,7 +590,7 @@ TextHandler::textComponents(QString string, Qt::TextFormat inputFormat, const Ne
         string = string.trimmed();
 
         if (event != nullptr && room != nullptr) {
-            if (auto e = eventCast<const Quotient::RoomMessageEvent>(event); e && e->msgtype() == Quotient::MessageEventType::Emote && components.size() == 1) {
+            if (auto e = eventCast<const Quotient::RoomMessageEvent>(event); e->msgtype() == Quotient::MessageEventType::Emote && components.size() == 1) {
                 if (components[0].type == MessageComponentType::Text) {
                     components[0].content = emoteString(room, event) + components[0].content;
                 } else {

src/messagecontent/CMakeLists.txt

@@ -1,107 +0,0 @@
-# SPDX-FileCopyrightText: 2024 James Graham <james.h.graham@protonmail.com>
-# SPDX-License-Identifier: BSD-2-Clause
-
-qt_add_library(MessageContent STATIC)
-ecm_add_qml_module(MessageContent GENERATE_PLUGIN_SOURCE
-    URI org.kde.neochat.messagecontent
-    OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/src/org/kde/neochat/messagecontent
-    QML_FILES
-        BaseMessageComponentChooser.qml
-        MessageComponentChooser.qml
-        ReplyMessageComponentChooser.qml
-        AuthorComponent.qml
-        AudioComponent.qml
-        ChatBarComponent.qml
-        CodeComponent.qml
-        EncryptedComponent.qml
-        FetchButtonComponent.qml
-        FileComponent.qml
-        ImageComponent.qml
-        ItineraryComponent.qml
-        ItineraryReservationComponent.qml
-        JourneySectionStopDelegateLineSegment.qml
-        TransportIcon.qml
-        FoodReservationComponent.qml
-        TrainReservationComponent.qml
-        FlightReservationComponent.qml
-        HotelReservationComponent.qml
-        LinkPreviewComponent.qml
-        LinkPreviewLoadComponent.qml
-        LiveLocationComponent.qml
-        LoadComponent.qml
-        LocationComponent.qml
-        MimeComponent.qml
-        PdfPreviewComponent.qml
-        PollComponent.qml
-        QuoteComponent.qml
-        ReactionComponent.qml
-        ReplyAuthorComponent.qml
-        ReplyButtonComponent.qml
-        ReplyComponent.qml
-        StateComponent.qml
-        TextComponent.qml
-        ThreadBodyComponent.qml
-        VideoComponent.qml
-    SOURCES
-        contentprovider.cpp
-        mediasizehelper.cpp
-        pollhandler.cpp
-        models/itinerarymodel.cpp
-        models/linemodel.cpp
-        models/messagecontentmodel.cpp
-        models/pollanswermodel.cpp
-        models/reactionmodel.cpp
-        models/threadmodel.cpp
-    RESOURCES
-        images/bike.svg
-        images/bus.svg
-        images/cablecar.svg
-        images/car.svg
-        images/coach.svg
-        images/couchettecar.svg
-        images/elevator.svg
-        images/escalator.svg
-        images/ferry.svg
-        images/flight.svg
-        images/foodestablishment.svg
-        images/funicular.svg
-        images/longdistancetrain.svg
-        images/rapidtransit.svg
-        images/seat.svg
-        images/shuttle.svg
-        images/sleepingcar.svg
-        images/stairs.svg
-        images/subway.svg
-        images/taxi.svg
-        images/train.svg
-        images/tramway.svg
-        images/transfer.svg
-        images/wait.svg
-        images/walk.svg
-    DEPENDENCIES
-        QtQuick
-)
-
-configure_file(config-neochat.h.in ${CMAKE_CURRENT_BINARY_DIR}/config-neochat.h)
-
-ecm_qt_declare_logging_category(MessageContent
-    HEADER "messagemodel_logging.h"
-    IDENTIFIER "Message"
-    CATEGORY_NAME "org.kde.neochat.messagemodel"
-    DESCRIPTION "Neochat: messagemodel"
-    DEFAULT_SEVERITY Info
-    EXPORT NEOCHAT
-)
-
-target_include_directories(MessageContent PRIVATE ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/models)
-target_link_libraries(MessageContent PRIVATE
-    Qt::Core
-    Qt::Quick
-    Qt::QuickControls2
-    KF6::Kirigami
-    LibNeoChat
-)
-
-if(NOT ANDROID)
-    target_link_libraries(MessageContent PUBLIC KF6::SyntaxHighlighting)
-endif()

src/roominfo/CMakeLists.txt

@@ -14,10 +14,4 @@ ecm_add_qml_module(RoomInfo GENERATE_PLUGIN_SOURCE
         LocationsPage.qml
         RoomPinnedMessagesPage.qml
         RoomSearchPage.qml
-    SOURCES
-        locationhelper.cpp
-)
-
-target_link_libraries(RoomInfo PRIVATE
-    Qt::Core
 )

src/roominfo/RoomInformation.qml

@@ -153,7 +153,7 @@ QQC2.ScrollView {
             Delegates.RoundedItemDelegate {
                 id: leaveButton
                 icon.name: "arrow-left-symbolic"
-                text: root.room.isSpace ? i18nc("@action:button", "Leave this space…") : i18nc("@action:button", "Leave this room…")
+                text: root.room.isSpace ? i18nc("@action:button", "Leave this space") : i18nc("@action:button", "Leave this room")
                 activeFocusOnTab: true
 
                 Layout.fillWidth: true

src/rooms/RoomContextMenu.qml

@@ -58,7 +58,7 @@ KirigamiComponents.ConvergentContextMenu {
         icon.name: "notifications"
 
         Kirigami.Action {
-            text: i18nc("@action:inmenu Notification 'Default Settings'", "Default Settings")
+            text: i18n("Follow Global Setting")
             icon.name: "globe"
             checkable: true
             autoExclusive: true
@@ -152,7 +152,7 @@ KirigamiComponents.ConvergentContextMenu {
     }
 
     QQC2.Action {
-        text: i18n("Leave Room…")
+        text: i18n("Leave Room")
         icon.name: "go-previous"
         onTriggered: {
             Qt.createComponent('org.kde.neochat', 'ConfirmLeaveDialog').createObject(root.QQC2.ApplicationWindow.window, {

src/rooms/RoomListPage.qml

@@ -17,22 +17,13 @@ import org.kde.neochat
 Kirigami.Page {
     id: root
 
-    Kirigami.ColumnView.interactiveResizeEnabled: true
-    Kirigami.ColumnView.minimumWidth: _private.collapsedSize + spaceDrawer.width + 1
-    Kirigami.ColumnView.maximumWidth: _private.defaultWidth + spaceDrawer.width + 1
-    Kirigami.ColumnView.onInteractiveResizingChanged: {
-        if (!Kirigami.ColumnView.interactiveResizing && collapsed) {
-            Kirigami.ColumnView.preferredWidth = root.Kirigami.ColumnView.minimumWidth;
-        }
-    }
-    Kirigami.ColumnView.preferredWidth: _private.currentWidth + spaceDrawer.width + 1
-    Kirigami.ColumnView.onPreferredWidthChanged: {
-        if (width > _private.collapseWidth) {
-            NeoChatConfig.collapsed = false;
-        } else if (Kirigami.ColumnView.interactiveResizing) {
-            NeoChatConfig.collapsed = true;
-        }
-    }
+    /**
+     * @brief The current width of the room list.
+     *
+     * @note Other objects can access the value but the private function makes sure
+     *       that only the internal members can modify it.
+     */
+    readonly property int currentWidth: _private.currentWidth + spaceDrawer.width + 1
 
     required property NeoChatConnection connection
 
@@ -40,6 +31,10 @@ Kirigami.Page {
 
     signal search
 
+    onCurrentWidthChanged: pageStack.defaultColumnWidth = root.currentWidth
+    Component.onCompleted: pageStack.defaultColumnWidth = root.currentWidth
+
+
     onCollapsedChanged: {
         if (collapsed) {
             RoomManager.sortFilterRoomTreeModel.filterText = "";
@@ -96,10 +91,7 @@ Kirigami.Page {
         function onCurrentSpaceChanged() {
             treeView.expandRecursively();
         }
-    }
 
-    Connections {
-        target: RoomManager.sortFilterRoomTreeModel
         function onCurrentRoomChanged() {
             treeView.positionViewAtIndex(RoomManager.sortFilterRoomTreeModel.currentRoomIndex(), TableView.AlignVCenter)
         }
@@ -252,6 +244,49 @@ Kirigami.Page {
         sourceComponent: Kirigami.Settings.isMobile ? exploreComponentMobile : userInfoDesktop
     }
 
+    MouseArea {
+        anchors.top: parent.top
+        anchors.bottom: parent.bottom
+        parent: applicationWindow().overlay.parent
+
+        x: root.currentWidth - width / 2
+        width: Kirigami.Units.smallSpacing * 2
+        z: root.z + 1
+        enabled: RoomManager.hasOpenRoom && applicationWindow().width >= Kirigami.Units.gridUnit * 35
+        visible: enabled
+        cursorShape: Qt.SplitHCursor
+
+        property int _lastX
+
+        onPressed: mouse => {
+            _lastX = mouse.x;
+        }
+        onPositionChanged: mouse => {
+            if (_lastX == -1) {
+                return;
+            }
+            if (mouse.x > _lastX) {
+                // we moved to the right
+                if (_private.currentWidth < _private.collapseWidth && _private.currentWidth + (mouse.x - _lastX) >= _private.collapseWidth) {
+                    // Here we get back directly to a more wide mode.
+                    _private.currentWidth = _private.defaultWidth;
+                    NeoChatConfig.collapsed = false;
+                } else if (_private.currentWidth >= _private.collapseWidth) {
+                    // Increase page width
+                    _private.currentWidth = Math.min(_private.defaultWidth, _private.currentWidth + (mouse.x - _lastX));
+                }
+            } else if (mouse.x < _lastX) {
+                const tmpWidth = _private.currentWidth - (_lastX - mouse.x);
+                if (tmpWidth < _private.collapseWidth) {
+                    _private.currentWidth = Qt.binding(() => _private.collapsedSize);
+                    NeoChatConfig.collapsed = true;
+                } else {
+                    _private.currentWidth = tmpWidth;
+                }
+            }
+        }
+    }
+
     Component {
         id: userInfo
         UserInfo {

src/rooms/RoomTreeSection.qml

@@ -38,14 +38,26 @@ QQC2.ItemDelegate {
     Keys.onSpacePressed: root.treeView.toggleExpanded(row)
 
     contentItem: RowLayout {
-        spacing: 0
-        Kirigami.ListSectionHeader {
+        spacing: Kirigami.Units.largeSpacing
+
+        Kirigami.Heading {
+            Layout.alignment: Qt.AlignVCenter
+            visible: !root.collapsed
+
+            opacity: 0.7
+            level: 5
+            type: Kirigami.Heading.Primary
+            text: root.collapsed ? "" : model.displayName
+            elide: Text.ElideRight
+
+            // we override the Primary type's font weight (DemiBold) for Bold for contrast with small text
+            font.weight: Font.Bold
+        }
+
+        Kirigami.Separator {
             Layout.fillWidth: true
             visible: !root.collapsed
-            horizontalPadding: 0
-            topPadding: 0
-            bottomPadding: 0
-            text: root.collapsed ? "" : root.displayName
+            Layout.alignment: Qt.AlignVCenter
         }
         QQC2.ToolButton {
             id: collapseButton

src/rooms/SpaceListContextMenu.qml

@@ -70,10 +70,8 @@ KirigamiComponents.ConvergentContextMenu {
     }
 
     QQC2.Action {
-        text: i18nc("'Space' is a matrix space", "Leave Space…")
+        text: i18nc("'Space' is a matrix space", "Leave Space")
         icon.name: "go-previous"
-        onTriggered: Qt.createComponent('org.kde.neochat', 'ConfirmLeaveDialog').createObject(root.QQC2.ApplicationWindow.window, {
-            room: root.room
-        }).open();
+        onTriggered: root.room.forget()
     }
 }

src/rooms/UserInfo.qml

@@ -95,19 +95,31 @@ RowLayout {
             window: QQC2.ApplicationWindow.window as Kirigami.ApplicationWindow
         }
     }
-    QQC2.ToolButton {
-        display: QQC2.Button.IconOnly
-        action: Kirigami.Action {
-            text: i18n("Open Settings")
-            icon.name: "settings-configure-symbolic"
-            onTriggered: {
-                NeoChatSettingsView.open();
-            }
-        }
 
-        QQC2.ToolTip.text: text
-        QQC2.ToolTip.visible: hovered
-        QQC2.ToolTip.delay: Kirigami.Units.toolTipDelay
+    Kirigami.ActionToolBar {
+        alignment: Qt.AlignRight
+        display: QQC2.Button.IconOnly
+
+        Layout.fillWidth: true
+        Layout.preferredWidth: maximumContentWidth
+
+        actions: [
+            Kirigami.Action {
+                text: i18n("Switch User")
+                icon.name: "system-switch-user"
+                shortcut: "Ctrl+U"
+                onTriggered: accountSwitchDialog.createObject(QQC2.Overlay.overlay, {
+                    connection: root.connection
+                }).open();
+            },
+            Kirigami.Action {
+                text: i18n("Open Settings")
+                icon.name: "settings-configure-symbolic"
+                onTriggered: {
+                    NeoChatSettingsView.open();
+                }
+            }
+        ]
     }
 
     Component {

src/rooms/models/sortfilterroomtreemodel.cpp

@@ -134,7 +134,6 @@ void SortFilterRoomTreeModel::setActiveSpaceId(const QString &spaceId)
 void SortFilterRoomTreeModel::setCurrentRoom(NeoChatRoom *room)
 {
     m_currentRoom = room;
-    Q_EMIT currentRoomChanged();
 }
 
 SortFilterRoomTreeModel::Mode SortFilterRoomTreeModel::mode() const

src/rooms/models/sortfilterroomtreemodel.h

@@ -104,7 +104,6 @@ Q_SIGNALS:
     void filterTextChanged();
     void activeSpaceIdChanged();
     void modeChanged();
-    void currentRoomChanged();
 
 private:
     Mode m_mode = All;

src/settings/AccountEditorPage.qml

@@ -138,7 +138,7 @@ FormCard.FormCardPage {
             icon.name: "document-save-symbolic"
             onClicked: {
                 if (!root.connection.setAvatar(avatar.source)) {
-                    (root.Window.window as Kirigami.ApplicationWindow).showPassiveNotification("The Avatar could not be set");
+                    showPassiveNotification("The Avatar could not be set");
                 }
                 if (root.connection.localUser.displayName !== name.text) {
                     root.connection.localUser.rename(name.text);
@@ -252,7 +252,7 @@ FormCard.FormCardPage {
     FormCard.FormCard {
         FormCard.FormButtonDelegate {
             id: deactivateAccountButton
-            text: i18nc("@action:button", "Deactivate Account…")
+            text: i18n("Deactivate Account")
             icon.name: "trash-empty-symbolic"
             onClicked: {
                 const component = Qt.createComponent('org.kde.neochat', 'ConfirmDeactivateAccountDialog');

src/settings/AccountsPage.qml

@@ -85,7 +85,7 @@ FormCard.FormCardPage {
                     }
 
                     QQC2.ToolButton {
-                        text: i18n("Logout…")
+                        text: i18n("Logout")
                         icon.name: "im-kick-user"
                         onClicked: confirmLogoutDialogComponent.createObject(root.QQC2.Overlay.overlay).open()
                     }

src/settings/GlobalNotificationsPage.qml

@@ -45,26 +45,6 @@ FormCard.FormCardPage {
         }
     }
 
-    FormCard.FormCard {
-        Layout.topMargin: Kirigami.Units.largeSpacing
-        FormCard.AbstractFormDelegate {
-            contentItem: RowLayout {
-                spacing: Kirigami.Units.largeSpacing
-                Kirigami.Icon {
-                    source: "data-information"
-                    width: Kirigami.Units.iconSizes.sizeForLabels
-                    height: Kirigami.Units.iconSizes.sizeForLabels
-                }
-                QQC2.Label {
-                    text: i18nc("@info", "These are the default notification settings for all rooms. You can customize notifications per-room in the room list or room settings.")
-                    wrapMode: Text.WordWrap
-
-                    Layout.fillWidth: true
-                }
-            }
-        }
-    }
-
     FormCard.FormHeader {
         title: i18nc("@title:group", "Room Notifications")
     }

src/settings/NeoChatGeneralPage.qml

@@ -134,45 +134,9 @@ FormCard.FormCardPage {
         }
     }
     FormCard.FormHeader {
-        title: i18nc("@title", "Timeline")
+        title: i18n("Timeline Events")
     }
     FormCard.FormCard {
-        FormCard.FormComboBoxDelegate {
-            id: markAsReadCombo
-            text: i18n("Mark messages as read when:")
-            textRole: "name"
-            valueRole: "value"
-            model: [
-                {
-                    name: i18n("Never"),
-                    value: 0
-                },
-                {
-                    name: i18nc("@item:inlistbox As in mark messages in the room as read when entering the room", "Entering the room"),
-                    value: 1
-                },
-                {
-                    name: i18nc("@item:inlistbox As in mark messages in the room as read when entering the room and all messages are visible on screen", "Entering the room and all unread messages are visible"),
-                    value: 2
-                },
-                {
-                    name: i18nc("@item:inlistbox As in mark messages in the room as read when exiting the room", "Exiting the room"),
-                    value: 3
-                },
-                {
-                    name: i18nc("@item:inlistbox As in mark messages in the room as read when exiting the room and all messages are visible on screen", "Exiting the room and all unread messages are visible"),
-                    value: 4
-                }
-            ]
-            Component.onCompleted: currentIndex = NeoChatConfig.markReadCondition
-            onCurrentValueChanged: NeoChatConfig.markReadCondition = currentValue
-        }
-
-        FormCard.FormDelegateSeparator {
-            above: markAsReadCombo
-            below: showDeletedMessages
-        }
-
         FormCard.FormCheckDelegate {
             id: showDeletedMessages
             text: i18n("Show deleted messages")
@@ -345,16 +309,8 @@ FormCard.FormCardPage {
     FormCard.FormCard {
         FormCard.FormButtonDelegate {
             icon.name: "kt-restore-defaults-symbolic"
-            text: i18nc("@action:button", "Reset all configuration values to their default…")
-            onClicked: resetDialog.open()
+            text: i18nc("@action:button", "Reset All Configuration Values to Their Default")
+            onClicked: Controller.revertToDefaultConfig()
         }
     }
-    Kirigami.PromptDialog {
-        id: resetDialog
-        title: i18nc("@title:dialog", "Reset Configuration")
-        subtitle: i18nc("@info", "Do you really want to reset all options to their default values?")
-        standardButtons: Kirigami.Dialog.Ok | Kirigami.Dialog.Cancel
-        onAccepted: Controller.revertToDefaultConfig()
-        anchors.centerIn: QQC2.Overlay.overlay
-    }
 }