WIP

.gitlab-ci.yml

@@ -12,7 +12,7 @@ include:
       - /gitlab-templates/linux-qt6.yml
       - /gitlab-templates/linux-qt6-next.yml
       - /gitlab-templates/windows-qt6.yml
-      # - /gitlab-templates/freebsd-qt6.yml
+      - /gitlab-templates/freebsd-qt6.yml
       - /gitlab-templates/flatpak.yml
       - /gitlab-templates/snap-snapcraft-lxd.yml
       - /gitlab-templates/craft-android-qt6-apks.yml

.kde-ci.yml

@@ -28,6 +28,7 @@ Dependencies:
       'frameworks/qqc2-desktop-style': '@latest-kf6'
       'frameworks/kio': '@latest-kf6'
       'frameworks/kwindowsystem': '@latest-kf6'
+      'frameworks/kstatusnotifieritem': '@latest-kf6'
   - 'on': ['Linux', 'FreeBSD']
     'require':
       'frameworks/kdbusaddons': '@latest-kf6'

CMakeLists.txt

@@ -88,7 +88,7 @@ if(ANDROID)
     )
 else()
     find_package(Qt6 ${QT_MIN_VERSION} COMPONENTS Widgets)
-    find_package(KF6 ${KF_MIN_VERSION} REQUIRED COMPONENTS QQC2DesktopStyle KIO WindowSystem)
+    find_package(KF6 ${KF_MIN_VERSION} REQUIRED COMPONENTS QQC2DesktopStyle KIO WindowSystem StatusNotifierItem)
     find_package(KF6SyntaxHighlighting ${KF_MIN_VERSION} REQUIRED)
     set_package_properties(KF6QQC2DesktopStyle PROPERTIES
         TYPE RUNTIME
@@ -106,7 +106,7 @@ if (NOT ANDROID AND NOT WIN32 AND NOT APPLE AND NOT HAIKU)
     find_package(KF6DBusAddons ${KF_MIN_VERSION} REQUIRED)
 endif()
 
-find_package(QuotientQt6 0.9.5)
+find_package(QuotientQt6 0.9.3)
 set_package_properties(QuotientQt6 PROPERTIES
     TYPE REQUIRED
     DESCRIPTION "Qt wrapper around Matrix API"
@@ -178,7 +178,7 @@ add_definitions(-DQT_NO_FOREACH)
 add_subdirectory(src)
 
 if (BUILD_TESTING)
-    find_package(Qt6 ${QT_MIN_VERSION} NO_MODULE COMPONENTS Test HttpServer QuickTest)
+    find_package(Qt6 ${QT_MIN_VERSION} NO_MODULE COMPONENTS Test HttpServer)
     add_subdirectory(autotests)
     # add_subdirectory(appiumtests)
     if (NOT ANDROID)

autotests/CMakeLists.txt

@@ -45,6 +45,12 @@ ecm_add_test(
     TEST_NAME chatbarcachetest
 )
 
+ecm_add_test(
+    chatdocumenthandlertest.cpp
+    LINK_LIBRARIES neochat Qt::Test
+    TEST_NAME chatdocumenthandlertest
+)
+
 ecm_add_test(
     timelinemessagemodeltest.cpp
     LINK_LIBRARIES neochat Qt::Test
@@ -104,45 +110,3 @@ ecm_add_test(
     LINK_LIBRARIES neochat Qt::Test neochat_server Devtools
     TEST_NAME modeltest
 )
-
-ecm_add_test(
-    blockcachetest.cpp
-    LINK_LIBRARIES neochat Qt::Test
-    TEST_NAME blockcachetest
-)
-
-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()
-
-add_executable(qmltest qmltest.cpp
-    chatkeyhelpertesthelper.h
-    chatmarkdownhelpertestwrapper.h
-    chattextitemhelpertesthelper.h
-)
-qt_add_qml_module(qmltest URI NeoChatTestUtils)
-
-target_link_libraries(qmltest
-    PRIVATE
-    Qt6::Qml
-    Qt6::QuickTest
-    LibNeoChat
-    LibNeoChatplugin
-)
-
-add_qml_tests(
-    chattextitemhelpertest.qml
-    chatmarkdownhelpertest.qml
-    chatkeyhelpertest.qml
-)

autotests/actionstest.cpp

@@ -7,9 +7,7 @@
 #include <QVariantList>
 
 #include "accountmanager.h"
-#include "blockcache.h"
 #include "chatbarcache.h"
-#include "enums/messagecomponenttype.h"
 #include "models/actionsmodel.h"
 
 #include "server.h"
@@ -90,8 +88,8 @@ void ActionsTest::testActions()
     QFETCH(std::optional<QString>, resultText);
     QFETCH(std::optional<Quotient::RoomMessageEvent::MsgType>, type);
 
-    auto cache = new ChatBarCache(room);
-    cache->cache() += Block::CacheItem{.type = MessageComponentType::Text, .content = QTextDocumentFragment::fromMarkdown(command)};
+    auto cache = new ChatBarCache(this);
+    cache->setText(command);
     auto result = ActionsModel::handleAction(room, cache);
     QCOMPARE(resultText, std::get<std::optional<QString>>(result));
     QCOMPARE(type, std::get<std::optional<Quotient::RoomMessageEvent::MsgType>>(result));

autotests/blockcachetest.cpp

@@ -1,52 +0,0 @@
-// SPDX-FileCopyrightText: 2026 James Graham <james.h.graham@protonmail.com>
-// SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
-
-#include <QObject>
-#include <QTest>
-
-#include "blockcache.h"
-
-#include "enums/messagecomponenttype.h"
-
-using namespace Block;
-
-class BlockCacheTest : public QObject
-{
-    Q_OBJECT
-
-private Q_SLOTS:
-    void toStringTest_data();
-    void toStringTest();
-};
-
-void BlockCacheTest::toStringTest_data()
-{
-    QTest::addColumn<QString>("inputString");
-    QTest::addColumn<MessageComponentType::Type>("itemType");
-    QTest::addColumn<QString>("outputstring");
-
-    QTest::newRow("plainText") << u"test string"_s << MessageComponentType::Text << u"test string"_s;
-    QTest::newRow("list") << u"- list 1\n- list 2\n- list 3\n"_s << MessageComponentType::Text << u"- list 1\n- list 2\n- list 3"_s;
-    QTest::newRow("code") << u"for (some code) {\n\n    do something\n\n}"_s << MessageComponentType::Code
-                          << u"```\nfor (some code) {\n    do something\n}\n```"_s;
-    QTest::newRow("quote") << u"\"this is a quote\""_s << MessageComponentType::Quote << u"> this is a quote"_s;
-    QTest::newRow("heading") << u"# heading\n\nnext line"_s << MessageComponentType::Text << u"# heading\n\nnext line"_s;
-}
-
-void BlockCacheTest::toStringTest()
-{
-    QFETCH(QString, inputString);
-    QFETCH(MessageComponentType::Type, itemType);
-    QFETCH(QString, outputstring);
-
-    Cache cache;
-    cache += CacheItem{
-        .type = itemType,
-        .content = QTextDocumentFragment::fromMarkdown(inputString),
-    };
-
-    QCOMPARE(cache.toString(), outputstring);
-}
-
-QTEST_MAIN(BlockCacheTest)
-#include "blockcachetest.moc"

autotests/chatbarcachetest.cpp

@@ -14,7 +14,6 @@
 #include <KLocalizedString>
 
 #include "accountmanager.h"
-#include "blockcache.h"
 #include "chatbarcache.h"
 #include "neochatroom.h"
 
@@ -37,6 +36,8 @@ private Q_SLOTS:
     void initTestCase();
 
     void empty();
+    void noRoom();
+    void badParent();
     void reply();
     void replyMissingUser();
     void edit();
@@ -76,7 +77,7 @@ void ChatBarCacheTest::empty()
 {
     QScopedPointer<ChatBarCache> chatBarCache(new ChatBarCache(room));
 
-    QCOMPARE(chatBarCache->cache().toString(), QString());
+    QCOMPARE(chatBarCache->text(), QString());
     QCOMPARE(chatBarCache->isReplying(), false);
     QCOMPARE(chatBarCache->replyId(), QString());
     QCOMPARE(chatBarCache->isEditing(), false);
@@ -86,14 +87,47 @@ void ChatBarCacheTest::empty()
     QCOMPARE(chatBarCache->attachmentPath(), QString());
 }
 
+void ChatBarCacheTest::noRoom()
+{
+    QTest::ignoreMessage(QtWarningMsg, "ChatBarCache created with no parent, a NeoChatRoom must be set as the parent on creation.");
+    QScopedPointer<ChatBarCache> chatBarCache(new ChatBarCache());
+    chatBarCache->setReplyId(eventId);
+
+    // These should return empty even though a reply ID has been set because the
+    // ChatBarCache has no parent.
+
+    QTest::ignoreMessage(QtWarningMsg, "ChatBarCache created with no parent, a NeoChatRoom must be set as the parent on creation.");
+    QCOMPARE(chatBarCache->relationAuthor(), Quotient::RoomMember());
+
+    QTest::ignoreMessage(QtWarningMsg, "ChatBarCache created with no parent, a NeoChatRoom must be set as the parent on creation.");
+    QCOMPARE(chatBarCache->relationMessage(), QString());
+}
+
+void ChatBarCacheTest::badParent()
+{
+    QTest::ignoreMessage(QtWarningMsg, "ChatBarCache created with incorrect parent, a NeoChatRoom must be set as the parent on creation.");
+    QScopedPointer<QObject> badParent(new QObject());
+    QScopedPointer<ChatBarCache> chatBarCache(new ChatBarCache(badParent.get()));
+    chatBarCache->setReplyId(eventId);
+
+    // These should return empty even though a reply ID has been set because the
+    // ChatBarCache has no parent.
+
+    QTest::ignoreMessage(QtWarningMsg, "ChatBarCache created with incorrect parent, a NeoChatRoom must be set as the parent on creation.");
+    QCOMPARE(chatBarCache->relationAuthor(), Quotient::RoomMember());
+
+    QTest::ignoreMessage(QtWarningMsg, "ChatBarCache created with incorrect parent, a NeoChatRoom must be set as the parent on creation.");
+    QCOMPARE(chatBarCache->relationMessage(), QString());
+}
+
 void ChatBarCacheTest::reply()
 {
     QScopedPointer<ChatBarCache> chatBarCache(new ChatBarCache(room));
-    chatBarCache->cache() += Block::CacheItem{.type = MessageComponentType::Text, .content = QTextDocumentFragment::fromMarkdown(u"some text"_s)};
+    chatBarCache->setText(u"some text"_s);
     chatBarCache->setAttachmentPath(u"some/path"_s);
     chatBarCache->setReplyId(eventId);
 
-    QCOMPARE(chatBarCache->cache().toString(), u"some text"_s);
+    QCOMPARE(chatBarCache->text(), u"some text"_s);
     QCOMPARE(chatBarCache->isReplying(), true);
     QCOMPARE(chatBarCache->replyId(), eventId);
     QCOMPARE(chatBarCache->isEditing(), false);
@@ -107,11 +141,11 @@ void ChatBarCacheTest::reply()
 void ChatBarCacheTest::replyMissingUser()
 {
     QScopedPointer<ChatBarCache> chatBarCache(new ChatBarCache(room));
-    chatBarCache->cache() += Block::CacheItem{.type = MessageComponentType::Text, .content = QTextDocumentFragment::fromMarkdown(u"some text"_s)};
+    chatBarCache->setText(u"some text"_s);
     chatBarCache->setAttachmentPath(u"some/path"_s);
     chatBarCache->setReplyId(eventId);
 
-    QCOMPARE(chatBarCache->cache().toString(), u"some text"_s);
+    QCOMPARE(chatBarCache->text(), u"some text"_s);
     QCOMPARE(chatBarCache->isReplying(), true);
     QCOMPARE(chatBarCache->replyId(), eventId);
     QCOMPARE(chatBarCache->isEditing(), false);
@@ -138,7 +172,7 @@ void ChatBarCacheTest::edit()
 {
     QScopedPointer<ChatBarCache> chatBarCache(new ChatBarCache(room));
 
-    chatBarCache->cache() += Block::CacheItem{.type = MessageComponentType::Text, .content = QTextDocumentFragment::fromMarkdown(u"some text"_s)};
+    chatBarCache->setText(u"some text"_s);
     chatBarCache->setAttachmentPath(u"some/path"_s);
     connect(chatBarCache.get(), &ChatBarCache::relationIdChanged, this, [this](const QString &oldEventId, const QString &newEventId) {
         QCOMPARE(oldEventId, QString());
@@ -146,7 +180,7 @@ void ChatBarCacheTest::edit()
     });
     chatBarCache->setEditId(eventId);
 
-    QCOMPARE(chatBarCache->cache().toString(), u"some text"_s);
+    QCOMPARE(chatBarCache->text(), u"some text"_s);
     QCOMPARE(chatBarCache->isReplying(), false);
     QCOMPARE(chatBarCache->replyId(), QString());
     QCOMPARE(chatBarCache->isEditing(), true);
@@ -159,11 +193,11 @@ void ChatBarCacheTest::edit()
 void ChatBarCacheTest::attachment()
 {
     QScopedPointer<ChatBarCache> chatBarCache(new ChatBarCache(room));
-    chatBarCache->cache() += Block::CacheItem{.type = MessageComponentType::Text, .content = QTextDocumentFragment::fromMarkdown(u"some text"_s)};
+    chatBarCache->setText(u"some text"_s);
     chatBarCache->setEditId(eventId);
     chatBarCache->setAttachmentPath(u"some/path"_s);
 
-    QCOMPARE(chatBarCache->cache().toString(), u"some text"_s);
+    QCOMPARE(chatBarCache->text(), u"some text"_s);
     QCOMPARE(chatBarCache->isReplying(), false);
     QCOMPARE(chatBarCache->replyId(), QString());
     QCOMPARE(chatBarCache->isEditing(), false);

autotests/chatdocumenthandlertest.cpp

@@ -0,0 +1,36 @@
+// SPDX-FileCopyrightText: 2023 James Graham <james.h.graham@protonmail.com>
+// SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
+
+#include <QObject>
+#include <QTest>
+
+#include "chatdocumenthandler.h"
+#include "neochatconfig.h"
+
+class ChatDocumentHandlerTest : public QObject
+{
+    Q_OBJECT
+
+private:
+    ChatDocumentHandler emptyHandler;
+
+private Q_SLOTS:
+    void initTestCase();
+
+    void nullComplete();
+};
+
+void ChatDocumentHandlerTest::initTestCase()
+{
+    // HACK: this is to stop KStatusNotifierItem SEGFAULTING on cleanup.
+    NeoChatConfig::self()->setSystemTray(false);
+}
+
+void ChatDocumentHandlerTest::nullComplete()
+{
+    QTest::ignoreMessage(QtWarningMsg, "complete called with m_document set to nullptr.");
+    emptyHandler.complete(0);
+}
+
+QTEST_MAIN(ChatDocumentHandlerTest)
+#include "chatdocumenthandlertest.moc"

autotests/chatkeyhelpertest.qml

@@ -1,88 +0,0 @@
-// SPDX-FileCopyrightText: 2026 James Graham <james.h.graham@protonmail.com>
-// SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
-
-import QtQuick
-import QtTest
-
-import org.kde.neochat.libneochat
-
-import NeoChatTestUtils
-
-TestCase {
-    name: "ChatKeyHelperTest"
-
-    TextEdit {
-        id: textEdit
-
-        Keys.onPressed: (event) => {
-            event.accepted = testHelper.keyHelper.handleKey(event.key, event.modifiers);
-        }
-    }
-
-    ChatTextItemHelper {
-        id: textItemHelper
-
-        textItem: textEdit
-    }
-
-    ChatKeyHelperTestHelper {
-        id: testHelper
-
-        textItem: textItemHelper
-    }
-
-    SignalSpy {
-        id: spyUp
-        target: testHelper.keyHelper
-        signalName: "unhandledUp"
-    }
-
-    SignalSpy {
-        id: spyDown
-        target: testHelper.keyHelper
-        signalName: "unhandledDown"
-    }
-
-    SignalSpy {
-        id: spyDelete
-        target: testHelper.keyHelper
-        signalName: "unhandledDelete"
-    }
-
-    SignalSpy {
-        id: spyBackSpace
-        target: testHelper.keyHelper
-        signalName: "unhandledBackspace"
-    }
-
-    function init(): void {
-        textEdit.clear();
-        spyUp.clear();
-        spyDown.clear();
-        spyDelete.clear();
-        spyBackSpace.clear();
-        textEdit.forceActiveFocus();
-    }
-
-    function cleanupTestCase(): void {
-        testHelper.textItem = null;
-        textItemHelper.textItem = null;
-    }
-
-    function test_upDown(): void {
-        textEdit.insert(0, "line 1\nline 2\nline 3")
-        textEdit.cursorPosition = 0;
-        keyClick(Qt.Key_Up);
-        compare(spyUp.count, 1);
-        compare(spyDown.count, 0);
-        keyClick(Qt.Key_Down);
-        compare(spyUp.count, 1);
-        compare(spyDown.count, 0);
-        keyClick(Qt.Key_Down);
-        compare(spyUp.count, 1);
-        compare(spyDown.count, 0);
-        keyClick(Qt.Key_Down);
-        compare(spyUp.count, 1);
-        compare(spyDown.count, 1);
-    }
-}

autotests/chatkeyhelpertesthelper.h

@@ -1,54 +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 <QQuickItem>
-#include <QQuickTextDocument>
-#include <QTextCursor>
-#include <QTextDocumentFragment>
-
-#include "chatkeyhelper.h"
-#include "chattextitemhelper.h"
-
-class ChatKeyHelperTestHelper : public QObject
-{
-    Q_OBJECT
-    QML_ELEMENT
-
-    Q_PROPERTY(ChatTextItemHelper *textItem READ textItem WRITE setTextItem NOTIFY textItemChanged)
-
-    Q_PROPERTY(ChatKeyHelper *keyHelper READ keyHelper CONSTANT)
-
-public:
-    explicit ChatKeyHelperTestHelper(QObject *parent = nullptr)
-        : QObject(parent)
-        , m_keyHelper(new ChatKeyHelper(this))
-    {
-    }
-
-    ChatTextItemHelper *textItem() const
-    {
-        return m_keyHelper->textItem();
-    }
-    void setTextItem(ChatTextItemHelper *textItem)
-    {
-        if (textItem == m_keyHelper->textItem()) {
-            return;
-        }
-        m_keyHelper->setTextItem(textItem);
-        Q_EMIT textItemChanged();
-    }
-
-    ChatKeyHelper *keyHelper() const
-    {
-        return m_keyHelper;
-    }
-
-Q_SIGNALS:
-    void textItemChanged();
-
-private:
-    QPointer<ChatKeyHelper> m_keyHelper;
-};

autotests/chatmarkdownhelpertest.qml

@@ -1,173 +0,0 @@
-// SPDX-FileCopyrightText: 2026 James Graham <james.h.graham@protonmail.com>
-// SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
-
-import QtQuick
-import QtTest
-
-import org.kde.neochat.libneochat
-
-import NeoChatTestUtils
-
-TestCase {
-    name: "ChatMarkdownHelperTest"
-
-    TextEdit {
-        id: textEdit
-
-        textFormat: TextEdit.RichText
-    }
-
-    TextEdit {
-        id: textEdit2
-    }
-
-    ChatMarkdownHelperTestWrapper {
-        id: chatMarkdownHelper
-
-        textItem: textEdit
-    }
-
-    SignalSpy {
-        id: spyItem
-        target: chatMarkdownHelper
-        signalName: "textItemChanged"
-    }
-
-    SignalSpy {
-        id: spyUnhandledFormat
-        target: chatMarkdownHelper
-        signalName: "unhandledBlockFormat"
-    }
-
-    function initTestCase(): void {
-        textEdit.forceActiveFocus();
-    }
-
-    function cleanup(): void {
-        chatMarkdownHelper.clear();
-        compare(chatMarkdownHelper.checkText(""), true);
-        compare(chatMarkdownHelper.checkFormats([]), true);
-        compare(textEdit.cursorPosition, 0);
-    }
-
-    function test_item(): void {
-        spyItem.clear();
-        compare(chatMarkdownHelper.textItem, textEdit);
-        chatMarkdownHelper.textItem = textEdit2;
-        compare(chatMarkdownHelper.textItem, textEdit2);
-        chatMarkdownHelper.textItem = textEdit;
-        compare(chatMarkdownHelper.textItem, textEdit);
-    }
-
-    function test_textFormat_data() {
-        return [
-            {tag: "bold", input: "**b** ", outText: ["*", "**", "b", "b*", "b**", "b "], outFormats: [[], [], [RichFormat.Bold], [RichFormat.Bold], [RichFormat.Bold], []], unhandled: 0},
-            {tag: "italic", input: "*i* ", outText: ["*", "i", "i*", "i "], outFormats: [[], [RichFormat.Italic], [RichFormat.Italic], []], unhandled: 0},
-            {tag: "heading 1", input: "# h", outText: ["#", "# ", "h"], outFormats: [[], [], [RichFormat.Bold, RichFormat.Heading1]], unhandled: 0},
-            {tag: "heading 2", input: "## h", outText: ["#", "##", "## ", "h"], outFormats: [[], [], [], [RichFormat.Bold, RichFormat.Heading2]], unhandled: 0},
-            {tag: "heading 3", input: "### h", outText: ["#", "##", "###", "### ", "h"], outFormats: [[], [], [], [], [RichFormat.Bold, RichFormat.Heading3]], unhandled: 0},
-            {tag: "heading 4", input: "#### h", outText: ["#", "##", "###", "####", "#### ", "h"], outFormats: [[], [], [], [], [], [RichFormat.Bold, RichFormat.Heading4]], unhandled: 0},
-            {tag: "heading 5", input: "##### h", outText: ["#", "##", "###", "####", "#####", "##### ", "h"], outFormats: [[], [], [], [], [], [], [RichFormat.Bold, RichFormat.Heading5]], unhandled: 0},
-            {tag: "heading 6", input: "###### h", outText: ["#", "##", "###", "####", "#####", "######", "###### ", "h"], outFormats: [[], [], [], [], [], [] ,[], [RichFormat.Bold, RichFormat.Heading6]], unhandled: 0},
-            {tag: "quote", input: "> q", outText: [">", "> ", "q"], outFormats: [[], [], []], unhandled: 1},
-            {tag: "quote - no space", input: ">q", outText: [">", "q"], outFormats: [[], [], []], unhandled: 1},
-            {tag: "unorderedlist 1", input: "* l", outText: ["*", "* ", "l"], outFormats: [[], [], [RichFormat.UnorderedList]], unhandled: 0},
-            {tag: "unorderedlist 2", input: "- l", outText: ["-", "- ", "l"], outFormats: [[], [], [RichFormat.UnorderedList]], unhandled: 0},
-            {tag: "orderedlist 1", input: "1. l", outText: ["1", "1.", "1. ", "l"], outFormats: [[], [], [], [RichFormat.OrderedList]], unhandled: 0},
-            {tag: "orderedlist 2", input: "1) l", outText: ["1", "1)", "1) ", "l"], outFormats: [[], [], [], [RichFormat.OrderedList]], unhandled: 0},
-            {tag: "inline code", input: "`c` ", outText: ["`", "c", "c`", "c "], outFormats: [[], [RichFormat.InlineCode], [RichFormat.InlineCode], []], unhandled: 0},
-            {tag: "code", input: "``` ", outText: ["`", "``", "```", " "], outFormats: [[], [], [], []], unhandled: 1},
-            {tag: "strikethrough", input: "~~s~~ ", outText: ["~", "~~", "s", "s~", "s~~", "s "], outFormats: [[], [], [RichFormat.Strikethrough], [RichFormat.Strikethrough], [RichFormat.Strikethrough], []], unhandled: 0},
-            {tag: "underline", input: "_u_ ", outText: ["_", "u", "u_", "u "], outFormats: [[], [RichFormat.Underline], [RichFormat.Underline], []], unhandled: 0},
-            {tag: "multiple closable", input: "***_~~t~~_*** ", outText: ["*", "**", "*", "_", "~", "~~", "t", "t~", "t~~", "t_", "t*", "t**", "t*", "t "], outFormats: [[], [], [RichFormat.Bold], [RichFormat.Bold, RichFormat.Italic], [RichFormat.Bold, RichFormat.Italic, RichFormat.Underline], [RichFormat.Bold, RichFormat.Italic, RichFormat.Underline], [RichFormat.Bold, RichFormat.Italic, RichFormat.Underline, RichFormat.Strikethrough], [RichFormat.Bold, RichFormat.Italic, RichFormat.Underline, RichFormat.Strikethrough], [RichFormat.Bold, RichFormat.Italic, RichFormat.Underline, RichFormat.Strikethrough], [RichFormat.Bold, RichFormat.Italic, RichFormat.Underline], [RichFormat.Bold, RichFormat.Italic], [RichFormat.Bold, RichFormat.Italic], [RichFormat.Italic], []], unhandled: 0},
-            {tag: "nonclosable closable", input: "* **b** ", outText: ["*", "* ", "*", "**", "b", "b*", "b**", "b "], outFormats: [[], [], [RichFormat.UnorderedList], [RichFormat.UnorderedList], [RichFormat.Bold, RichFormat.UnorderedList], [RichFormat.Bold, RichFormat.UnorderedList], [RichFormat.Bold, RichFormat.UnorderedList], [RichFormat.UnorderedList]], unhandled: 0},
-            {tag: "not at line start", input: " 1) ", outText: [" ", " 1", " 1)", " 1) "], outFormats: [[], [], [], []], unhandled: 0},
-        ]
-    }
-
-    function test_textFormat(data): void {
-        spyUnhandledFormat.clear();
-        compare(spyUnhandledFormat.count, 0);
-
-        for (let i = 0; i < data.input.length; i++) {
-            keyClick(data.input[i]);
-            compare(chatMarkdownHelper.checkText(data.outText[i]), true);
-            compare(chatMarkdownHelper.checkFormats(data.outFormats[i]), true);
-        }
-
-        compare(spyUnhandledFormat.count, data.unhandled);
-    }
-
-    function test_backspace(): void {
-        keyClick("*");
-        compare(chatMarkdownHelper.checkText("*"), true);
-        compare(chatMarkdownHelper.checkFormats([]), true);
-        keyClick("*");
-        compare(chatMarkdownHelper.checkText("**"), true);
-        compare(chatMarkdownHelper.checkFormats([]), true);
-        keyClick("b");
-        compare(chatMarkdownHelper.checkText("b"), true);
-        compare(chatMarkdownHelper.checkFormats([RichFormat.Bold]), true);
-        keyClick("o");
-        compare(chatMarkdownHelper.checkText("bo"), true);
-        compare(chatMarkdownHelper.checkFormats([RichFormat.Bold]), true);
-        keyClick("l");
-        compare(chatMarkdownHelper.checkText("bol"), true);
-        compare(chatMarkdownHelper.checkFormats([RichFormat.Bold]), true);
-        keyClick("d");
-        compare(chatMarkdownHelper.checkText("bold"), true);
-        compare(chatMarkdownHelper.checkFormats([RichFormat.Bold]), true);
-        keyClick(Qt.Key_Backspace);
-        compare(chatMarkdownHelper.checkText("bol"), true);
-        compare(chatMarkdownHelper.checkFormats([RichFormat.Bold]), true);
-        keyClick(Qt.Key_Backspace);
-        compare(chatMarkdownHelper.checkText("bo"), true);
-        compare(chatMarkdownHelper.checkFormats([RichFormat.Bold]), true);
-        keyClick("*");
-        compare(chatMarkdownHelper.checkText("bo*"), true);
-        compare(chatMarkdownHelper.checkFormats([RichFormat.Bold]), true);
-        keyClick("*");
-        compare(chatMarkdownHelper.checkText("bo**"), true);
-        compare(chatMarkdownHelper.checkFormats([RichFormat.Bold]), true);
-        keyClick(" ");
-        compare(chatMarkdownHelper.checkText("bo "), true);
-        compare(chatMarkdownHelper.checkFormats([]), true);
-    }
-
-    function test_cursorMove(): void {
-        keyClick("t");
-        keyClick("e");
-        keyClick("s");
-        keyClick("t");
-        compare(chatMarkdownHelper.checkText("test"), true);
-        compare(chatMarkdownHelper.checkFormats([]), true);
-        keyClick("*");
-        keyClick("*");
-        keyClick("b");
-        compare(chatMarkdownHelper.checkText("testb"), true);
-        compare(chatMarkdownHelper.checkFormats([RichFormat.Bold]), true);
-        textEdit.cursorPosition = 2;
-        keyClick("*");
-        keyClick("*");
-        keyClick("b");
-        compare(chatMarkdownHelper.checkText("tebstb"), true);
-        compare(chatMarkdownHelper.checkFormats([]), true);
-    }
-
-    function test_insertText(): void {
-        textEdit.insert(0, "test");
-        compare(chatMarkdownHelper.checkText("test"), true);
-        compare(chatMarkdownHelper.checkFormats([]), true);
-        textEdit.insert(4, "**b");
-        compare(chatMarkdownHelper.checkText("test**b"), true);
-        compare(chatMarkdownHelper.checkFormats([]), true);
-
-        textEdit.clear();
-        textEdit.insert(0, "test");
-        compare(chatMarkdownHelper.checkText("test"), true);
-        compare(chatMarkdownHelper.checkFormats([]), true);
-        textEdit.insert(2, "**b");
-        compare(chatMarkdownHelper.checkText("te**bst"), true);
-        compare(chatMarkdownHelper.checkFormats([]), true);
-    }
-}

autotests/chatmarkdownhelpertestwrapper.h

@@ -1,82 +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 <QQuickItem>
-#include <QTextCursor>
-
-#include "chatmarkdownhelper.h"
-#include "chattextitemhelper.h"
-#include "enums/richformat.h"
-
-class ChatMarkdownHelperTestWrapper : public QObject
-{
-    Q_OBJECT
-    QML_ELEMENT
-
-    /**
-     * @brief The QML text Item the ChatMerkdownHelper is handling.
-     */
-    Q_PROPERTY(QQuickItem *textItem READ textItem WRITE setTextItem NOTIFY textItemChanged)
-
-public:
-    explicit ChatMarkdownHelperTestWrapper(QObject *parent = nullptr)
-        : QObject(parent)
-        , m_chatMarkdownHelper(new ChatMarkdownHelper(this))
-        , m_textItem(new ChatTextItemHelper(this))
-    {
-        m_chatMarkdownHelper->setTextItem(m_textItem);
-
-        connect(m_chatMarkdownHelper, &ChatMarkdownHelper::textItemChanged, this, &ChatMarkdownHelperTestWrapper::textItemChanged);
-        connect(m_chatMarkdownHelper, &ChatMarkdownHelper::unhandledBlockFormat, this, &ChatMarkdownHelperTestWrapper::unhandledBlockFormat);
-    }
-
-    QQuickItem *textItem() const
-    {
-        return m_textItem->textItem();
-    }
-    void setTextItem(QQuickItem *textItem)
-    {
-        m_textItem->setTextItem(textItem);
-    }
-
-    Q_INVOKABLE bool checkText(const QString &text)
-    {
-        const auto doc = m_textItem->document();
-        if (!doc) {
-            return false;
-        }
-        return text == doc->toPlainText();
-    }
-
-    Q_INVOKABLE bool checkFormats(QList<RichFormat::Format> formats)
-    {
-        const auto cursor = m_textItem->textCursor();
-        if (cursor.isNull()) {
-            return false;
-        }
-        return RichFormat::formatsAtCursor(cursor) == formats;
-    }
-
-    Q_INVOKABLE void clear()
-    {
-        auto cursor = m_textItem->textCursor();
-        if (cursor.isNull()) {
-            return;
-        }
-        cursor.select(QTextCursor::Document);
-        cursor.removeSelectedText();
-        cursor.setBlockCharFormat(RichFormat::charFormatForFormat(RichFormat::Paragraph));
-        cursor.setBlockFormat(RichFormat::blockFormatForFormat(RichFormat::Paragraph));
-    }
-
-Q_SIGNALS:
-    void textItemChanged();
-    void unhandledBlockFormat(RichFormat::Format format);
-
-private:
-    QPointer<ChatMarkdownHelper> m_chatMarkdownHelper;
-    QPointer<ChatTextItemHelper> m_textItem;
-};

autotests/chattextitemhelpertest.qml

@@ -1,301 +0,0 @@
-// SPDX-FileCopyrightText: 2026 James Graham <james.h.graham@protonmail.com>
-// SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
-
-import QtQuick
-import QtTest
-
-import org.kde.neochat.libneochat
-
-import NeoChatTestUtils
-
-TestCase {
-    name: "ChatTextItemHelperTest"
-
-    TextEdit {
-        id: textEdit
-    }
-
-    TextEdit {
-        id: textEdit2
-    }
-
-    ChatTextItemHelper {
-        id: textItemHelper
-
-        textItem: textEdit
-    }
-
-    ChatTextItemHelperTestHelper {
-        id: testHelper
-
-        textItem: textItemHelper
-    }
-
-    SignalSpy {
-        id: spyItem
-        target: textItemHelper
-        signalName: "textItemChanged"
-    }
-
-    SignalSpy {
-        id: spyContentsChanged
-        target: textItemHelper
-        signalName: "contentsChanged"
-    }
-
-    SignalSpy {
-        id: spyContentsChange
-        target: textItemHelper
-        signalName: "contentsChange"
-    }
-
-    SignalSpy {
-        id: spyCursor
-        target: textItemHelper
-        signalName: "cursorPositionChanged"
-    }
-
-    function init(): void {
-        testHelper.setFixedChars("", "");
-        textEdit.clear();
-        textEdit2.clear();
-        spyItem.clear();
-        spyContentsChange.clear();
-        spyContentsChanged.clear();
-        spyCursor.clear();
-    }
-
-    function cleanupTestCase(): void {
-        testHelper.textItem = null;
-        textItemHelper.textItem = null;
-    }
-
-    function test_item(): void {
-        compare(textItemHelper.textItem, textEdit);
-        compare(spyItem.count, 0);
-        textItemHelper.textItem = textEdit2;
-        compare(textItemHelper.textItem, textEdit2);
-        compare(spyItem.count, 1);
-        textItemHelper.textItem = textEdit;
-        compare(textItemHelper.textItem, textEdit);
-        compare(spyItem.count, 2);
-    }
-
-    function test_fixedChars(): void {
-        textEdit.forceActiveFocus();
-        testHelper.setFixedChars("1", "2");
-        compare(textEdit.text, "12");
-        compare(textEdit.cursorPosition, 1);
-        compare(spyCursor.count, 0);
-        keyClick("b");
-        compare(textEdit.text, "1b2");
-        compare(textEdit.cursorPosition, 2);
-        compare(spyCursor.count, 1);
-        keyClick(Qt.Key_Left);
-        compare(textEdit.text, "1b2");
-        compare(textEdit.cursorPosition, 1);
-        compare(spyCursor.count, 2);
-        keyClick(Qt.Key_Left);
-        compare(textEdit.text, "1b2");
-        compare(textEdit.cursorPosition, 1);
-        compare(spyCursor.count, 3);
-        keyClick(Qt.Key_Right);
-        compare(textEdit.text, "1b2");
-        compare(textEdit.cursorPosition, 2);
-        compare(spyCursor.count, 4);
-        keyClick(Qt.Key_Right);
-        compare(textEdit.text, "1b2");
-        compare(textEdit.cursorPosition, 2);
-        compare(spyCursor.count, 5);
-    }
-
-    function test_document(): void {
-        // We can't get to the QTextDocument from QML so we have to use a helper function.
-        compare(testHelper.compareDocuments(textEdit.textDocument), true);
-
-        textEdit.insert(0, "test text");
-        compare(testHelper.lineCount(), 1);
-        textEdit.insert(textEdit.text.length, "\ntest text");
-        compare(testHelper.lineCount(), 2);
-        textEdit.clear()
-        compare(textEdit.text.length, 0);
-    }
-
-    function test_takeFirstBlock(): void {
-        textEdit.insert(0, "test text");
-        compare(testHelper.firstBlockText(), "test text");
-        compare(textEdit.text.length, 0);
-        textEdit.insert(0, "test text\nmore test text");
-        compare(testHelper.firstBlockText(), "test text");
-        compare(textEdit.text, "more test text");
-        compare(testHelper.firstBlockText(), "more test text");
-        compare(textEdit.text, "");
-        compare(textEdit.text.length, 0);
-    }
-
-    function test_fillFragments(): void {
-        textEdit.insert(0, "before fragment\nmid fragment\nafter fragment");
-        compare(testHelper.checkFragments("before fragment\nmid fragment", "after fragment", ""), true);
-        textEdit.clear();
-        textEdit.insert(0, "before fragment\nmid fragment\nafter fragment");
-        textEdit.cursorPosition = 16;
-        compare(testHelper.checkFragments("before fragment", "mid fragment", "after fragment"), true);
-        textEdit.clear();
-        textEdit.insert(0, "before fragment\nmid fragment\nafter fragment");
-        textEdit.cursorPosition = 29;
-        compare(testHelper.checkFragments("before fragment\nmid fragment", "after fragment", ""), true);
-        textEdit.clear();
-    }
-
-    function test_insertFragment(): void {
-        testHelper.insertFragment("test text");
-        compare(textEdit.text, "test text");
-        compare(textEdit.cursorPosition, 9);
-        testHelper.insertFragment("beginning ", 1);
-        compare(textEdit.text, "beginning test text");
-        compare(textEdit.cursorPosition, 10);
-        testHelper.insertFragment(" end", 2);
-        compare(textEdit.text, "beginning test text end");
-        compare(textEdit.cursorPosition, 23);
-        textEdit.clear();
-
-        testHelper.insertFragment("test text", 0, true);
-        compare(textEdit.text, "test text");
-        compare(textEdit.cursorPosition, 0);
-    }
-
-    function test_cursor(): void {
-        // We can't get to the QTextCursor from QML so we have to use a helper function.
-        compare(testHelper.compareCursor(textEdit.cursorPosition, textEdit.selectionStart, textEdit.selectionEnd), true);
-        compare(textEdit.cursorPosition, testHelper.cursorPosition());
-        // Check we get the appropriate content and cursor change signals when inserting text.
-        textEdit.insert(0, "test text")
-        compare(spyContentsChange.count, 1);
-        compare(spyContentsChange.signalArguments[0][0], 0);
-        compare(spyContentsChange.signalArguments[0][1], 0);
-        compare(spyContentsChange.signalArguments[0][2], 9);
-        compare(spyContentsChanged.count, 1);
-        compare(spyCursor.count, 1);
-        compare(spyCursor.signalArguments[0][0], true);
-        compare(testHelper.compareCursor(textEdit.cursorPosition, textEdit.selectionStart, textEdit.selectionEnd), true);
-        compare(textEdit.cursorPosition, testHelper.cursorPosition());
-        // Check we get only get a cursor change signal when moving the cursor.
-        textEdit.cursorPosition = 4;
-        compare(spyContentsChanged.count, 1);
-        compare(spyCursor.count, 2);
-        compare(spyCursor.signalArguments[1][0], false);
-        textEdit.selectAll();
-        compare(spyContentsChanged.count, 1);
-        compare(spyCursor.count, 2);
-        compare(testHelper.compareCursor(textEdit.cursorPosition, textEdit.selectionStart, textEdit.selectionEnd), true);
-        compare(textEdit.cursorPosition, testHelper.cursorPosition());
-        // Check we get the appropriate content and cursor change signals when removing text.
-        textEdit.clear();
-        compare(spyContentsChange.count, 2);
-        compare(spyContentsChange.signalArguments[1][0], 0);
-        compare(spyContentsChange.signalArguments[1][1], 9);
-        compare(spyContentsChange.signalArguments[1][2], 0);
-        compare(spyContentsChanged.count, 2);
-        compare(spyCursor.count, 3);
-        compare(spyCursor.signalArguments[2][0], true);
-    }
-
-    function test_setCursor(): void {
-        textEdit.insert(0, "test text");
-        compare(textEdit.cursorPosition, 9);
-        compare(spyCursor.count, 1);
-        testHelper.setCursorPosition(5);
-        compare(textEdit.cursorPosition, 5);
-        compare(spyCursor.count, 2);
-        testHelper.setCursorPosition(1);
-        compare(textEdit.cursorPosition, 1);
-        compare(spyCursor.count, 3);
-
-        textEdit.cursorVisible = false;
-        compare(textEdit.cursorVisible, false);
-        testHelper.setCursorVisible(true);
-        compare(textEdit.cursorVisible, true);
-        testHelper.setCursorVisible(false);
-        compare(textEdit.cursorVisible, false);
-    }
-
-    function test_setCursorFromTextItem(): void {
-        textEdit.insert(0, "line 1\nline 2");
-        textEdit2.insert(0, "line 1\nline 2");
-        testHelper.setCursorFromTextItem(textEdit2, false, 0);
-        compare(textEdit.cursorPosition, 7);
-        testHelper.setCursorFromTextItem(textEdit2, true, 7);
-        compare(textEdit.cursorPosition, 0);
-        testHelper.setCursorFromTextItem(textEdit2, false, 1);
-        compare(textEdit.cursorPosition, 8);
-        testHelper.setCursorFromTextItem(textEdit2, true, 8);
-        compare(textEdit.cursorPosition, 1);
-
-        testHelper.setFixedChars("1", "2");
-        testHelper.setCursorFromTextItem(textEdit2, false, 0);
-        compare(textEdit.cursorPosition, 8);
-        testHelper.setCursorFromTextItem(textEdit2, true, 7);
-        compare(textEdit.cursorPosition, 1);
-    }
-
-    function test_mergeFormat(): void {
-        textEdit.insert(0, "lots of text");
-        testHelper.setCursorPosition(0);
-        testHelper.mergeFormatOnCursor(RichFormat.Bold);
-        compare(testHelper.checkFormatsAtCursor([RichFormat.Bold]), true);
-        testHelper.mergeFormatOnCursor(RichFormat.Italic);
-        compare(testHelper.checkFormatsAtCursor([RichFormat.Bold, RichFormat.Italic]), true);
-        testHelper.setCursorPosition(6);
-        compare(testHelper.checkFormatsAtCursor([]), true);
-        testHelper.mergeFormatOnCursor(RichFormat.Underline);
-        compare(testHelper.checkFormatsAtCursor([RichFormat.Underline]), true);
-        testHelper.setCursorPosition(9);
-        compare(testHelper.checkFormatsAtCursor([]), true);
-        testHelper.mergeFormatOnCursor(RichFormat.Strikethrough);
-        compare(testHelper.checkFormatsAtCursor([RichFormat.Strikethrough]), true);
-        textEdit.clear();
-
-        textEdit.insert(0, "heading");
-        testHelper.mergeFormatOnCursor(RichFormat.Heading1);
-        compare(testHelper.checkFormatsAtCursor([RichFormat.Bold, RichFormat.Heading1]), true);
-        testHelper.mergeFormatOnCursor(RichFormat.Heading2);
-        compare(testHelper.checkFormatsAtCursor([RichFormat.Bold, RichFormat.Heading2]), true);
-        testHelper.mergeFormatOnCursor(RichFormat.Paragraph);
-        compare(testHelper.checkFormatsAtCursor([]), true);
-        textEdit.clear();
-
-        textEdit.insert(0, "text");
-        testHelper.mergeFormatOnCursor(RichFormat.UnorderedList);
-        compare(testHelper.checkFormatsAtCursor([RichFormat.UnorderedList]), true);
-        compare(testHelper.markdownText(), "- text");
-        testHelper.mergeFormatOnCursor(RichFormat.OrderedList);
-        compare(testHelper.checkFormatsAtCursor([RichFormat.OrderedList]), true);
-        compare(testHelper.markdownText(), "1.  text");
-        textEdit.clear();
-    }
-
-    function test_list(): void {
-        compare(testHelper.canIndentListMoreAtCursor(), true);
-        testHelper.indentListMoreAtCursor();
-        compare(testHelper.canIndentListMoreAtCursor(), true);
-        testHelper.indentListMoreAtCursor();
-        compare(testHelper.canIndentListMoreAtCursor(), true);
-        testHelper.indentListMoreAtCursor();
-        compare(testHelper.canIndentListMoreAtCursor(), false);
-
-        compare(testHelper.canIndentListLessAtCursor(), true);
-        testHelper.indentListLessAtCursor();
-        compare(testHelper.canIndentListLessAtCursor(), true);
-        testHelper.indentListLessAtCursor();
-        compare(testHelper.canIndentListLessAtCursor(), true);
-        testHelper.indentListLessAtCursor();
-        compare(testHelper.canIndentListLessAtCursor(), false);
-    }
-
-    function test_forceActiveFocus(): void {
-        textEdit2.forceActiveFocus();
-        compare(textEdit.activeFocus, false);
-        testHelper.forceActiveFocus();
-        compare(textEdit.activeFocus, true);
-    }
-}

autotests/chattextitemhelpertesthelper.h

@@ -1,218 +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 <QQuickItem>
-#include <QQuickTextDocument>
-#include <QTextCursor>
-#include <QTextDocumentFragment>
-
-#include "chattextitemhelper.h"
-
-class ChatTextItemHelperTestHelper : public QObject
-{
-    Q_OBJECT
-    QML_ELEMENT
-
-    /**
-     * @brief The QML text Item the TextItemHelper is handling.
-     */
-    Q_PROPERTY(ChatTextItemHelper *textItem READ textItem WRITE setTextItem NOTIFY textItemChanged)
-
-public:
-    explicit ChatTextItemHelperTestHelper(QObject *parent = nullptr)
-        : QObject(parent)
-    {
-    }
-
-    ChatTextItemHelper *textItem() const
-    {
-        return m_textItem;
-    }
-    void setTextItem(ChatTextItemHelper *textItem)
-    {
-        if (textItem == m_textItem) {
-            return;
-        }
-        m_textItem = textItem;
-        Q_EMIT textItemChanged();
-    }
-
-    Q_INVOKABLE void setFixedChars(const QString &startChars, const QString &endChars)
-    {
-        if (!m_textItem) {
-            return;
-        }
-        m_textItem->setFixedChars(startChars, endChars);
-    }
-
-    Q_INVOKABLE bool compareDocuments(QQuickTextDocument *document)
-    {
-        if (!m_textItem) {
-            return false;
-        }
-        return document->textDocument() == m_textItem->document();
-    }
-
-    Q_INVOKABLE int lineCount()
-    {
-        if (!m_textItem) {
-            return -1;
-        }
-        return m_textItem->lineCount();
-    }
-
-    Q_INVOKABLE QString firstBlockText()
-    {
-        if (!m_textItem) {
-            return {};
-        }
-        return m_textItem->takeFirstBlock().toPlainText();
-    }
-
-    Q_INVOKABLE bool checkFragments(const QString &before, const QString &mid, const QString &after)
-    {
-        if (!m_textItem) {
-            return false;
-        }
-
-        bool hasBefore = false;
-        QTextDocumentFragment midFragment;
-        std::optional<QTextDocumentFragment> afterFragment = std::nullopt;
-        m_textItem->fillFragments(hasBefore, midFragment, afterFragment);
-
-        return hasBefore && m_textItem->document()->toPlainText() == before && midFragment.toPlainText() == mid && after.isEmpty()
-            ? !afterFragment
-            : afterFragment->toPlainText() == after;
-    }
-
-    Q_INVOKABLE void insertFragment(const QString &text, ChatTextItemHelper::InsertPosition position = ChatTextItemHelper::Cursor, bool keepPosition = false)
-    {
-        if (!m_textItem) {
-            return;
-        }
-        const auto fragment = QTextDocumentFragment::fromPlainText(text);
-        m_textItem->insertFragment(fragment, position, keepPosition);
-    }
-
-    Q_INVOKABLE bool compareCursor(int cursorPosition, int selectionStart, int selectionEnd)
-    {
-        if (!m_textItem) {
-            return false;
-        }
-        const auto cursor = m_textItem->textCursor();
-        if (cursor.isNull()) {
-            return false;
-        }
-        const auto posSame = cursor.position() == cursorPosition;
-        const auto startSame = cursor.selectionStart() == selectionStart;
-        const auto endSame = cursor.selectionEnd() == selectionEnd;
-        return posSame && startSame && endSame;
-    }
-
-    Q_INVOKABLE int cursorPosition() const
-    {
-        if (!m_textItem) {
-            return -1;
-        }
-        return *m_textItem->cursorPosition();
-    }
-
-    Q_INVOKABLE void setCursorPosition(int pos)
-    {
-        if (!m_textItem) {
-            return;
-        }
-        m_textItem->setCursorPosition(pos);
-    }
-
-    Q_INVOKABLE void setCursorVisible(bool visible)
-    {
-        if (!m_textItem) {
-            return;
-        }
-        m_textItem->setCursorVisible(visible);
-    }
-
-    Q_INVOKABLE void setCursorFromTextItem(QQuickItem *item, bool infront, int cursorPos)
-    {
-        if (!m_textItem) {
-            return;
-        }
-        const auto textItem = new ChatTextItemHelper(this);
-        textItem->setTextItem(item);
-        textItem->setCursorPosition(cursorPos);
-        m_textItem->setCursorFromTextItem(textItem, infront);
-        textItem->deleteLater();
-    }
-
-    Q_INVOKABLE void mergeFormatOnCursor(RichFormat::Format format)
-    {
-        if (!m_textItem) {
-            return;
-        }
-        m_textItem->mergeFormatOnCursor(format);
-    }
-
-    Q_INVOKABLE bool checkFormatsAtCursor(QList<RichFormat::Format> formats)
-    {
-        const auto cursor = m_textItem->textCursor();
-        if (cursor.isNull()) {
-            return false;
-        }
-        return RichFormat::formatsAtCursor(cursor) == formats;
-    }
-
-    Q_INVOKABLE bool canIndentListMoreAtCursor() const
-    {
-        if (!m_textItem) {
-            return false;
-        }
-        return m_textItem->canIndentListMoreAtCursor();
-    }
-    Q_INVOKABLE bool canIndentListLessAtCursor() const
-    {
-        if (!m_textItem) {
-            return false;
-        }
-        return m_textItem->canIndentListLessAtCursor();
-    }
-    Q_INVOKABLE void indentListMoreAtCursor()
-    {
-        if (!m_textItem) {
-            return;
-        }
-        m_textItem->indentListMoreAtCursor();
-    }
-    Q_INVOKABLE void indentListLessAtCursor()
-    {
-        if (!m_textItem) {
-            return;
-        }
-        m_textItem->indentListLessAtCursor();
-    }
-
-    Q_INVOKABLE void forceActiveFocus() const
-    {
-        if (!m_textItem) {
-            return;
-        }
-        m_textItem->forceActiveFocus();
-    }
-
-    Q_INVOKABLE QString markdownText() const
-    {
-        if (!m_textItem) {
-            return {};
-        }
-        return m_textItem->markdownText();
-    }
-
-Q_SIGNALS:
-    void textItemChanged();
-
-private:
-    QPointer<ChatTextItemHelper> m_textItem;
-};

autotests/modeltest.cpp

@@ -29,7 +29,6 @@
 #include "models/livelocationsmodel.h"
 #include "models/locationsmodel.h"
 #include "models/messagecontentfiltermodel.h"
-#include "models/messagecontentmodel.h"
 #include "models/notificationsmodel.h"
 #include "models/permissionsmodel.h"
 #include "models/pinnedmessagemodel.h"
@@ -180,7 +179,7 @@ void ModelTest::testRoomTreeModel()
 
 void ModelTest::testMessageContentModel()
 {
-    auto contentModel = std::make_unique<MessageContentModel>(room, eventId);
+    auto contentModel = std::make_unique<MessageContentModel>(room, nullptr, eventId);
     auto tester = new QAbstractItemModelTester(contentModel.get(), contentModel.get());
     tester->setUseFetchMore(true);
 }
@@ -194,23 +193,21 @@ void ModelTest::testEventMessageContentModel()
 
 void ModelTest::testThreadModel()
 {
-    auto model = std::make_unique<ThreadModel>(eventId, room);
-    auto tester = new QAbstractItemModelTester(model.get(), model.get());
+    auto model = new ThreadModel(eventId, room);
+    auto tester = new QAbstractItemModelTester(model, model);
     tester->setUseFetchMore(true);
 }
 
 void ModelTest::testThreadFetchModel()
 {
-    auto threadModel = std::make_unique<ThreadModel>(eventId, room);
-    auto model = new ThreadFetchModel(threadModel.get());
+    auto model = new ThreadFetchModel(new ThreadModel(eventId, room));
     auto tester = new QAbstractItemModelTester(model, model);
     tester->setUseFetchMore(true);
 }
 
 void ModelTest::testThreadChatBarModel()
 {
-    auto threadModel = std::make_unique<ThreadModel>(eventId, room);
-    auto model = new ThreadChatBarModel(threadModel.get(), room);
+    auto model = new ThreadChatBarModel(new ThreadModel(eventId, room), room);
     auto tester = new QAbstractItemModelTester(model, model);
     tester->setUseFetchMore(true);
 }
@@ -400,7 +397,9 @@ void ModelTest::testCompletionModel()
     auto model = new CompletionModel(this);
     auto tester = new QAbstractItemModelTester(model, model);
     tester->setUseFetchMore(true);
+    model->setRoom(room);
     model->setAutoCompletionType(CompletionModel::Room);
+    model->setText(u"foo"_s, u"#foo"_s);
     auto roomListModel = new RoomListModel(this);
     roomListModel->setConnection(connection);
     model->setRoomListModel(roomListModel);

autotests/qmltest.cpp

@@ -1,9 +0,0 @@
-/*
- *  SPDX-FileCopyrightText: 2020 Arjen Hiemstra <ahiemstra@heimr.nl>
- *
- *  SPDX-License-Identifier: LGPL-2.0-or-later
- */
-
-#include <quicktest.h>
-
-QUICK_TEST_MAIN(NeoChat)

autotests/server.cpp

@@ -121,7 +121,7 @@ void Server::start()
     QFile key(QStringLiteral(DATA_DIR) + u"/localhost.key"_s);
     void(key.open(QFile::ReadOnly));
     config.setPrivateKey(QSslKey(&key, QSsl::Rsa));
-    config.setLocalCertificate(QSslCertificate::fromPath(QStringLiteral(DATA_DIR) + u"/localhost.crt"_s).constFirst());
+    config.setLocalCertificate(QSslCertificate::fromPath(QStringLiteral(DATA_DIR) + u"/localhost.crt"_s).front());
     m_sslServer.setSslConfiguration(config);
     if (!m_sslServer.listen(QHostAddress::LocalHost, 1234) || !m_server.bind(&m_sslServer)) {
         qFatal() << "Server failed to listen on a port.";
@@ -227,8 +227,7 @@ void Server::sync(const QHttpServerRequest &request, QHttpServerResponder &respo
     QJsonObject joinRooms;
     auto token = request.query().queryItemValue(u"since"_s).toInt();
 
-    const auto changes = m_state.mid(token);
-    for (const auto &change : changes) {
+    for (const auto &change : m_state.mid(token)) {
         for (const auto &newRoom : change.newRooms) {
             QJsonArray stateEvents;
             stateEvents += QJsonObject{
@@ -273,7 +272,7 @@ void Server::sync(const QHttpServerRequest &request, QHttpServerResponder &respo
         }
     }
 
-    for (const auto &change : changes) {
+    for (const auto &change : m_state.mid(token)) {
         for (const auto &invitation : change.invitations) {
             // TODO: The invitation could be for a room we haven't joined yet. Shouldn't be necessary for now, though.
             auto stateEvents = joinRooms[invitation.roomId][u"state"_s][u"events"_s].toArray();
@@ -300,7 +299,7 @@ void Server::sync(const QHttpServerRequest &request, QHttpServerResponder &respo
         }
     }
 
-    for (const auto &change : changes) {
+    for (const auto &change : m_state.mid(token)) {
         for (const auto &ban : change.bans) {
             // TODO: The ban could be for a room we haven't joined yet. Shouldn't be necessary for now, though.
             auto stateEvents = joinRooms[ban.roomId][u"state"_s][u"events"_s].toArray();
@@ -327,7 +326,7 @@ void Server::sync(const QHttpServerRequest &request, QHttpServerResponder &respo
         }
     }
 
-    for (const auto &change : changes) {
+    for (const auto &change : m_state.mid(token)) {
         for (const auto &join : change.joins) {
             // TODO: The join could be for a room we haven't joined yet. Shouldn't be necessary for now, though.
             auto stateEvents = joinRooms[join.roomId][u"state"_s][u"events"_s].toArray();
@@ -354,7 +353,7 @@ void Server::sync(const QHttpServerRequest &request, QHttpServerResponder &respo
         }
     }
 
-    for (const auto &change : changes) {
+    for (const auto &change : m_state.mid(token)) {
         for (const auto &state : change.stateEvents) {
             const auto &roomId = state.fullJson[u"room_id"_s].toString();
             // TODO: The join could be for a room we haven't joined yet. Shouldn't be necessary for now, though.
@@ -366,7 +365,7 @@ void Server::sync(const QHttpServerRequest &request, QHttpServerResponder &respo
         }
     }
 
-    for (const auto &change : changes) {
+    for (const auto &change : m_state.mid(token)) {
         for (const auto &event : change.events) {
             // TODO the room might be in a different join state.
             auto timeline = joinRooms[event.fullJson[u"room_id"_s].toString()][u"timeline"_s][u"events"_s].toArray();

autotests/windowcontrollertest.cpp

@@ -73,16 +73,6 @@ void WindowControllerTest::toggle()
     instance.toggleWindow();
     QCOMPARE(window.windowState(), Qt::WindowNoState);
     QCOMPARE(window.isVisible(), false);
-
-    // make sure we restore maximized state when toggling
-    instance.toggleWindow();
-    window.setVisibility(QWindow::Maximized);
-    QCOMPARE(window.windowState(), Qt::WindowMaximized);
-    instance.toggleWindow();
-    QCOMPARE(window.isVisible(), false);
-    instance.toggleWindow();
-    QCOMPARE(window.windowState(), Qt::WindowMaximized);
-    QCOMPARE(window.isVisible(), true);
 }
 
 QTEST_MAIN(WindowControllerTest)

src/app/CMakeLists.txt

@@ -70,6 +70,7 @@ ecm_add_qml_module(neochat URI org.kde.neochat GENERATE_PLUGIN_SOURCE
         qml/AttachmentPane.qml
         qml/QuickFormatBar.qml
         qml/UserDetailDialog.qml
+        qml/OpenFileDialog.qml
         qml/KeyVerificationDialog.qml
         qml/ConfirmLogoutDialog.qml
         qml/VerificationMessage.qml
@@ -78,6 +79,7 @@ ecm_add_qml_module(neochat URI org.kde.neochat GENERATE_PLUGIN_SOURCE
         qml/EmojiSas.qml
         qml/VerificationCanceled.qml
         qml/MessageSourceSheet.qml
+        qml/LocationChooser.qml
         qml/InvitationView.qml
         qml/AvatarTabButton.qml
         qml/OsmLocationPlugin.qml
@@ -103,6 +105,7 @@ ecm_add_qml_module(neochat URI org.kde.neochat GENERATE_PLUGIN_SOURCE
         qml/HoverLinkIndicator.qml
         qml/AvatarNotification.qml
         qml/ReasonDialog.qml
+        qml/NewPollDialog.qml
         qml/UserMenu.qml
         qml/MeetingDialog.qml
         qml/SeenByDialog.qml
@@ -171,7 +174,12 @@ ecm_add_app_icon(NEOCHAT_ICON ICONS ${CMAKE_SOURCE_DIR}/128-logo.png)
 target_sources(neochat-app PRIVATE ${NEOCHAT_ICON})
 
 if(NOT ANDROID)
-    target_sources(neochat PRIVATE trayicon.cpp trayicon.h)
+    if (NOT WIN32 AND NOT APPLE)
+        target_sources(neochat PRIVATE trayicon_sni.cpp trayicon_sni.h)
+        target_link_libraries(neochat PRIVATE KF6::StatusNotifierItem)
+    else()
+        target_sources(neochat PRIVATE trayicon.cpp trayicon.h)
+    endif()
     target_link_libraries(neochat PUBLIC KF6::WindowSystem)
     target_compile_definitions(neochat PUBLIC -DHAVE_WINDOWSYSTEM)
 endif()

src/app/controller.cpp

@@ -29,8 +29,10 @@
 #include "proxycontroller.h"
 #include "roommanager.h"
 
-#if !defined(Q_OS_ANDROID)
+#if defined(Q_OS_WIN) || defined(Q_OS_MAC)
 #include "trayicon.h"
+#elif !defined(Q_OS_ANDROID)
+#include "trayicon_sni.h"
 #endif
 
 #ifdef HAVE_KUNIFIEDPUSH

src/app/models/commonroomsmodel.cpp

@@ -74,11 +74,6 @@ QHash<int, QByteArray> CommonRoomsModel::roleNames() const
     };
 }
 
-bool CommonRoomsModel::loading() const
-{
-    return m_loading;
-}
-
 void CommonRoomsModel::reload()
 {
     if (!m_connection || m_userId.isEmpty()) {
@@ -94,26 +89,15 @@ void CommonRoomsModel::reload()
         return;
     }
 
-    m_loading = true;
-    Q_EMIT loadingChanged();
-
-    m_connection->callApi<NeochatGetCommonRoomsJob>(m_userId)
-        .then([this](const auto job) {
-            const auto &replyData = job->jsonData();
-            beginResetModel();
-            for (const auto &roomId : replyData[u"joined"_s].toArray()) {
-                m_commonRooms.push_back(roomId.toString());
-            }
-            endResetModel();
-            Q_EMIT countChanged();
-
-            m_loading = false;
-            Q_EMIT loadingChanged();
-        })
-        .onFailure([this] {
-            m_loading = false;
-            Q_EMIT loadingChanged();
-        });
+    m_connection->callApi<NeochatGetCommonRoomsJob>(m_userId).then([this](const auto job) {
+        const auto &replyData = job->jsonData();
+        beginResetModel();
+        for (const auto &roomId : replyData[u"joined"_s].toArray()) {
+            m_commonRooms.push_back(roomId.toString());
+        }
+        endResetModel();
+        Q_EMIT countChanged();
+    });
 }
 
 #include "moc_commonroomsmodel.cpp"

src/app/models/commonroomsmodel.h

@@ -21,7 +21,6 @@ class CommonRoomsModel : public QAbstractListModel
     Q_PROPERTY(NeoChatConnection *connection WRITE setConnection READ connection NOTIFY connectionChanged REQUIRED)
     Q_PROPERTY(QString userId WRITE setUserId READ userId NOTIFY userIdChanged REQUIRED)
     Q_PROPERTY(int count READ rowCount NOTIFY countChanged)
-    Q_PROPERTY(bool loading READ loading NOTIFY loadingChanged)
 
 public:
     enum Roles {
@@ -44,13 +43,10 @@ public:
 
     QHash<int, QByteArray> roleNames() const override;
 
-    bool loading() const;
-
 Q_SIGNALS:
     void connectionChanged();
     void userIdChanged();
     void countChanged();
-    void loadingChanged();
 
 private:
     void reload();
@@ -58,5 +54,4 @@ private:
     QPointer<NeoChatConnection> m_connection;
     QString m_userId;
     QList<QString> m_commonRooms;
-    bool m_loading = false;
 };

src/app/neochatconfig.kcfg

@@ -207,6 +207,10 @@
     </entry>
   </group>
   <group name="FeatureFlags">
+    <entry name="Threads" type="bool">
+      <label>Enable threads</label>
+      <default>false</default>
+    </entry>
     <entry name="Phone3PId" type="bool">
       <label>Enable add phone numbers as 3PIDs</label>
       <default>false</default>

src/app/qml/AccountMenu.qml

@@ -24,9 +24,17 @@ KirigamiComponents.ConvergentContextMenu {
     }
 
     Kirigami.Action {
-        text: i18nc("@action:button", "Open Profile")
-        icon.name: "im-user-symbolic"
-        onTriggered: RoomManager.resolveResource(root.connection.localUserId, "qr") // Use "qr" action to make sure a room isn't passed, see RoomManager::visitUser
+        text: i18nc("@action:button", "Show QR Code")
+        icon.name: "view-barcode-qr-symbolic"
+        onTriggered: {
+            (Qt.createComponent('org.kde.neochat', 'QrCodeMaximizeComponent').createObject(QQC2.Overlay.overlay, {
+                text: "https://matrix.to/#/" + root.connection.localUser.id,
+                title: root.connection.localUser.displayName,
+                subtitle: root.connection.localUser.id,
+                // Note: User::avatarUrl does not set user_id, and thus cannot be used directly here. Hence the makeMediaUrl.
+                avatarSource: root.connection.localUser.avatarUrl.toString().length > 0 ? root.connection.makeMediaUrl(root.connection.localUser.avatarUrl) : ""
+            }) as QrCodeMaximizeComponent).open();
+        }
     }
 
     Kirigami.Action {
@@ -89,9 +97,9 @@ KirigamiComponents.ConvergentContextMenu {
         text: i18nc("@action:inmenu Open support dialog", "Support")
         icon.name: "help-contents-symbolic"
         onTriggered: {
-            (Qt.createComponent("org.kde.neochat", "SupportDialog").createObject(QQC2.Overlay.overlay, {
+            Qt.createComponent("org.kde.neochat", "SupportDialog").createObject(QQC2.Overlay.overlay, {
                 connection: root.connection,
-            }) as SupportDialog).open();
+            }).open();
         }
     }
 

src/app/qml/AvatarTabButton.qml

@@ -21,7 +21,6 @@ Delegates.RoundedItemDelegate {
     signal contextMenuRequested
     signal selected
 
-    activeFocusOnTab: true
     padding: Kirigami.Units.largeSpacing
 
     QQC2.ToolTip.visible: hovered

src/app/qml/ChooseRoomDialog.qml

@@ -4,6 +4,9 @@
 pragma ComponentBehavior: Bound
 
 import QtQuick
+import QtQuick.Controls
+
+import org.kde.kirigami as Kirigami
 
 import org.kde.neochat
 

src/app/qml/CodeMaximizeComponent.qml

@@ -20,9 +20,9 @@ Components.AbstractMaximizeComponent {
     property NeochatRoomMember author
 
     /**
-     * @brief The timestamp of the event as a neoChatDateTime.
+     * @brief The timestamp of the event as a NeoChatDateTime.
      */
-    required property neoChatDateTime dateTime
+    required property NeoChatDateTime dateTime
 
     /**
      * @brief The code text to show.
@@ -79,7 +79,7 @@ Components.AbstractMaximizeComponent {
         QQC2.ScrollBar.horizontal.policy: QQC2.ScrollBar.AlwaysOff
 
         QQC2.TextArea {
-            id: codeTextEdit
+            id: codeText
             topPadding: Kirigami.Units.smallSpacing
             bottomPadding: Kirigami.Units.smallSpacing
             leftPadding: lineNumberColumn.width + lineNumberColumn.anchors.leftMargin + Kirigami.Units.smallSpacing * 2
@@ -100,15 +100,15 @@ Components.AbstractMaximizeComponent {
 
             SyntaxHighlighter {
                 property string definitionName: Repository.definitionForName(root.language).name
-                textEdit: definitionName == "None" ? null : codeTextEdit
+                textEdit: definitionName == "None" ? null : codeText
                 definition: definitionName
             }
             ColumnLayout {
                 id: lineNumberColumn
                 anchors {
-                    top: codeTextEdit.top
-                    topMargin: codeTextEdit.topPadding + 1
-                    left: codeTextEdit.left
+                    top: codeText.top
+                    topMargin: codeText.topPadding + 1
+                    left: codeText.left
                     leftMargin: Kirigami.Units.smallSpacing
                 }
                 spacing: 0
@@ -116,7 +116,7 @@ Components.AbstractMaximizeComponent {
                     id: repeater
                     model: LineModel {
                         id: lineModel
-                        Component.onCompleted: setDocument(codeTextEdit.textDocument)
+                        Component.onCompleted: setDocument(codeText.textDocument)
                     }
                     delegate: QQC2.Label {
                         id: label
@@ -150,6 +150,4 @@ Components.AbstractMaximizeComponent {
             color: Kirigami.Theme.backgroundColor
         }
     }
-
-    onOpened: forceActiveFocus()
 }

src/app/qml/CollapsedRoomDelegate.qml

@@ -3,6 +3,8 @@
 
 import QtQuick
 import QtQuick.Controls as QQC2
+import QtQuick.Layouts
+import QtQml.Models
 
 import org.kde.kirigami as Kirigami
 import org.kde.kirigamiaddons.labs.components as KirigamiComponents

src/app/qml/ConfirmLeaveDialog.qml

@@ -16,18 +16,19 @@ Kirigami.PromptDialog {
     title: root.room.isSpace ? i18nc("@title:dialog", "Confirm Leaving Space") : i18nc("@title:dialog", "Confirm Leaving Room")
     subtitle: root.room ? i18nc("Do you really want to leave <room name>?", "Do you really want to leave %1?", root.room.displayNameForHtml) : ""
     dialogType: Kirigami.PromptDialog.Warning
-    standardButtons: QQC2.Dialog.Cancel
 
-    onAccepted: root.room.forget()
+    onRejected: {
+        root.close();
+    }
 
     footer: QQC2.DialogButtonBox {
+        standardButtons: QQC2.Dialog.Cancel
+
         QQC2.Button {
-            text: i18nc("@action:button Leave this room/space", "Leave")
-            icon.name: "arrow-left-symbolic"
-
-            onClicked: root.accept()
-
+            text: i18nc("@action:button", "Leave Room")
             QQC2.DialogButtonBox.buttonRole: QQC2.DialogButtonBox.AcceptRole
+            icon.name: "arrow-left-symbolic"
+            onClicked: root.room.forget();
         }
     }
 }

src/app/qml/ConfirmLogoutDialog.qml

@@ -15,16 +15,22 @@ Kirigami.PromptDialog {
     title: i18nc("@title:dialog", "Sign out")
     subtitle: i18n("Are you sure you want to sign out?")
     dialogType: Kirigami.PromptDialog.Warning
-    standardButtons: QQC2.Dialog.Cancel
 
-    onAccepted: root.connection.logout(true)
+    onRejected: {
+        root.close();
+    }
 
     footer: QQC2.DialogButtonBox {
+        standardButtons: QQC2.Dialog.Cancel
+
         QQC2.Button {
             text: i18nc("@action:button", "Sign out")
-            onClicked: root.accept()
-
             QQC2.DialogButtonBox.buttonRole: QQC2.DialogButtonBox.AcceptRole
+            onClicked: {
+                root.connection.logout(true);
+                root.close();
+                root.accepted();
+            }
         }
     }
 }

src/app/qml/ConfirmUrlDialog.qml

@@ -17,5 +17,12 @@ Kirigami.PromptDialog {
 
     standardButtons: QQC2.DialogButtonBox.Open | QQC2.DialogButtonBox.Cancel
 
-    onAccepted: Qt.openUrlExternally(root.link)
+    onAccepted: {
+        Qt.openUrlExternally(root.link);
+        root.close();
+    }
+
+    onRejected: {
+        root.close();
+    }
 }

src/app/qml/EmojiSas.qml

@@ -41,11 +41,13 @@ ColumnLayout {
         Layout.fillWidth: true
         Layout.alignment: Qt.AlignHCenter
         QQC2.Button {
+            anchors.bottom: parent.bottom
             text: i18n("They match")
             icon.name: "dialog-ok"
             onClicked: root.accept()
         }
         QQC2.Button {
+            anchors.bottom: parent.bottom
             text: i18n("They don't match")
             icon.name: "dialog-cancel"
             onClicked: root.reject()

src/app/qml/ExplorerDelegate.qml

@@ -9,6 +9,8 @@ import org.kde.kirigami as Kirigami
 import org.kde.kirigamiaddons.delegates as Delegates
 import org.kde.kirigamiaddons.labs.components as Components
 
+import org.kde.neochat
+
 Delegates.RoundedItemDelegate {
     id: root
 

src/app/qml/InvitationView.qml

@@ -166,7 +166,7 @@ ColumnLayout {
     }
 
     RowLayout {
-        visible: (root.currentRoom.connection as NeoChatConnection).canCheckMutualRooms
+        visible: root.currentRoom.connection.canCheckMutualRooms
         spacing: 0
 
         Layout.topMargin: Kirigami.Units.largeSpacing * 2

src/app/qml/KeyVerificationDialog.qml

@@ -1,8 +1,6 @@
 // SPDX-FileCopyrightText: 2022 Tobias Fella <tobias.fella@kde.org>
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-pragma ComponentBehavior: Bound
-
 import QtQuick
 import QtQuick.Controls as QQC2
 import QtQuick.Layouts
@@ -10,6 +8,7 @@ import QtQuick.Window
 import QtQml
 
 import org.kde.kirigami as Kirigami
+import org.kde.kirigamiaddons.delegates as Delegates
 import org.kde.neochat
 
 Kirigami.Page {

src/app/qml/LocationChooser.qml

@@ -2,6 +2,8 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
 import QtLocation
 import QtPositioning
 
@@ -43,8 +45,6 @@ Components.AbstractMaximizeComponent {
         }
     ]
 
-    onOpened: forceActiveFocus()
-
     PositionSource {
         id: positionSource
 

src/app/qml/Main.qml

@@ -100,7 +100,7 @@ Kirigami.ApplicationWindow {
 
         function onCurrentRoomChanged() {
             if (RoomManager.currentRoom && root.pageStack.depth <= 1 && root.initialized && Kirigami.Settings.isMobile) {
-                let roomPage = root.pageStack.push(Qt.createComponent('org.kde.neochat', 'RoomPage'));
+                let roomPage = pageStack.push(Qt.createComponent('org.kde.neochat', 'RoomPage'));
                 roomPage.forceActiveFocus();
                 roomPage.backRequested.connect(event => {
                     RoomManager.clearCurrentRoom();
@@ -151,6 +151,8 @@ Kirigami.ApplicationWindow {
     }
 
     contextDrawer: RoomDrawer {
+        id: contextDrawer
+
         // This is a memory for all user initiated actions on the drawer, i.e. clicking the button
         // It is used to ensure that user choice is remembered when changing pages and expanding and contracting the window width
         property bool drawerUserState: NeoChatConfig.autoRoomInfoDrawer
@@ -176,9 +178,9 @@ Kirigami.ApplicationWindow {
 
         // Connect to the onClicked function of the RoomDrawer handle button
         Connections {
-            target: root.contextDrawer.handle.children[0]
+            target: contextDrawer.handle.children[0]
             function onClicked() {
-                root.contextDrawer.drawerUserState = root.contextDrawer.drawerOpen;
+                contextDrawer.drawerUserState = contextDrawer.drawerOpen;
             }
         }
 

src/app/qml/ManualRoomDialog.qml

@@ -4,7 +4,6 @@
 import QtQuick
 import QtQuick.Window
 import QtQuick.Layouts
-import QtQuick.Controls as QQC2
 
 import org.kde.kirigami as Kirigami
 import org.kde.kirigamiaddons.formcard as FormCard
@@ -25,8 +24,6 @@ Kirigami.Dialog {
     signal roomSelected(string roomId, string displayName, url avatarUrl, string alias, string topic, int memberCount, bool isJoined)
 
     title: i18nc("@title", "Manually Enter a Room")
-    showCloseButton: false
-    standardButtons: QQC2.Dialog.Cancel
 
     width: Math.min(root.Window.window.width, Kirigami.Units.gridUnit * 24)
     leftPadding: 0
@@ -34,26 +31,35 @@ Kirigami.Dialog {
     topPadding: 0
     bottomPadding: 0
 
-    onAccepted: {
-        // We don't necessarily have all the info so fill out the best we can.
-        let roomId = roomIdAliasText.isAlias() ? "" : roomIdAliasText.text;
-        let displayName = "";
-        let avatarUrl = "";
-        let alias = roomIdAliasText.isAlias() ? roomIdAliasText.text : "";
-        let topic = "";
-        let memberCount = -1;
-        let isJoined = false;
-        if (roomIdAliasText.room) {
-            roomId = roomIdAliasText.room.id;
-            displayName = roomIdAliasText.room.displayName;
-            avatarUrl = roomIdAliasText.room.avatarUrl.toString().length > 0 ? connection.makeMediaUrl(roomIdAliasText.room.avatarUrl) : "";
-            alias = roomIdAliasText.room.canonicalAlias;
-            topic = roomIdAliasText.room.topic;
-            memberCount = roomIdAliasText.room.joinedCount;
-            isJoined = true;
+    standardButtons: Kirigami.Dialog.Cancel
+    customFooterActions: [
+        Kirigami.Action {
+            enabled: roomIdAliasText.isValidText
+            text: i18n("OK")
+            icon.name: "dialog-ok"
+            onTriggered: {
+                // We don't necessarily have all the info so fill out the best we can.
+                let roomId = roomIdAliasText.isAlias() ? "" : roomIdAliasText.text;
+                let displayName = "";
+                let avatarUrl = "";
+                let alias = roomIdAliasText.isAlias() ? roomIdAliasText.text : "";
+                let topic = "";
+                let memberCount = -1;
+                let isJoined = false;
+                if (roomIdAliasText.room) {
+                    roomId = roomIdAliasText.room.id;
+                    displayName = roomIdAliasText.room.displayName;
+                    avatarUrl = roomIdAliasText.room.avatarUrl.toString().length > 0 ? connection.makeMediaUrl(roomIdAliasText.room.avatarUrl) : "";
+                    alias = roomIdAliasText.room.canonicalAlias;
+                    topic = roomIdAliasText.room.topic;
+                    memberCount = roomIdAliasText.room.joinedCount;
+                    isJoined = true;
+                }
+                root.roomSelected(roomId, displayName, avatarUrl, alias, topic, memberCount, isJoined);
+                root.close();
+            }
         }
-        root.roomSelected(roomId, displayName, avatarUrl, alias, topic, memberCount, isJoined);
-    }
+    ]
 
     contentItem: ColumnLayout {
         spacing: 0
@@ -104,16 +110,4 @@ Kirigami.Dialog {
         roomIdAliasText.forceActiveFocus();
         timer.restart();
     }
-
-    footer: QQC2.DialogButtonBox {
-        QQC2.Button {
-            text: i18nc("@action:button Join this room/space", "Join")
-            icon.name: "checkmark"
-            enabled: roomIdAliasText.isValidText
-
-            onClicked: root.accept()
-
-            QQC2.DialogButtonBox.buttonRole: QQC2.DialogButtonBox.AcceptRole
-        }
-    }
 }

src/app/qml/ManualUserDialog.qml

@@ -24,16 +24,25 @@ Kirigami.Dialog {
     signal userSelected(string userId)
 
     title: i18nc("@title", "User ID")
-    showCloseButton: false
 
     width: Math.min(QQC2.ApplicationWindow.window.width, Kirigami.Units.gridUnit * 24)
     leftPadding: 0
     rightPadding: 0
     topPadding: 0
     bottomPadding: 0
-    standardButtons: QQC2.Dialog.Cancel
 
-    onAccepted: root.userSelected(userIdText.text)
+    standardButtons: Kirigami.Dialog.Cancel
+    customFooterActions: [
+        Kirigami.Action {
+            enabled: userIdText.isValidText
+            text: i18n("OK")
+            icon.name: "dialog-ok"
+            onTriggered: {
+                root.userSelected(userIdText.text)
+                root.accept();
+            }
+        }
+    ]
 
     contentItem: ColumnLayout {
         spacing: 0
@@ -70,16 +79,4 @@ Kirigami.Dialog {
         userIdText.forceActiveFocus();
         timer.restart();
     }
-
-    footer: QQC2.DialogButtonBox {
-        QQC2.Button {
-            text: i18nc("@action:button Perform an action with this user ID", "Ok")
-            icon.name: "checkmark"
-            enabled: userIdText.isValidText
-
-            onClicked: root.accept()
-
-            QQC2.DialogButtonBox.buttonRole: QQC2.DialogButtonBox.AcceptRole
-        }
-    }
 }

src/app/qml/MeetingDialog.qml

@@ -1,10 +1,7 @@
 // SPDX-FileCopyrightText: 2025 Joshua Goins <josh@redstrate.com>
 // SPDX-License-Identifier: GPL-3.0-only
 
-pragma ComponentBehavior: Bound
-
 import QtQuick
-import QtQuick.Controls as QQC2
 
 import org.kde.kirigami as Kirigami
 
@@ -15,16 +12,11 @@ Kirigami.PromptDialog {
 
     title: hasExistingMeeting ? i18nc("@title", "Join Meeting") : i18nc("@title", "Start Meeting")
     subtitle: hasExistingMeeting ? i18nc("@info:label", "You are about to join a Jitsi meeting in your web browser.") : i18nc("@info:label", "You are about to start a new Jitsi meeting in your web browser.")
-    standardButtons: QQC2.Dialog.Cancel
+    standardButtons: Kirigami.Dialog.Cancel
 
-    footer: QQC2.DialogButtonBox {
-        QQC2.Button {
-            icon.name: "camera-video-symbolic"
-            text: root.hasExistingMeeting ? i18nc("@action:button Join the Jitsi meeting", "Join") : i18nc("@action:button Start a new Jitsi meeting", "Start")
-
-            onClicked: root.accept()
-
-            QQC2.DialogButtonBox.buttonRole: QQC2.DialogButtonBox.AcceptRole
-        }
+    customFooterActions: Kirigami.Action {
+        icon.name: "camera-video-symbolic"
+        text: hasExistingMeeting ? i18nc("@action:button Join the Jitsi meeting", "Join") : i18nc("@action:button Start a new Jitsi meeting", "Start")
+        onTriggered: root.accept()
     }
 }

src/app/qml/NewPollDialog.qml

@@ -19,12 +19,22 @@ Kirigami.Dialog {
 
     required property NeoChatRoom room
 
+    standardButtons: Kirigami.Dialog.Cancel
+
+    customFooterActions: [
+        Kirigami.Action {
+            enabled: optionModel.allValuesSet && questionTextField.text.length > 0
+            text: i18nc("@action:button", "Send")
+            icon.name: "document-send"
+            onTriggered: {
+                root.room.postPoll(pollTypeCombo.currentValue, questionTextField.text, optionModel.values())
+                root.close()
+            }
+        }
+    ]
+
     width: Math.min(QQC2.ApplicationWindow.window.width, Kirigami.Units.gridUnit * 24)
     title: i18nc("@title: create new poll in the room", "Create Poll")
-    showCloseButton: false
-    standardButtons: QQC2.Dialog.Cancel
-
-    onAccepted: root.room.postPoll(pollTypeCombo.currentValue, questionTextField.text, optionModel.values())
 
     contentItem: ColumnLayout {
         spacing: 0
@@ -56,7 +66,7 @@ Kirigami.Dialog {
                 id: optionModel
 
                 readonly property bool allValuesSet: {
-                    for (let i = 0; i < optionModel.rowCount(); i++) {
+                    for( var i = 0; i < optionModel.rowCount(); i++ ) {
                         if (optionModel.get(i).optionText.length <= 0) {
                             return false;
                         }
@@ -73,7 +83,7 @@ Kirigami.Dialog {
 
                 function values() {
                     let textValues = []
-                    for(let i = 0; i < optionModel.rowCount(); i++) {
+                    for( var i = 0; i < optionModel.rowCount(); i++ ) {
                         textValues.push(optionModel.get(i).optionText);
                     }
                     return textValues;
@@ -138,16 +148,4 @@ Kirigami.Dialog {
             onClicked: optionModel.append({optionText: ""})
         }
     }
-
-    footer: QQC2.DialogButtonBox {
-        QQC2.Button {
-            enabled: optionModel.allValuesSet && questionTextField.text.length > 0
-            text: i18nc("@action:button", "Send")
-            icon.name: "document-send"
-
-            onClicked: root.accept()
-
-            QQC2.DialogButtonBox.buttonRole: QQC2.DialogButtonBox.AcceptRole
-        }
-    }
 }

src/app/qml/QrScannerPage.qml

@@ -18,7 +18,7 @@ Kirigami.Page {
     required property NeoChatConnection connection
     padding: 0
 
-    Component.onCompleted: session.camera.start()
+    Component.onCompleted: camera.start()
 
     Connections {
         target: root.QQC2.ApplicationWindow.window
@@ -66,8 +66,12 @@ Kirigami.Page {
     CaptureSession {
         id: session
 
-        camera: Camera {}
-        imageCapture: ImageCapture {}
+        camera: Camera {
+            id: camera
+        }
+        imageCapture: ImageCapture {
+            id: imageCapture
+        }
         videoOutput: viewFinder
     }
 }

src/app/qml/ReasonDialog.qml

@@ -30,7 +30,7 @@ Kirigami.Page {
         type: Kirigami.MessageType.Information
         position: Kirigami.InlineMessage.Position.Header
 
-        text: xi18nc("@info", "This report will <strong>only</strong> be sent to the administrators of <link>%1</link> (your server).", root.connection.domain)
+        text: xi18n("This report will <strong>only</strong> be sent to the administrators of <link>%1</link> (your server).", root.connection.domain)
     }
 
     QQC2.TextArea {

src/app/qml/RoomPage.qml

@@ -80,12 +80,6 @@ Kirigami.Page {
     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.
-        resetViewSettling();
-    }
-
-    // Resets the view settling of the timeline.
-    // This should be called whenever the apparent height of the timeline changes, or else the view will scroll on its own!
-    function resetViewSettling(): void {
         (timelineViewLoader.item as TimelineView).resetViewSettling();
     }
 
@@ -110,8 +104,8 @@ Kirigami.Page {
             enabled: hasExistingMeeting || canStartNewMeeting
             visible: root.currentRoom && !root.currentRoom.isSpace
             onTriggered: {
-                const dialog = Qt.createComponent("org.kde.neochat", "MeetingDialog").createObject(QQC2.Overlay.overlay, { hasExistingMeeting }) as MeetingDialog;
-                dialog.accepted.connect(doAction);
+                const dialog = Qt.createComponent("org.kde.neochat", "MeetingDialog").createObject(QQC2.Overlay.overlay, { hasExistingMeeting });
+                dialog.onAccepted.connect(doAction);
                 dialog.open();
             }
 
@@ -178,7 +172,7 @@ Kirigami.Page {
 
         spacing: 0
 
-        readonly property bool shouldShowPins: root.currentRoom?.pinnedMessage.length > 0 && !Kirigami.Settings.isMobile
+        readonly property bool shouldShowPins: root.currentRoom.pinnedMessage.length > 0 && !Kirigami.Settings.isMobile
 
         QQC2.Control {
             id: pinControl
@@ -221,7 +215,7 @@ Kirigami.Page {
             }
 
             TapHandler {
-                onTapped: (root.Kirigami.PageStack.pageStack as Kirigami.PageRow).pushDialogLayer(Qt.createComponent('org.kde.neochat', 'RoomPinnedMessagesPage'), {
+                onTapped: pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'RoomPinnedMessagesPage'), {
                     room: root.currentRoom
                 }, {
                     title: i18nc("@title", "Pinned Messages")
@@ -235,58 +229,6 @@ Kirigami.Page {
             Layout.fillWidth: true
         }
 
-        Kirigami.InlineMessage {
-            id: selectedMessagesControl
-
-            Layout.fillWidth: true
-
-            showCloseButton: false
-            visible: root.currentRoom?.selectedMessageCount > 0
-            position: Kirigami.InlineMessage.Position.Header
-            type: Kirigami.MessageType.Positive
-            icon.name: "edit-select-all-symbolic"
-
-            text: i18nc("@info", "Selected Messages: %1", root.currentRoom?.selectedMessageCount)
-
-            actions: [
-                Kirigami.Action {
-                    text: i18nc("@action:button", "Copy Conversation")
-                    icon.name: "edit-copy"
-                    onTriggered: {
-                        Clipboard.saveText(root.currentRoom.getFormattedSelectedMessages())
-                        showPassiveNotification(i18nc("@info", "Conversation copied to clipboard"));
-                    }
-                },
-                Kirigami.Action {
-                    text: i18nc("@action:button", "Delete Messages")
-                    icon.name: "trash-empty-symbolic"
-                    icon.color: Kirigami.Theme.negativeTextColor
-                    enabled: root.currentRoom?.canDeleteSelectedMessages
-                    onTriggered: {
-                        let dialog = pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'ReasonDialog'), {
-                            title: i18nc("@title:dialog", "Remove Messages"),
-                            placeholder: i18nc("@info:placeholder", "Optionally give a reason for removing these messages"),
-                            actionText: i18nc("@action:button 'Remove' as in 'Remove these messages'", "Remove"),
-                            icon: "delete",
-                            reporting: false,
-                            connection: root.currentRoom.connection,
-                        }, {
-                            title: i18nc("@title:dialog", "Remove Messages"),
-                            width: Kirigami.Units.gridUnit * 25
-                        }) as ReasonDialog;
-                        dialog.accepted.connect(reason => {
-                            root.currentRoom.deleteSelectedMessages(reason);
-                        });
-                    }
-                },
-                Kirigami.Action {
-                    icon.name: "dialog-close"
-                    icon.color: Kirigami.Theme.negativeTextColor
-                    onTriggered: root.currentRoom.clearSelectedMessages()
-                }
-            ]
-        }
-
         Kirigami.InlineMessage {
             id: banner
 
@@ -361,9 +303,7 @@ Kirigami.Page {
             id: chatBar
             width: parent.width
             currentRoom: root.currentRoom
-
-            // Creating a reply (or doing anything in the chat bar) can change the height, but this isn't picked up on the root's onHeightChanged.
-            onHeightChanged: root.resetViewSettling()
+            connection: root.currentRoom.connection as NeoChatConnection
         }
     }
 

src/app/qml/SupportDialog.qml

@@ -1,8 +1,6 @@
 // SPDX-FileCopyrightText: 2026 Joshua Goins <josh@redstrate.com>
 // SPDX-License-Identifier: GPL-3.0-only
 
-pragma ComponentBehavior: Bound
-
 import QtQuick
 import QtQuick.Controls as QQC2
 import QtQuick.Layouts

src/app/qml/UnlockSSSSDialog.qml

@@ -13,7 +13,7 @@ FormCard.FormCardPage {
 
     property bool processing: false
 
-    title: i18nc("@title:window", "Manage Key Storage")
+    title: i18nc("@title:window", "Manage Secret Backup")
 
     topPadding: Kirigami.Units.gridUnit
     leftPadding: 0
@@ -32,7 +32,7 @@ FormCard.FormCardPage {
         function onKeyBackupError(): void {
             securityKeyField.clear()
             root.processing = false
-            banner.text = i18nc("@info:status", "The recovery key was not correct.")
+            banner.text = i18nc("@info:status", "The security key or backup passphrase was not correct.")
             banner.visible = true
         }
 
@@ -45,20 +45,20 @@ FormCard.FormCardPage {
     }
 
     FormCard.FormHeader {
-        title: i18nc("@title", "Unlock using Recovery Key")
+        title: i18nc("@title", "Unlock using Security Key or Backup Passphrase")
     }
     FormCard.FormCard {
         FormCard.FormTextDelegate {
-            description: i18nc("@info", "If you have a recovery key (also known as a “security key” or “backup passphrase”), enter it below or upload it as a file.")
+            description: i18nc("@info", "If you have a security key or backup passphrase for this account, enter it below or upload it as a file.")
         }
         FormCard.FormTextFieldDelegate {
             id: securityKeyField
-            label: i18nc("@label:textbox", "Recovery Key:")
+            label: i18nc("@label:textbox", "Security Key or Backup Passphrase:")
             echoMode: TextInput.Password
         }
         FormCard.FormButtonDelegate {
             id: uploadSecurityKeyButton
-            text: i18nc("@action:button", "Upload From File")
+            text: i18nc("@action:button", "Upload from File")
             icon.name: "cloud-upload"
             enabled: !root.processing
             onClicked: {
@@ -83,12 +83,12 @@ FormCard.FormCardPage {
     }
     FormCard.FormCard {
         FormCard.FormTextDelegate {
-            description: i18nc("@info", "If you have previously verified this device, you request encryption keys from other verified devices.")
+            description: i18nc("@info", "If you have previously verified this device, you can try loading the backup key from other devices by clicking the button below.")
         }
         FormCard.FormButtonDelegate {
             id: unlockCrossSigningButton
             icon.name: "emblem-shared-symbolic"
-            text: i18nc("@action:button", "Request From Other Devices")
+            text: i18nc("@action:button", "Request from other Devices")
             enabled: !root.processing
             onClicked: {
                 root.processing = true

src/app/qml/UserDetailDialog.qml

@@ -8,6 +8,7 @@ import QtQuick.Layouts
 
 import org.kde.kirigami as Kirigami
 import org.kde.kirigamiaddons.components as KirigamiComponents
+import org.kde.kirigamiaddons.formcard as FormCard
 import org.kde.prison
 
 import org.kde.neochat
@@ -125,7 +126,7 @@ Kirigami.Dialog {
                         text: root.shareUrl,
                         title: root.displayName,
                         subtitle: root.user.id,
-                        avatarColor: root.room?.member(root.user.id).color ?? null,
+                        avatarColor: root.room?.member(root.user.id).color,
                         avatarSource: avatar.source,
                     }) as QrCodeMaximizeComponent;
                     root.close();
@@ -401,36 +402,18 @@ Kirigami.Dialog {
         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.connection.canCheckMutualRooms
+            visible: !root.isSelf && root.hasMutualRooms
 
             Layout.topMargin: Kirigami.Units.largeSpacing
         }
 
         RowLayout {
             spacing: Kirigami.Units.smallSpacing
-            visible: !root.isSelf && root.connection.canCheckMutualRooms
+            visible: !root.isSelf && root.hasMutualRooms
 
             Layout.topMargin: Kirigami.Units.smallSpacing
 
-            QQC2.BusyIndicator {
-                visible: roomRepeater.count === 0 && root.model.loading
-
-                Layout.preferredWidth: Kirigami.Units.iconSizes.medium
-                Layout.preferredHeight: Kirigami.Units.iconSizes.medium
-            }
-
-            QQC2.Label {
-                visible: roomRepeater.count === 0 && !root.model.loading
-                text: i18nc("@info:label", "No rooms in common")
-                verticalAlignment: Text.AlignVCenter
-
-                Layout.preferredHeight: Kirigami.Units.iconSizes.medium
-                Layout.fillHeight: true
-            }
-
             Repeater {
-                id: roomRepeater
-
                 model: root.limiterModel
 
                 delegate: KirigamiComponents.AvatarButton {

src/app/qml/UserMenu.qml

@@ -16,7 +16,7 @@ KirigamiComponents.ConvergentContextMenu {
     id: root
 
     required property Kirigami.ApplicationWindow window
-    required property NeochatRoomMember author
+    required property var author
 
     headerContentItem: RowLayout {
         id: detailRow
@@ -68,7 +68,7 @@ KirigamiComponents.ConvergentContextMenu {
         text: i18nc("@action:button", "Mention")
         icon.name: "username-copy-symbolic"
         onTriggered: {
-            RoomManager.currentRoom.mainCache.mentionAdded(root.author.disambiguatedName, "https://matrix.to/#/" + root.author.id);
+            RoomManager.currentRoom.mainCache.mentionAdded(root.author.id);
         }
     }
 }

src/app/roommanager.cpp

@@ -129,6 +129,15 @@ RoomManager::RoomManager(QObject *parent)
             m_messageFilterModel->invalidate();
         }
     });
+    ContentProvider::self().setThreadsEnabled(NeoChatConfig::threads());
+    MessageModel::setThreadsEnabled(NeoChatConfig::threads());
+    connect(NeoChatConfig::self(), &NeoChatConfig::ThreadsChanged, this, [this] {
+        ContentProvider::self().setThreadsEnabled(NeoChatConfig::threads());
+        MessageModel::setThreadsEnabled(NeoChatConfig::threads());
+        if (m_timelineModel) {
+            Q_EMIT m_timelineModel->threadsEnabledChanged();
+        }
+    });
     connect(NeoChatConfig::self(), &NeoChatConfig::SortOrderChanged, this, [this]() {
         m_sortFilterRoomTreeModel->invalidate();
     });
@@ -537,14 +546,13 @@ void RoomManager::setCurrentSpace(const QString &spaceId, bool goToLastUsedRoom)
         LastRoomBlocker blocker(this);
 
         // 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() && m_connection->room(lastRoom)) {
+        if (const auto &lastRoom = m_lastRoomConfig.readEntry(spaceId.isEmpty() ? u"Home"_s : spaceId, QString()); !lastRoom.isEmpty()) {
             resolveResource(lastRoom, "no_join"_L1);
             return;
         }
 
         // If no last room was opened, go to the space home:
-        if (!spaceId.isEmpty() && spaceId != u"DM"_s && m_connection->room(spaceId)) {
+        if (!spaceId.isEmpty() && spaceId != u"DM"_s) {
             resolveResource(spaceId, "no_join"_L1);
             return;
         }
@@ -596,7 +604,6 @@ QString RoomManager::findSpaceIdForCurrentRoom() const
 void RoomManager::setCurrentRoom(const QString &roomId)
 {
     if (m_currentRoom != nullptr) {
-        m_currentRoom->clearSelectedMessages();
         m_currentRoom->disconnect(this);
     }
 

src/app/roommanager.h

@@ -190,7 +190,7 @@ public:
      *
      * @sa Quotient::UriResolverBase::visitResource()
      */
-    Q_INVOKABLE void resolveResource(Quotient::Uri uri, const QString &action = {});
+    Q_INVOKABLE void resolveResource(Uri uri, const QString &action = {});
 
     bool hasOpenRoom() const;
 
@@ -235,7 +235,7 @@ public:
      * @brief Show a context menu for the given event.
      */
     Q_INVOKABLE void
-    viewEventMenu(QObject *parent, const Quotient::RoomEvent *event, NeoChatRoom *room, const QString &selectedText = {}, const QString &hoveredLink = {});
+    viewEventMenu(QObject *parent, const RoomEvent *event, NeoChatRoom *room, const QString &selectedText = {}, const QString &hoveredLink = {});
 
     /**
      * @brief Set a URL to be loaded as the initial room.
@@ -316,7 +316,7 @@ Q_SIGNALS:
                           const QString &plainText,
                           const QString &richtText,
                           const QString &mimeType,
-                          const Quotient::FileTransferInfo &progressInfo,
+                          const FileTransferInfo &progressInfo,
                           const QString &selectedText,
                           const QString &hoveredLink);
 

src/app/trayicon_sni.cpp

@@ -0,0 +1,32 @@
+// SPDX-FileCopyrightText: 2021 Aleix Pol Gonzalez <aleixpol@kde.org>
+// SPDX-License-Identifier: GPL-3.0-only
+
+#include "trayicon_sni.h"
+#include <KWindowSystem>
+
+#include "windowcontroller.h"
+
+using namespace Qt::StringLiterals;
+
+TrayIcon::TrayIcon(QObject *parent)
+    : KStatusNotifierItem(parent)
+{
+    setCategory(KStatusNotifierItem::ItemCategory::Communications);
+    setIconByName(u"org.kde.neochat.tray"_s);
+
+    connect(&WindowController::instance(), &WindowController::windowChanged, this, [this] {
+        setAssociatedWindow(WindowController::instance().window());
+    });
+}
+
+void TrayIcon::show()
+{
+    setStatus(Active);
+}
+
+void TrayIcon::hide()
+{
+    setStatus(Passive);
+}
+
+#include "moc_trayicon_sni.cpp"