assert false

Need https://github.com/quotient-im/libQuotient/pull/723

.craft.ini

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

.flatpak-manifest.json

@@ -27,7 +27,7 @@
             "name": "kirigamiaddons",
             "config-opts": [ "-DBUILD_TESTING=OFF" ],
             "buildsystem": "cmake-ninja",
-            "sources": [ { "type": "git", "url": "https://invent.kde.org/libraries/kirigami-addons.git" } ]
+            "sources": [ { "type": "git", "url": "https://invent.kde.org/libraries/kirigami-addons.git", "commit": "34d311219e8b7209746a98b3a29b91ded05ff936" } ]
         },
         {
             "name": "kquickimageeditor",

.kde-ci.yml

@@ -31,6 +31,7 @@ Dependencies:
 - 'on': ['Linux', 'FreeBSD']
   'require':
     'frameworks/kdbusaddons': '@latest-kf6'
+    'frameworks/purpose': '@latest-kf6'
 
 - 'on': ['Linux']
   'require':

CMakeLists.txt

@@ -8,8 +8,8 @@ cmake_minimum_required(VERSION 3.16)
 
 # KDE Applications version, managed by release script.
 set(RELEASE_SERVICE_VERSION_MAJOR "24")
-set(RELEASE_SERVICE_VERSION_MINOR "01")
-set(RELEASE_SERVICE_VERSION_MICRO "90")
+set(RELEASE_SERVICE_VERSION_MINOR "04")
+set(RELEASE_SERVICE_VERSION_MICRO "70")
 set(RELEASE_SERVICE_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE_VERSION_MINOR}.${RELEASE_SERVICE_VERSION_MICRO}")
 
 project(NeoChat VERSION ${RELEASE_SERVICE_VERSION})
@@ -58,6 +58,9 @@ set_package_properties(Qt6 PROPERTIES
     TYPE REQUIRED
     PURPOSE "Basic application components"
 )
+
+qt_policy(SET QTP0001 NEW)
+
 find_package(KF6 ${KF_MIN_VERSION} COMPONENTS Kirigami I18n Notifications Config CoreAddons Sonnet ItemModels ColorScheme)
 set_package_properties(KF6 PROPERTIES
     TYPE REQUIRED

autotests/CMakeLists.txt

@@ -23,6 +23,11 @@ ecm_add_test(
     TEST_NAME delegatesizehelpertest
 )
 
+ecm_add_test(
+    roomtreemodeltest.cpp
+    LINK_LIBRARIES neochat Qt::Test
+)
+
 ecm_add_test(
     mediasizehelpertest.cpp
     LINK_LIBRARIES neochat Qt::Test

autotests/eventhandlertest.cpp

@@ -12,7 +12,6 @@
 #include <Quotient/quotient_common.h>
 #include <Quotient/syncdata.h>
 
-#include "enums/delegatetype.h"
 #include "linkpreviewer.h"
 #include "models/reactionmodel.h"
 #include "neochatroom.h"
@@ -29,19 +28,14 @@ class EventHandlerTest : public QObject
 private:
     Connection *connection = nullptr;
     TestUtils::TestRoom *room = nullptr;
-    EventHandler eventHandler;
-    EventHandler emptyHandler;
-    EventHandler noEventHandler;
+
+    EventHandler emptyHandler = EventHandler(nullptr, nullptr);
 
 private Q_SLOTS:
     void initTestCase();
 
-    void nullSetEvent();
     void eventId();
     void nullEventId();
-    void delegateType_data();
-    void delegateType();
-    void nullDelegateType();
     void author();
     void nullAuthor();
     void authorDisplayName();
@@ -69,8 +63,6 @@ private Q_SLOTS:
     void nullHasReply();
     void replyId();
     void nullReplyId();
-    void replyDelegateType();
-    void nullReplyDelegateType();
     void replyAuthor();
     void nullReplyAuthor();
     void replyBody();
@@ -83,72 +75,32 @@ private Q_SLOTS:
     void nullLocation();
     void readMarkers();
     void nullReadMarkers();
-
-    void cleanup();
 };
 
 void EventHandlerTest::initTestCase()
 {
     connection = Connection::makeMockConnection(QStringLiteral("@bob:kde.org"));
     room = new TestUtils::TestRoom(connection, QStringLiteral("#myroom:kde.org"), QLatin1String("test-eventhandler-sync.json"));
-
-    eventHandler.setRoom(room);
-    noEventHandler.setRoom(room);
-}
-
-void EventHandlerTest::nullSetEvent()
-{
-    QTest::ignoreMessage(QtWarningMsg, "cannot setEvent when m_room is set to nullptr.");
-    emptyHandler.setEvent(room->messageEvents().at(0).get());
 }
 
 void EventHandlerTest::eventId()
 {
-    eventHandler.setEvent(room->messageEvents().at(0).get());
-
+    EventHandler eventHandler(room, room->messageEvents().at(0).get());
     QCOMPARE(eventHandler.getId(), QStringLiteral("$153456789:example.org"));
 }
 
 void EventHandlerTest::nullEventId()
 {
+    EventHandler noEventHandler(room, nullptr);
     QTest::ignoreMessage(QtWarningMsg, "getId called with m_event set to nullptr.");
     QCOMPARE(noEventHandler.getId(), QString());
 }
 
-void EventHandlerTest::delegateType_data()
-{
-    QTest::addColumn<int>("eventNum");
-    QTest::addColumn<DelegateType::Type>("delegateType");
-
-    QTest::newRow("message") << 0 << DelegateType::Message;
-    QTest::newRow("state") << 1 << DelegateType::State;
-    QTest::newRow("message 2") << 2 << DelegateType::Message;
-    QTest::newRow("reaction") << 3 << DelegateType::Other;
-    QTest::newRow("video") << 4 << DelegateType::Video;
-    QTest::newRow("location") << 7 << DelegateType::Location;
-}
-
-void EventHandlerTest::delegateType()
-{
-    QFETCH(int, eventNum);
-    QFETCH(DelegateType::Type, delegateType);
-
-    eventHandler.setEvent(room->messageEvents().at(eventNum).get());
-
-    QCOMPARE(eventHandler.getDelegateType(), delegateType);
-}
-
-void EventHandlerTest::nullDelegateType()
-{
-    QTest::ignoreMessage(QtWarningMsg, "getDelegateType called with m_event set to nullptr.");
-    QCOMPARE(noEventHandler.getDelegateType(), DelegateType::Other);
-}
-
 void EventHandlerTest::author()
 {
     auto event = room->messageEvents().at(0).get();
     auto author = room->user(event->senderId());
-    eventHandler.setEvent(event);
+    EventHandler eventHandler(room, event);
 
     auto eventHandlerAuthor = eventHandler.getAuthor();
 
@@ -166,15 +118,14 @@ void EventHandlerTest::nullAuthor()
     QTest::ignoreMessage(QtWarningMsg, "getAuthor called with m_room set to nullptr.");
     QCOMPARE(emptyHandler.getAuthor(), QVariantMap());
 
+    EventHandler noEventHandler(room, nullptr);
     QTest::ignoreMessage(QtWarningMsg, "getAuthor called with m_event set to nullptr. Returning empty user.");
     QCOMPARE(noEventHandler.getAuthor(), room->getUser(nullptr));
 }
 
 void EventHandlerTest::authorDisplayName()
 {
-    auto event = room->messageEvents().at(1).get();
-    eventHandler.setEvent(event);
-
+    EventHandler eventHandler(room, room->messageEvents().at(1).get());
     QCOMPARE(eventHandler.getAuthorDisplayName(), QStringLiteral("before"));
 }
 
@@ -183,15 +134,14 @@ void EventHandlerTest::nullAuthorDisplayName()
     QTest::ignoreMessage(QtWarningMsg, "getAuthorDisplayName called with m_room set to nullptr.");
     QCOMPARE(emptyHandler.getAuthorDisplayName(), QString());
 
+    EventHandler noEventHandler(room, nullptr);
     QTest::ignoreMessage(QtWarningMsg, "getAuthorDisplayName called with m_event set to nullptr.");
     QCOMPARE(noEventHandler.getAuthorDisplayName(), QString());
 }
 
 void EventHandlerTest::singleLineSidplayName()
 {
-    auto event = room->messageEvents().at(11).get();
-    eventHandler.setEvent(event);
-
+    EventHandler eventHandler(room, room->messageEvents().at(11).get());
     QCOMPARE(eventHandler.singleLineAuthorDisplayname(), QStringLiteral("Look at me I put newlines in my display name"));
 }
 
@@ -200,14 +150,14 @@ void EventHandlerTest::nullSingleLineDisplayName()
     QTest::ignoreMessage(QtWarningMsg, "getAuthorDisplayName called with m_room set to nullptr.");
     QCOMPARE(emptyHandler.singleLineAuthorDisplayname(), QString());
 
+    EventHandler noEventHandler(room, nullptr);
     QTest::ignoreMessage(QtWarningMsg, "getAuthorDisplayName called with m_event set to nullptr.");
     QCOMPARE(noEventHandler.singleLineAuthorDisplayname(), QString());
 }
 
 void EventHandlerTest::time()
 {
-    auto event = room->messageEvents().at(0).get();
-    eventHandler.setEvent(event);
+    EventHandler eventHandler(room, room->messageEvents().at(0).get());
 
     QCOMPARE(eventHandler.getTime(), QDateTime::fromMSecsSinceEpoch(1432735824654, Qt::UTC));
     QCOMPARE(eventHandler.getTime(true, QDateTime::fromMSecsSinceEpoch(1234, Qt::UTC)), QDateTime::fromMSecsSinceEpoch(1234, Qt::UTC));
@@ -215,18 +165,18 @@ void EventHandlerTest::time()
 
 void EventHandlerTest::nullTime()
 {
+    EventHandler noEventHandler(room, nullptr);
     QTest::ignoreMessage(QtWarningMsg, "getTime called with m_event set to nullptr.");
     QCOMPARE(noEventHandler.getTime(), QDateTime());
 
-    eventHandler.setEvent(room->messageEvents().at(0).get());
+    EventHandler eventHandler(room, room->messageEvents().at(0).get());
     QTest::ignoreMessage(QtWarningMsg, "a value must be provided for lastUpdated for a pending event.");
     QCOMPARE(eventHandler.getTime(true), QDateTime());
 }
 
 void EventHandlerTest::timeString()
 {
-    auto event = room->messageEvents().at(0).get();
-    eventHandler.setEvent(event);
+    EventHandler eventHandler(room, room->messageEvents().at(0).get());
 
     KFormat format;
 
@@ -246,25 +196,22 @@ void EventHandlerTest::timeString()
 
 void EventHandlerTest::nullTimeString()
 {
+    EventHandler noEventHandler(room, nullptr);
     QTest::ignoreMessage(QtWarningMsg, "getTimeString called with m_event set to nullptr.");
     QCOMPARE(noEventHandler.getTimeString(false), QString());
 
-    eventHandler.setEvent(room->messageEvents().at(0).get());
+    EventHandler eventHandler(room, room->messageEvents().at(0).get());
     QTest::ignoreMessage(QtWarningMsg, "a value must be provided for lastUpdated for a pending event.");
     QCOMPARE(eventHandler.getTimeString(false, QLocale::ShortFormat, true), QString());
 }
 
 void EventHandlerTest::highlighted()
 {
-    auto event = room->messageEvents().at(2).get();
-    eventHandler.setEvent(event);
+    EventHandler eventHandlerHighlight(room, room->messageEvents().at(2).get());
+    QCOMPARE(eventHandlerHighlight.isHighlighted(), true);
 
-    QCOMPARE(eventHandler.isHighlighted(), true);
-
-    event = room->messageEvents().at(0).get();
-    eventHandler.setEvent(event);
-
-    QCOMPARE(eventHandler.isHighlighted(), false);
+    EventHandler eventHandlerNoHighlight(room, room->messageEvents().at(0).get());
+    QCOMPARE(eventHandlerNoHighlight.isHighlighted(), false);
 }
 
 void EventHandlerTest::nullHighlighted()
@@ -272,21 +219,18 @@ void EventHandlerTest::nullHighlighted()
     QTest::ignoreMessage(QtWarningMsg, "isHighlighted called with m_room set to nullptr.");
     QCOMPARE(emptyHandler.isHighlighted(), false);
 
+    EventHandler noEventHandler(room, nullptr);
     QTest::ignoreMessage(QtWarningMsg, "isHighlighted called with m_event set to nullptr.");
     QCOMPARE(noEventHandler.isHighlighted(), false);
 }
 
 void EventHandlerTest::hidden()
 {
-    auto event = room->messageEvents().at(3).get();
-    eventHandler.setEvent(event);
+    EventHandler eventHandlerHidden(room, room->messageEvents().at(3).get());
+    QCOMPARE(eventHandlerHidden.isHidden(), true);
 
-    QCOMPARE(eventHandler.isHidden(), true);
-
-    event = room->messageEvents().at(0).get();
-    eventHandler.setEvent(event);
-
-    QCOMPARE(eventHandler.isHidden(), false);
+    EventHandler eventHandlerNoHidden(room, room->messageEvents().at(0).get());
+    QCOMPARE(eventHandlerNoHidden.isHidden(), false);
 }
 
 void EventHandlerTest::nullHidden()
@@ -294,14 +238,14 @@ void EventHandlerTest::nullHidden()
     QTest::ignoreMessage(QtWarningMsg, "isHidden called with m_room set to nullptr.");
     QCOMPARE(emptyHandler.isHidden(), false);
 
+    EventHandler noEventHandler(room, nullptr);
     QTest::ignoreMessage(QtWarningMsg, "isHidden called with m_event set to nullptr.");
     QCOMPARE(noEventHandler.isHidden(), false);
 }
 
 void EventHandlerTest::body()
 {
-    auto event = room->messageEvents().at(0).get();
-    eventHandler.setEvent(event);
+    EventHandler eventHandler(room, room->messageEvents().at(0).get());
 
     QCOMPARE(eventHandler.getRichBody(), QStringLiteral("<b>This is an example<br>text message</b>"));
     QCOMPARE(eventHandler.getRichBody(true), QStringLiteral("<b>This is an example text message</b>"));
@@ -311,6 +255,8 @@ void EventHandlerTest::body()
 
 void EventHandlerTest::nullBody()
 {
+    EventHandler noEventHandler(room, nullptr);
+
     QTest::ignoreMessage(QtWarningMsg, "getRichBody called with m_event set to nullptr.");
     QCOMPARE(noEventHandler.getRichBody(), QString());
 
@@ -335,32 +281,30 @@ void EventHandlerTest::genericBody()
     QFETCH(int, eventNum);
     QFETCH(QString, output);
 
-    eventHandler.setEvent(room->messageEvents().at(eventNum).get());
+    EventHandler eventHandler(room, room->messageEvents().at(eventNum).get());
 
     QCOMPARE(eventHandler.getGenericBody(), output);
 }
 
 void EventHandlerTest::nullGenericBody()
 {
+    EventHandler noEventHandler(room, nullptr);
     QTest::ignoreMessage(QtWarningMsg, "getGenericBody called with m_event set to nullptr.");
     QCOMPARE(noEventHandler.getGenericBody(), QString());
 }
 
 void EventHandlerTest::subtitle()
 {
-    auto event = room->messageEvents().at(0).get();
-    eventHandler.setEvent(event);
-
+    EventHandler eventHandler(room, room->messageEvents().at(0).get());
     QCOMPARE(eventHandler.subtitleText(), QStringLiteral("after: This is an example text message"));
 
-    event = room->messageEvents().at(2).get();
-    eventHandler.setEvent(event);
-
-    QCOMPARE(eventHandler.subtitleText(), QStringLiteral("after: This is a highlight @bob:kde.org and this is a link https://kde.org"));
+    EventHandler eventHandler2(room, room->messageEvents().at(2).get());
+    QCOMPARE(eventHandler2.subtitleText(), QStringLiteral("after: This is a highlight @bob:kde.org and this is a link https://kde.org"));
 }
 
 void EventHandlerTest::nullSubtitle()
 {
+    EventHandler noEventHandler(room, nullptr);
     QTest::ignoreMessage(QtWarningMsg, "subtitleText called with m_event set to nullptr.");
     QCOMPARE(noEventHandler.subtitleText(), QString());
 }
@@ -368,7 +312,7 @@ void EventHandlerTest::nullSubtitle()
 void EventHandlerTest::mediaInfo()
 {
     auto event = room->messageEvents().at(4).get();
-    eventHandler.setEvent(event);
+    EventHandler eventHandler(room, event);
 
     auto mediaInfo = eventHandler.getMediaInfo();
     auto thumbnailInfo = mediaInfo["tempInfo"_ls].toMap();
@@ -393,76 +337,48 @@ void EventHandlerTest::nullMediaInfo()
     QTest::ignoreMessage(QtWarningMsg, "getMediaInfo called with m_room set to nullptr.");
     QCOMPARE(emptyHandler.getMediaInfo(), QVariantMap());
 
+    EventHandler noEventHandler(room, nullptr);
     QTest::ignoreMessage(QtWarningMsg, "getMediaInfo called with m_event set to nullptr.");
     QCOMPARE(noEventHandler.getMediaInfo(), QVariantMap());
 }
 
 void EventHandlerTest::hasReply()
 {
-    auto event = room->messageEvents().at(5).get();
-    eventHandler.setEvent(event);
+    EventHandler eventHandlerReply(room, room->messageEvents().at(5).get());
+    QCOMPARE(eventHandlerReply.hasReply(), true);
 
-    QCOMPARE(eventHandler.hasReply(), true);
-
-    event = room->messageEvents().at(0).get();
-    eventHandler.setEvent(event);
-
-    QCOMPARE(eventHandler.hasReply(), false);
+    EventHandler eventHandlerNoReply(room, room->messageEvents().at(0).get());
+    QCOMPARE(eventHandlerNoReply.hasReply(), false);
 }
 
 void EventHandlerTest::nullHasReply()
 {
+    EventHandler noEventHandler(room, nullptr);
     QTest::ignoreMessage(QtWarningMsg, "hasReply called with m_event set to nullptr.");
     QCOMPARE(noEventHandler.hasReply(), false);
 }
 
 void EventHandlerTest::replyId()
 {
-    auto event = room->messageEvents().at(5).get();
-    eventHandler.setEvent(event);
+    EventHandler eventHandlerReply(room, room->messageEvents().at(5).get());
+    QCOMPARE(eventHandlerReply.getReplyId(), QStringLiteral("$153456789:example.org"));
 
-    QCOMPARE(eventHandler.getReplyId(), QStringLiteral("$153456789:example.org"));
-
-    event = room->messageEvents().at(0).get();
-    eventHandler.setEvent(event);
-
-    QCOMPARE(eventHandler.getReplyId(), QStringLiteral(""));
+    EventHandler eventHandlerNoReply(room, room->messageEvents().at(0).get());
+    QCOMPARE(eventHandlerNoReply.getReplyId(), QStringLiteral(""));
 }
 
 void EventHandlerTest::nullReplyId()
 {
+    EventHandler noEventHandler(room, nullptr);
     QTest::ignoreMessage(QtWarningMsg, "getReplyId called with m_event set to nullptr.");
     QCOMPARE(noEventHandler.getReplyId(), QString());
 }
 
-void EventHandlerTest::replyDelegateType()
-{
-    auto event = room->messageEvents().at(5).get();
-    eventHandler.setEvent(event);
-
-    QCOMPARE(eventHandler.getReplyDelegateType(), DelegateType::Message);
-
-    event = room->messageEvents().at(0).get();
-    eventHandler.setEvent(event);
-
-    QCOMPARE(eventHandler.getReplyDelegateType(), DelegateType::Other);
-}
-
-void EventHandlerTest::nullReplyDelegateType()
-{
-    QTest::ignoreMessage(QtWarningMsg, "getReplyDelegateType called with m_room set to nullptr.");
-    QCOMPARE(emptyHandler.getReplyDelegateType(), DelegateType::Other);
-
-    QTest::ignoreMessage(QtWarningMsg, "getReplyDelegateType called with m_event set to nullptr.");
-    QCOMPARE(noEventHandler.getReplyDelegateType(), DelegateType::Other);
-}
-
 void EventHandlerTest::replyAuthor()
 {
-    auto event = room->messageEvents().at(5).get();
     auto replyEvent = room->messageEvents().at(0).get();
     auto replyAuthor = room->user(replyEvent->senderId());
-    eventHandler.setEvent(event);
+    EventHandler eventHandler(room, room->messageEvents().at(5).get());
 
     auto eventHandlerReplyAuthor = eventHandler.getReplyAuthor();
 
@@ -474,10 +390,8 @@ void EventHandlerTest::replyAuthor()
     QCOMPARE(eventHandlerReplyAuthor["color"_ls], Utils::getUserColor(replyAuthor->hueF()));
     QCOMPARE(eventHandlerReplyAuthor["object"_ls], QVariant::fromValue(replyAuthor));
 
-    event = room->messageEvents().at(0).get();
-    eventHandler.setEvent(event);
-
-    QCOMPARE(eventHandler.getReplyAuthor(), room->getUser(nullptr));
+    EventHandler eventHandlerNoAuthor(room, room->messageEvents().at(0).get());
+    QCOMPARE(eventHandlerNoAuthor.getReplyAuthor(), room->getUser(nullptr));
 }
 
 void EventHandlerTest::nullReplyAuthor()
@@ -485,14 +399,14 @@ void EventHandlerTest::nullReplyAuthor()
     QTest::ignoreMessage(QtWarningMsg, "getReplyAuthor called with m_room set to nullptr.");
     QCOMPARE(emptyHandler.getReplyAuthor(), QVariantMap());
 
+    EventHandler noEventHandler(room, nullptr);
     QTest::ignoreMessage(QtWarningMsg, "getReplyAuthor called with m_event set to nullptr. Returning empty user.");
     QCOMPARE(noEventHandler.getReplyAuthor(), room->getUser(nullptr));
 }
 
 void EventHandlerTest::replyBody()
 {
-    auto event = room->messageEvents().at(5).get();
-    eventHandler.setEvent(event);
+    EventHandler eventHandler(room, room->messageEvents().at(5).get());
 
     QCOMPARE(eventHandler.getReplyRichBody(), QStringLiteral("<b>This is an example<br>text message</b>"));
     QCOMPARE(eventHandler.getReplyRichBody(true), QStringLiteral("<b>This is an example text message</b>"));
@@ -502,6 +416,8 @@ void EventHandlerTest::replyBody()
 
 void EventHandlerTest::nullReplyBody()
 {
+    EventHandler noEventHandler(room, nullptr);
+
     QTest::ignoreMessage(QtWarningMsg, "getReplyRichBody called with m_event set to nullptr.");
     QCOMPARE(noEventHandler.getReplyRichBody(), QString());
 
@@ -513,7 +429,7 @@ void EventHandlerTest::replyMediaInfo()
 {
     auto event = room->messageEvents().at(6).get();
     auto replyEvent = room->messageEvents().at(4).get();
-    eventHandler.setEvent(event);
+    EventHandler eventHandler(room, event);
 
     auto mediaInfo = eventHandler.getReplyMediaInfo();
     auto thumbnailInfo = mediaInfo["tempInfo"_ls].toMap();
@@ -538,31 +454,26 @@ void EventHandlerTest::nullReplyMediaInfo()
     QTest::ignoreMessage(QtWarningMsg, "getReplyMediaInfo called with m_room set to nullptr.");
     QCOMPARE(emptyHandler.getReplyMediaInfo(), QVariantMap());
 
+    EventHandler noEventHandler(room, nullptr);
     QTest::ignoreMessage(QtWarningMsg, "getReplyMediaInfo called with m_event set to nullptr.");
     QCOMPARE(noEventHandler.getReplyMediaInfo(), QVariantMap());
 }
 
 void EventHandlerTest::thread()
 {
-    auto event = room->messageEvents().at(0).get();
-    eventHandler.setEvent(event);
+    EventHandler eventHandlerNoThread(room, room->messageEvents().at(0).get());
+    QCOMPARE(eventHandlerNoThread.isThreaded(), false);
+    QCOMPARE(eventHandlerNoThread.threadRoot(), QString());
 
-    QCOMPARE(eventHandler.isThreaded(), false);
-    QCOMPARE(eventHandler.threadRoot(), QString());
+    EventHandler eventHandlerThreadRoot(room, room->messageEvents().at(9).get());
+    QCOMPARE(eventHandlerThreadRoot.isThreaded(), true);
+    QCOMPARE(eventHandlerThreadRoot.threadRoot(), QStringLiteral("$threadroot:example.org"));
+    QCOMPARE(eventHandlerThreadRoot.getReplyId(), QStringLiteral("$threadroot:example.org"));
 
-    event = room->messageEvents().at(9).get();
-    eventHandler.setEvent(event);
-
-    QCOMPARE(eventHandler.isThreaded(), true);
-    QCOMPARE(eventHandler.threadRoot(), QStringLiteral("$threadroot:example.org"));
-    QCOMPARE(eventHandler.getReplyId(), QStringLiteral("$threadroot:example.org"));
-
-    event = room->messageEvents().at(10).get();
-    eventHandler.setEvent(event);
-
-    QCOMPARE(eventHandler.isThreaded(), true);
-    QCOMPARE(eventHandler.threadRoot(), QStringLiteral("$threadroot:example.org"));
-    QCOMPARE(eventHandler.getReplyId(), QStringLiteral("$threadmessage1:example.org"));
+    EventHandler eventHandlerThreadReply(room, room->messageEvents().at(10).get());
+    QCOMPARE(eventHandlerThreadReply.isThreaded(), true);
+    QCOMPARE(eventHandlerThreadReply.threadRoot(), QStringLiteral("$threadroot:example.org"));
+    QCOMPARE(eventHandlerThreadReply.getReplyId(), QStringLiteral("$threadmessage1:example.org"));
 }
 
 void EventHandlerTest::nullThread()
@@ -570,14 +481,14 @@ void EventHandlerTest::nullThread()
     QTest::ignoreMessage(QtWarningMsg, "isThreaded called with m_event set to nullptr.");
     QCOMPARE(emptyHandler.isThreaded(), false);
 
+    EventHandler noEventHandler(room, nullptr);
     QTest::ignoreMessage(QtWarningMsg, "threadRoot called with m_event set to nullptr.");
     QCOMPARE(noEventHandler.threadRoot(), QString());
 }
 
 void EventHandlerTest::location()
 {
-    auto event = room->messageEvents().at(7).get();
-    eventHandler.setEvent(event);
+    EventHandler eventHandler(room, room->messageEvents().at(7).get());
 
     QCOMPARE(eventHandler.getLatitude(), QStringLiteral("51.7035").toFloat());
     QCOMPARE(eventHandler.getLongitude(), QStringLiteral("-1.14394").toFloat());
@@ -598,9 +509,7 @@ void EventHandlerTest::nullLocation()
 
 void EventHandlerTest::readMarkers()
 {
-    auto event = room->messageEvents().at(0).get();
-    eventHandler.setEvent(event);
-
+    EventHandler eventHandler(room, room->messageEvents().at(0).get());
     QCOMPARE(eventHandler.hasReadMarkers(), true);
 
     auto readMarkers = eventHandler.getReadMarkers();
@@ -611,18 +520,16 @@ void EventHandlerTest::readMarkers()
     QCOMPARE(eventHandler.getNumberExcessReadMarkers(), QString());
     QCOMPARE(eventHandler.getReadMarkersString(), QStringLiteral("1 user: @alice:matrix.org"));
 
-    event = room->messageEvents().at(2).get();
-    eventHandler.setEvent(event);
+    EventHandler eventHandler2(room, room->messageEvents().at(2).get());
+    QCOMPARE(eventHandler2.hasReadMarkers(), true);
 
-    QCOMPARE(eventHandler.hasReadMarkers(), true);
-
-    readMarkers = eventHandler.getReadMarkers();
+    readMarkers = eventHandler2.getReadMarkers();
 
     QCOMPARE(readMarkers.size(), 5);
 
-    QCOMPARE(eventHandler.getNumberExcessReadMarkers(), QStringLiteral("+ 1"));
+    QCOMPARE(eventHandler2.getNumberExcessReadMarkers(), QStringLiteral("+ 1"));
     // There are no guarantees on the order of the users it will be different every time so don't match the whole string.
-    QCOMPARE(eventHandler.getReadMarkersString().startsWith(QStringLiteral("6 users:")), true);
+    QCOMPARE(eventHandler2.getReadMarkersString().startsWith(QStringLiteral("6 users:")), true);
 }
 
 void EventHandlerTest::nullReadMarkers()
@@ -639,6 +546,8 @@ void EventHandlerTest::nullReadMarkers()
     QTest::ignoreMessage(QtWarningMsg, "getReadMarkersString called with m_room set to nullptr.");
     QCOMPARE(emptyHandler.getReadMarkersString(), QString());
 
+    EventHandler noEventHandler(room, nullptr);
+
     QTest::ignoreMessage(QtWarningMsg, "hasReadMarkers called with m_event set to nullptr.");
     QCOMPARE(noEventHandler.hasReadMarkers(), false);
 
@@ -652,10 +561,5 @@ void EventHandlerTest::nullReadMarkers()
     QCOMPARE(noEventHandler.getReadMarkersString(), QString());
 }
 
-void EventHandlerTest::cleanup()
-{
-    eventHandler.setEvent(nullptr);
-}
-
 QTEST_MAIN(EventHandlerTest)
 #include "eventhandlertest.moc"

autotests/messageeventmodeltest.cpp

@@ -103,7 +103,6 @@ void MessageEventModelTest::simpleTimeline()
 
     QCOMPARE(model->data(model->index(1)), QStringLiteral("<b>This is an example<br>text message</b>"));
     QCOMPARE(model->data(model->index(1), MessageEventModel::DelegateTypeRole), DelegateType::Message);
-    QCOMPARE(model->data(model->index(1), MessageEventModel::PlainText), QStringLiteral("This is an example\ntext message"));
     QCOMPARE(model->data(model->index(1), MessageEventModel::EventIdRole), QStringLiteral("$153456789:example.org"));
 
     QTest::ignoreMessage(QtWarningMsg, "Index QModelIndex(-1,-1,0x0,QObject(0x0)) is not valid (expected valid)");

autotests/neochatroomtest.cpp

@@ -5,9 +5,7 @@
 #include <QSignalSpy>
 #include <QTest>
 
-#include <Quotient/connection.h>
-#include <Quotient/quotient_common.h>
-#include <Quotient/syncdata.h>
+#include "neochatconnection.h"
 
 #include "testutils.h"
 
@@ -27,7 +25,8 @@ private Q_SLOTS:
 
 void NeoChatRoomTest::initTestCase()
 {
-    connection = Connection::makeMockConnection(QStringLiteral("@bob:kde.org"));
+    auto connection = new NeoChatConnection;
+    Connection::makeMockConnection(connection, QStringLiteral("@bob:kde.org"));
     room = new TestUtils::TestRoom(connection, QStringLiteral("#myroom:kde.org"), "test-min-sync.json"_ls);
 }
 

autotests/roomtreemodeltest.cpp

@@ -0,0 +1,70 @@
+// SPDX-FileCopyrightText: 2024 Carl Schwan <carl@carlschwan.eu>
+// SPDX-License-Identifier: LGPL-2.0-or-later
+
+#include <QAbstractItemModelTester>
+#include <QTest>
+
+#include "enums/neochatroomtype.h"
+#include "models/roomtreemodel.h"
+#include "models/sortfilterroomtreemodel.h"
+#include "neochatconnection.h"
+#include "testutils.h"
+
+using namespace Quotient;
+
+class RoomTreeModelTest : public QObject
+{
+    Q_OBJECT
+
+private Q_SLOTS:
+    void testTreeModel();
+};
+
+void RoomTreeModelTest::testTreeModel()
+{
+    auto connection = new NeoChatConnection;
+    Connection::makeMockConnection(connection, QStringLiteral("@bob:kde.org"));
+
+    auto room = dynamic_cast<NeoChatRoom *>(new TestUtils::TestRoom(connection, QStringLiteral("#myroom:kde.org"), QStringLiteral("test-min-sync.json")));
+    QVERIFY(room);
+    connection->addRoom(room);
+
+    RoomTreeModel model;
+    model.setConnection(connection);
+
+    SortFilterRoomTreeModel filterModel;
+    filterModel.setSourceModel(&model);
+
+    QAbstractItemModelTester tester(&model);
+    QAbstractItemModelTester testerFilter(&filterModel);
+
+    QCOMPARE(model.rowCount(), static_cast<int>(NeoChatRoomType::TypesCount));
+
+    // Check data category
+    auto category = static_cast<int>(NeoChatRoomType::typeForRoom(room));
+    QCOMPARE(category, NeoChatRoomType::Normal);
+    auto normalCategoryIdx = model.index(category, 0);
+    QCOMPARE(model.data(normalCategoryIdx, RoomTreeModel::DisplayNameRole).toString(), QStringLiteral("Normal"));
+    QCOMPARE(model.data(normalCategoryIdx, RoomTreeModel::DelegateTypeRole).toString(), QStringLiteral("section"));
+    QCOMPARE(model.data(normalCategoryIdx, RoomTreeModel::IconRole).toString(), QStringLiteral("group"));
+    QCOMPARE(model.data(normalCategoryIdx, RoomTreeModel::CategoryRole).toInt(), category);
+    QCOMPARE(model.rowCount(normalCategoryIdx), 1);
+
+    // Check data room
+    auto roomIdx = model.index(0, 0, normalCategoryIdx);
+    QCOMPARE(model.data(roomIdx, RoomTreeModel::CurrentRoomRole).value<NeoChatRoom *>(), room);
+    QCOMPARE(model.data(roomIdx, RoomTreeModel::CategoryRole).toInt(), category);
+
+    // Move room
+    room->setProperty("isFavorite", true);
+    model.moveRoom(room);
+
+    auto newCategory = static_cast<int>(NeoChatRoomType::typeForRoom(room));
+    QCOMPARE(newCategory, NeoChatRoomType::Favorite);
+    auto newCategoryIdx = model.index(newCategory, 0);
+    QVERIFY(newCategoryIdx != normalCategoryIdx);
+}
+
+QTEST_MAIN(RoomTreeModelTest)
+
+#include "roomtreemodeltest.moc"

autotests/texthandlertest.cpp

@@ -10,7 +10,9 @@
 #include <Quotient/syncdata.h>
 #include <qnamespace.h>
 
+#include "enums/messagecomponenttype.h"
 #include "models/customemojimodel.h"
+#include "models/messagecontentmodel.h"
 #include "neochatconnection.h"
 #include "utils.h"
 
@@ -33,7 +35,6 @@ private Q_SLOTS:
     void stripDisallowedTags();
     void stripDisallowedAttributes();
     void emptyCodeTags();
-    void formatBlockQuote();
 
     void sendSimpleStringCase();
     void sendSingleParaMarkup();
@@ -59,11 +60,13 @@ private Q_SLOTS:
     void receiveRichtextIn();
     void receiveRichMxcUrl();
     void receiveRichPlainUrl();
-    void receiveRichEmote();
     void receiveRichEdited_data();
     void receiveRichEdited();
     void receiveLineSeparator();
     void receiveRichCodeUrl();
+
+    void componentOutput_data();
+    void componentOutput();
 };
 
 void TextHandlerTest::initTestCase()
@@ -139,16 +142,6 @@ void TextHandlerTest::emptyCodeTags()
     QCOMPARE(testTextHandler.handleRecieveRichText(), testOutputString);
 }
 
-void TextHandlerTest::formatBlockQuote()
-{
-    auto input = QStringLiteral("<blockquote>\n<p>Lorem Ispum</p>\n</blockquote>");
-    auto expectedOutput = QStringLiteral("<blockquote><table><tr><td>\u201CLorem Ispum\u201D</td></tr></table></blockquote>");
-
-    TextHandler testTextHandler;
-    testTextHandler.setData(input);
-    QCOMPARE(testTextHandler.handleRecieveRichText(), expectedOutput);
-}
-
 void TextHandlerTest::sendSimpleStringCase()
 {
     const QString testInputString = QStringLiteral("This data should just be put in a paragraph.");
@@ -470,22 +463,6 @@ void TextHandlerTest::receiveRichPlainUrl()
     QCOMPARE(testTextHandler.handleRecieveRichText(Qt::RichText), testOutputStringMxId);
 }
 
-// Test that user pill is add to an emote message.
-// N.B. The second message in the test timeline is marked as an emote.
-void TextHandlerTest::receiveRichEmote()
-{
-    auto event = room->messageEvents().at(1).get();
-    auto author = room->user(event->senderId());
-    const QString testInputString = QStringLiteral("This is an emote.");
-    const QString testOutputString = QStringLiteral("* <a href=\"https://matrix.to/#/@example:example.org\" style=\"color:")
-        + Utils::getUserColor(author->hueF()).name() + QStringLiteral("\">@example:example.org</a> This is an emote.");
-
-    TextHandler testTextHandler;
-    testTextHandler.setData(testInputString);
-
-    QCOMPARE(testTextHandler.handleRecieveRichText(Qt::RichText, room, event), testOutputString);
-}
-
 void TextHandlerTest::receiveRichEdited_data()
 {
     QTest::addColumn<QString>("testInputString");
@@ -494,9 +471,6 @@ void TextHandlerTest::receiveRichEdited_data()
     QTest::newRow("basic") << QStringLiteral("Edited") << QStringLiteral("Edited <span style=\"color:#000000\">(edited)</span>");
     QTest::newRow("multiple paragraphs") << QStringLiteral("<p>Edited</p>\n<p>Edited</p>")
                                          << QStringLiteral("<p>Edited</p>\n<p>Edited <span style=\"color:#000000\">(edited)</span></p>");
-    QTest::newRow("blockquote")
-        << QStringLiteral("<blockquote>Edited</blockquote>")
-        << QStringLiteral("<blockquote><table><tr><td>\u201CEdited\u201D</td></tr></table></blockquote><p> <span style=\"color:#000000\">(edited)</span></p>");
 }
 
 void TextHandlerTest::receiveRichEdited()
@@ -507,7 +481,8 @@ void TextHandlerTest::receiveRichEdited()
     TextHandler testTextHandler;
     testTextHandler.setData(testInputString);
 
-    QCOMPARE(testTextHandler.handleRecieveRichText(Qt::RichText, room, room->messageEvents().at(2).get()), testOutputString);
+    const auto event = eventCast<const Quotient::RoomMessageEvent>(room->messageEvents().at(2).get());
+    QCOMPARE(testTextHandler.handleRecieveRichText(Qt::RichText, room, event, false, event->isReplaced()), testOutputString);
 }
 
 void TextHandlerTest::receiveLineSeparator()
@@ -526,5 +501,44 @@ void TextHandlerTest::receiveRichCodeUrl()
     QCOMPARE(testTextHandler.handleRecieveRichText(), input);
 }
 
+void TextHandlerTest::componentOutput_data()
+{
+    QTest::addColumn<QString>("testInputString");
+    QTest::addColumn<QList<MessageComponent>>("testOutputComponents");
+
+    QTest::newRow("multiple paragraphs") << QStringLiteral("<p>Text</p>\n<p>Text</p>")
+                                         << QList<MessageComponent>{MessageComponent{MessageComponentType::Text, QStringLiteral("Text"), {}},
+                                                                    MessageComponent{MessageComponentType::Text, QStringLiteral("Text"), {}}};
+    QTest::newRow("code") << QStringLiteral("<p>Text</p>\n<pre><code class=\"language-html\">Some code\n</code></pre>")
+                          << QList<MessageComponent>{MessageComponent{MessageComponentType::Text, QStringLiteral("Text"), {}},
+                                                     MessageComponent{MessageComponentType::Code,
+                                                                      QStringLiteral("Some code"),
+                                                                      QVariantMap{{QStringLiteral("class"), QStringLiteral("HTML")}}}};
+    QTest::newRow("quote") << QStringLiteral("<p>Text</p>\n<blockquote>\n<p>blockquote</p>\n</blockquote>")
+                           << QList<MessageComponent>{MessageComponent{MessageComponentType::Text, QStringLiteral("Text"), {}},
+                                                      MessageComponent{MessageComponentType::Quote, QStringLiteral("\"blockquote\""), {}}};
+    QTest::newRow("no tag first paragraph") << QStringLiteral("Text\n<p>Text</p>")
+                                            << QList<MessageComponent>{MessageComponent{MessageComponentType::Text, QStringLiteral("Text"), {}},
+                                                                       MessageComponent{MessageComponentType::Text, QStringLiteral("Text"), {}}};
+    QTest::newRow("no tag last paragraph") << QStringLiteral("<p>Text</p>\nText")
+                                           << QList<MessageComponent>{MessageComponent{MessageComponentType::Text, QStringLiteral("Text"), {}},
+                                                                      MessageComponent{MessageComponentType::Text, QStringLiteral("Text"), {}}};
+    QTest::newRow("inline code") << QStringLiteral("<p><code>https://kde.org</code></p>\n<p>Text</p>")
+                                 << QList<MessageComponent>{MessageComponent{MessageComponentType::Text, QStringLiteral("<code>https://kde.org</code>"), {}},
+                                                            MessageComponent{MessageComponentType::Text, QStringLiteral("Text"), {}}};
+    QTest::newRow("inline code single block") << QStringLiteral("<code>https://kde.org</code>")
+                                              << QList<MessageComponent>{
+                                                     MessageComponent{MessageComponentType::Text, QStringLiteral("<code>https://kde.org</code>"), {}}};
+}
+
+void TextHandlerTest::componentOutput()
+{
+    QFETCH(QString, testInputString);
+    QFETCH(QList<MessageComponent>, testOutputComponents);
+
+    TextHandler testTextHandler;
+    QCOMPARE(testTextHandler.textComponents(testInputString), testOutputComponents);
+}
+
 QTEST_MAIN(TextHandlerTest)
 #include "texthandlertest.moc"

org.kde.neochat.appdata.xml

@@ -59,7 +59,7 @@
   <summary xml:lang="fi">Keskustelu ystäviesi kanssa Matrixissa</summary>
   <summary xml:lang="fr">Discuter avec vos ami(e)s sur le réseau Matrix</summary>
   <summary xml:lang="gl">Charle coas súas amizades en Matrix.</summary>
-  <summary xml:lang="ia">Starta Conversation conntu amicos sur matrix</summary>
+  <summary xml:lang="ia">Starta Conversation con tu amicos sur matrix</summary>
   <summary xml:lang="it">Conversa con i tuoi contatti su matrix</summary>
   <summary xml:lang="ka">ესაუბრეთ მეგობრებს Matrix-ზე</summary>
   <summary xml:lang="ko">Matrix를 사용하여 친구들과 대화하기</summary>
@@ -69,38 +69,26 @@
   <summary xml:lang="sl">Klepet z vašimi prijatelji na matrixu</summary>
   <summary xml:lang="sv">Chatta med dina vänner på Matrix</summary>
   <summary xml:lang="ta">மேட்ரிக்ஸு மூலம் உங்கள் நண்பர்களிடம் பேசலாம்</summary>
-  <summary xml:lang="tr">Matrix'te arkadaşlarınızla sohbet edin</summary>
+  <summary xml:lang="tr">Matrix’te arkadaşlarınızla sohbet edin</summary>
   <summary xml:lang="uk">Спілкуйтеся з вашими друзями у matrix</summary>
   <summary xml:lang="x-test">xxChat with your friends on matrixxx</summary>
   <summary xml:lang="zh-CN">在 Matrix 上与朋友聊天</summary>
   <summary xml:lang="zh-TW">在 Matrix 上與您的朋友聊天</summary>
   <description>
-    <p>NeoChat is a client for Matrix, the decentralized communication protocol for instant messaging. It allows you to send text messages, videos and audio files to your family, colleagues and friends. It uses KDE frameworks and most notably Kirigami
-to provide a convergent experience across multiple platforms.</p>
-    <p xml:lang="ar">نيوتشات هو عميل ماتركس Matrix، (ميفاق الاتصال اللامركزي للمراسلة الفورية). يتيح لك نيوتشات إرسال رسائل نصية ومقاطع فيديو وملفات صوتية إلى عائلتك وزملائك وأصدقائك. يستخدم أطر عمل كيدي وأبرزها Kirigami لتوفير تجربة متقاربة عبر منصات متعددة.</p>
-    <p xml:lang="ca">El NeoChat és un client de Matrix, el protocol descentralitzat de comunicacions de missatgeria instantània. Permet enviar missatges de text, fitxers de vídeo i d'àudio a la família, col·legues i amics. Fa servir els Frameworks de KDE i, sobretot, el Kirigami per a proporcionar una experiència convergent a través de diverses plataformes.</p>
-    <p xml:lang="ca-valencia">NeoChat és un client de Matrix, el protocol descentralitzat de comunicacions de missatgeria instantània. Permet enviar missatges de text, fitxers de vídeo i d'àudio a la família, col·legues i amics. Utilitza els Frameworks de KDE i, sobretot, Kirigami per a proporcionar una experiència convergent a través de diverses plataformes.</p>
-    <p xml:lang="en-GB">NeoChat is a client for Matrix, the decentralised communication protocol for instant messaging. It allows you to send text messages, videos and audio files to your family, colleagues and friends. It uses KDE frameworks and most notably Kirigami to provide a convergent experience across multiple platforms.</p>
-    <p xml:lang="eo">NeoChat estas kliento por Matrix, la malcentra komunikoprotokolo por tuja mesaĝado. Ĝi ebligas al vi sendi tekstmesaĝojn, filmetojn kaj sondosierojn al via familio, kolegoj kaj amikoj. Ĝi uzas KDE-framojn kaj precipe Kirigami por disponigi konverĝan sperton tra pluraj platformoj.</p>
-    <p xml:lang="es">NeoChat es un cliente para Matrix, el protocolo de comunicaciones descentralizado para mensajería instantánea. Le permite enviar mensajes de texto, vídeos y archivos de sonido a su familia, compañeros de trabajo y amigos. Usa la infraestructura de KDE y, en particular, Kirigami para proporcionar una experiencia convergente en muchas plataformas.</p>
-    <p xml:lang="eu">NeoChat «Matrix»erako, bat-bateko mezularitzarako komunikazio deszentralizatuko protokolorako, bezero bat da. Zure sendiari, kide eta lagunei testu mezuak, bideo eta audio fitxategiak bidaltzeko aukera ematen dizu. «KDE Frameworks» eta bereziki «Kirigami» erabiltzen ditu plataforma anitzen artean esperientzia konbergente bat eskaintzeko.</p>
-    <p xml:lang="fi">NeoChat on asiakassovellus Matrixille, hajautetulle pikaviestinyhteyskäytännölle. Sillä voi lähettää teksti-, video- ja ääniviestejä perheelle, tutuille ja ystäville. Se käyttää KDE-kehystä ja erityisesti Kirigamia tuottaakseen mukautuvan monialustaisen käyttökokemuksen.</p>
-    <p xml:lang="fr">NeoChat est un client pour le protocole Matrix, un protocole décentralisé de communications pour messagerie instantané. Il vous permet d'envoyer des messages de texte, des vidéos et des fichiers audio à votre famille, vos collègues et vos amis. Il utilise les environnements de développement et plus précisément Kirigami pour fournir une expérience convergente sur plusieurs plate-formes. </p>
-    <p xml:lang="gl">NeoChat é un cliente para Matrix, o protocolo de comunicación descentralizada para mensaxaría instantánea. Podes enviar mensaxes de texto, vídeos e ficheiros de son á túa familia, colegas e amizades. Usas infraestruturas de KDE e principalmente Kirigami para proporcionar unha experiencia de uso converxente para varias plataformas.</p>
-    <p xml:lang="ia">NeoChat es un cliente per Matrix, le protocollo de communication decentralisate per messager instantanee. Illo te permitte inviar messager de texto, files de video e audio a tu familia, collegas e amicos usante. Illo usa KDE frameworks e super toto Kirigamii forni un experientia convergente trans platteforme multiple.</p>
-    <p xml:lang="it">NeoChat è un client per Matrix, il protocollo di comunicazione decentralizzato per la messaggistica istantanea. Ti consente di inviare messaggi di testo, video e file audio a familiari, colleghi e amici. Utilizza i framework KDE e in particolare Kirigami per fornire un'esperienza convergente su più piattaforme.</p>
-    <p xml:lang="ka">NeoChat არის Matrix კლიენტი. ის საშუალებას გაძლევთ გაგზავნოთ ტექსტური შეტყობინებები, ვიდეოები და აუდიო ფაილები თქვენს ოჯახს, კოლეგებსა და მეგობრებს მატრიქსის პროტოკოლის გამოყენებით.</p>
-    <p xml:lang="ko">NeoChat은 분산형 인스턴트 메시징 통신 프로토콜인 Matrix 클라이언트입니다. 가족, 동료, 친구에게 텍스트 메시지, 동영상, 오디오 파일을 전송할 수 있습니다. KDE 프레임워크와 Kirigami를 사용하여 다양한 플랫폼에서 일관적인 사용자 경험을 제공합니다.</p>
-    <p xml:lang="nl">NeoChat is een client voor Matrix, het gedecentraliseerde communicatieprotocol voor instant messages. Het biedt u het verzenden van tekstberichten, video's en geluidsbestanden naar uw familie, collega's en vrienden. Het gebruik KDE frameworks en het meest opmerkelijk Kirigami om een convergente ervaring te leveren op meerdere platforms.</p>
-    <p xml:lang="nn">NeoChat er ein klient for Matrix, ein protokoll for desentralisert kommunikasjon. Du kan utveksla tekst, lyd og videoar med kollegaar, vennar og familie. Programmet brukar KDE Frameworks og Kirigami for å gje ei brukarflate tilpassa ulike plattformer.</p>
-    <p xml:lang="pl">NeoChat jest programem do Matriksa, protokołu rozproszonego porozumiewania się w czasie rzeczywistym. Umożliwia wysyłanie wiadomości tekstowych, filmów oraz dźwięku do twojej rodziny, znajomych oraz przyjaciół. Używa szkieletów KDE i głównie Kirigami, aby zapewnić spójne wrażenia na wielu platformach</p>
-    <p xml:lang="pt">O NeoChat é um cliente do Matrix. O mesmo permite-lhe enviar mensagens de texto, ficheiros de vídeo e áudio para a sua família, colegas e amigos com o protocolo Matrix. Usa as plataformas do KDE, e principalmente o Kirigami, para oferecer uma experiência convergente entre várias plataformas.</p>
-    <p xml:lang="sl">Neochat je odjemalec za Matrix, decentralizirani komunikacijski protokol za takojšnje sporočanje. Omogoča vam pošiljanje besedilnih sporočil, videoposnetkov in zvočnih datotek svoji družini, sodelavcem in prijateljem. Uporablja okvire ogrodje KDE frameworks in predvsem Kirigami za zagotavljanje konvergentne izkušnje na več platformah.</p>
-    <p xml:lang="sv">NeoChat är en klient för Matrix, det decentraliserade kommunikationsprotokollet för direktmeddelanden. Den låter dig skicka textmeddelanden, videor och ljudfiler till din familj, kollegor och vänner. Den använder KDE Ramverk, i synnerhet Kirigami, för att tillhandahålla en konvergent upplevelse på flera plattformar.</p>
-    <p xml:lang="tr">NeoChat, anlık iletileşme için merkezi olmayan iletişim protokolü olan Matrix için bir istemcidir. Ailenize, iş arkadaşlarınıza ve arkadaşlarınıza metin iletiler, videolar ve ses dosyaları göndermenize olanak tanır. Birden çok platformda yakınsak bir deneyim sağlamak için KDE Frameworks ve en önemlilerinden Kirigami'yi kullanır.</p>
-    <p xml:lang="uk">NeoChat — клієнт Matrix, децентралізованого протоколу спілкування для миттєвого обміну повідомленнями. За його допомогою ви можете надсилати текстові повідомлення, відео та звукові файли вашій родин, колегами та друзям. У програмі використано бібліотеки KDE, зокрема Kirigami, для надання однорідного середовища на декількох програмних та апаратних платформах.</p>
-    <p xml:lang="x-test">xxNeoChat is a client for Matrix, the decentralized communication protocol for instant messaging. It allows you to send text messages, videos and audio files to your family, colleagues and friends. It uses KDE frameworks and most notably Kirigami to provide a convergent experience across multiple platforms.xx</p>
-    <p xml:lang="zh-TW">NeoChat 是去中心化即時通訊協定 Matrix 的一個用戶端。它讓您可以傳送文字訊息、影片、音訊檔案給您的家人、同事或朋友。NeoChat 使用 KDE frameworks，尤其是 Kirigami，來提供跨平台的響應式體驗。</p>
+    <p>NeoChat is a chat app that lets you take full advantage of the Matrix network. It provides you with a secure way to send text messages, videos and audio files to your family, colleagues and friends.</p>
+    <p xml:lang="ca">El NeoChat és una aplicació de xat que us permet aprofitar plenament la xarxa Matrix. Proporciona una manera segura d'enviar missatges de text, vídeos i arxius d'àudio a la vostra família, companys i amics.</p>
+    <p xml:lang="ca-valencia">NeoChat és una aplicació de xat que us permet aprofitar plenament la xarxa Matrix. Proporciona una manera segura d'enviar missatges de text, vídeos i arxius d'àudio a la vostra família, companys i amics.</p>
+    <p xml:lang="es">NeoChat es una aplicación de chat que le permite aprovechar al máximo la red Matrix. Le proporciona un modo seguro de enviar mensajes de texto, vídeos y archivos de sonido a su familia, colegas y amigos.</p>
+    <p xml:lang="eu">NeoChat, Matrix sarearen abantaila guztiei probetsua ateratzeko aukera ematen dizun berriketa aplikaizo bat da. Zure familiari, kideei eta lagunei testu mezuak, bideoak eta audio fitxategiak era seguruan bidaltzeko aukera ematen dizu.</p>
+    <p xml:lang="ia">NeoChat es un app de conversation que te permitte prender avantage plen del rete Matrix. Il te forni un modo secur de inviar messages de texto, videos e files audio a tui familia, collegas e amicos.</p>
+    <p xml:lang="it">NeoChat è un'applicazione di chat che ti consente di sfruttare appieno la rete Matrix. Ti fornisce un modo sicuro per inviare messaggi di testo, video e file audio a familiari, colleghi e amici.</p>
+    <p xml:lang="ka">NeoChat ჩატის აპია, რომელიც საშუალება გაძლევთ, Matrix-ის ქსელის საშუალებები ბოლომდე გამოიყენოთ. ის გაძლევთ უსაფრთხო გზას, გააგზავნოთ ტექსტური შეტყობინებები, ვიდეოებ და აუდიოფაილები თქვენს ოჯახთან, კოლეგებთან და მეგობრებთან.</p>
+    <p xml:lang="nl">NeoChat is een chat-toepassing die u het volledige voordeel van het Matrix-netwerk laat genieten. Het levert u op een veilige manier tekstberichten, video's en geluidsbestanden naar uw familie, collega's en vrienden te verzenden.</p>
+    <p xml:lang="pl">NoeChat to aplikacja do rozmów, która umożliwia wykorzystanie wszystkich możliwości Matriksa. Umożliwia wysyłanie wiadomości tekstowych, filmów i dźwięków w bezpieczny sposób do twojej rodziny, kolegów i przyjaciół.</p>
+    <p xml:lang="sl">NeoChat je aplikacija za klepet, ki vam omogoča, da v celoti izkoristite omrežje Matrix. Zagotavlja vam varen način za pošiljanje besedilnih sporočil, videoposnetkov in zvočnih datotek vaši družini, sodelavcem in prijateljem.</p>
+    <p xml:lang="tr">NeoChat, Matrix ağının tüm özelliklerini kullanan bir sohbet uygulamasıdır. Ailenize, arkadaşlarınıza ve iş arkadaşlarınıza metin iletileri, ses ve video dosyaları göndermenin kolay bir yolunu sunar.</p>
+    <p xml:lang="uk">NeoChat є програмою для спілкування, за допомогою якої ви можете скористатися усіма перевагами мережі Matrix. За її допомогою ви можете безпечно надсилати текстові повідомлення, відео та звукові файли вашим родичам, колегам та друзям.</p>
+    <p xml:lang="x-test">xxNeoChat is a chat app that lets you take full advantage of the Matrix network. It provides you with a secure way to send text messages, videos and audio files to your family, colleagues and friends.xx</p>
     <p>NeoChat aims to be a fully featured application for the Matrix specification. As such everything in the current stable specification with the notable exceptions of VoIP, threads and some aspects of End-to-End Encryption are supported. There are a few other smaller omissions due to the fact that the Matrix spec is constantly evolving but the aim remains to provide eventual support for the entire spec.</p>
     <p xml:lang="ar">يهدف نيوتشات إلى أن يكون تطبيقًا كامل الميزات لمواصفات ماتركس. على هذا النحو يتم دعم كل شيء في المواصفات المستقرة الحالية مع الاستثناءات الملحوظة لـ VoIP والخيوط وبعض جوانب التشفير من طرف إلى طرف. هناك عدد قليل من الإغفالات الصغيرة الأخرى بسبب حقيقة أن مواصفات ماتركس تتطور باستمرار ، ولكن يبقى الهدف توفير الدعم النهائي للمواصفات بأكملها.</p>
     <p xml:lang="ca">NeoChat pretén ser una aplicació amb totes les característiques per a l'especificació de Matrix. Com a tal, s'ha implementat tota l'especificació actual estable amb les notables excepcions de la VoIP, fils i alguns aspectes de l'encriptatge d'extrem a extrem. Hi ha algunes altres omissions més petites a causa del fet que l'especificació de Matrix està evolucionant constantment, però l'objectiu segueix sent proporcionar suport eventual per a tota l'especificació.</p>
@@ -114,7 +102,7 @@ to provide a convergent experience across multiple platforms.</p>
     <p xml:lang="gl">NeoChat pretende ser unha aplicación completa para a especificación de Matrix. Coas excepcións de VoIP, conversas fiadas e algúns aspectos da cifraxe de extremo a extremo, a versión estábel segue as especificacións. Existen algunhas outras pequenas omisións debido ao feito de que Matrix está en continua evolución pero a intención é implementar a especificación completa.</p>
     <p xml:lang="ia">NeoChat aspira a esser un application plenemente eminente per le specification de Matrix. Tal como omne cosas in le specification currentemente stabile con le exceptiones notabile de VOIP, threads e alcun aspectos del cryptation End-to-End es supportate. Il ha ltere pauc omissiones, debite al facto que le specification de Matrix es in evolution constante ma le aspiration remane a fornir supporto eventual per le integre specification.</p>
     <p xml:lang="it">NeoChat mira ad essere un'applicazione completa per le specifiche Matrix. Pertanto, sono supportati tutti gli elementi dell'attuale specifica stabile con le notevoli eccezioni di VoIP, conversazioni e alcuni aspetti della cifratura end-to-end. Ci sono alcune altre piccole omissioni dovute al fatto che le specifiche Matrix sono in continua evoluzione, ma l'obiettivo rimane quello di fornire un eventuale supporto per l'intera specifica.</p>
-    <p xml:lang="ka">NeoChat-ი მიზნად ისახავს Matrix სპეციფიკაციის სრული განხორციელება ჰქონდეს. როგორც ასეთი, ყველაფერი მიმდინარე სპეციფიკაციიდან, VoIP-ის, ძაფებისა და გამჭოლი დაშიფვრის ზოგიერთი ასპექტის გარდა, მხარდაჭერილია. შეძლება ასევე იყოს მცირე ლაფსუსებიც იმის გამო, რომ Matrix-ის სპეციფიკაცია მუდმივად ვითარგდება, მაგრამ ჩვენი მიზანი მისი სრული მხარდაჭერაა.</p>
+    <p xml:lang="ka">NeoChat მიზნად ისახავს Matrix სპეციფიკაციის სრული განხორციელება ჰქონდეს. როგორც ასეთი, ყველაფერი მიმდინარე სპეციფიკაციიდან, VoIP-ის, ძაფებისა და გამჭოლი დაშიფვრის ზოგიერთი ასპექტის გარდა, მხარდაჭერილია. შეძლება ასევე იყოს მცირე ლაფსუსებიც იმის გამო, რომ Matrix-ის სპეციფიკაცია მუდმივად ვითარდება, მაგრამ ჩვენი მიზანი მისი სრული მხარდაჭერაა.</p>
     <p xml:lang="ko">NeoChat은 Matrix 표준을 따르는 프로그램을 목표로 합니다. 현재 안정 버전의 표준에서 제공하는 기능의 대부분을 지원하며, VoIP, 스레드, 일부 종단간 암호화와 같은 기능은 아직 지원하지 않습니다. Matrix 표준은 계속하여 진화 중이기 때문에 일부 기능이 빠져 있을 수도 있지만 장기적으로는 전체 표준을 지원하는 것이 목표입니다.</p>
     <p xml:lang="nl">NeoChat richt zich op het volledig bieden van alle mogelijkheden van de Matrix-specificatie. Alles in de huidige stabiele specificatie met merkbare uitzondering van VoIP, gekoppelde discussies en sommige aspecten van eind-tot-eind versleuteling worden ondersteund. Er zijn een paar andere kleinere omissies vanwege het feit dat de Matrix specificatie constant evolueert maar het doel blijft het eventueel bieden van ondersteuning van de gehele specificatie.</p>
     <p xml:lang="nn">NeoChat har som mål å støtta all funksjonalitet i Matrix-spesifikasjonen. Førebels er alt i den gjeldande stabile spesifikasjonen støtta, med unntak av VoIP, trådar og nokre delar av ende-til-kryptering. Det finst òg andre småting som ikkje er støtta, sidan Matrix-spesifikasjon er i stadig endring, men målet er altså støtte for alt.</p>
@@ -122,7 +110,7 @@ to provide a convergent experience across multiple platforms.</p>
     <p xml:lang="pt">O NeoChat pretende ser uma aplicação completa para a especificação do Matrix. Como tal, tudo o que existe na especificação estável actual, com as notáveis excepções do VoIP, tópicos e alguns aspectos da Encriptação Ponto-a-Ponto, são suportados. Existem mais algumas omissões, devido ao facto que a norma do Matrix está em constante evolução, mas o objectivo continua a ser oferecer o suporte eventual para a norma por inteiro.</p>
     <p xml:lang="sl">Neochat cilja, da bi bila popolna aplikacija po specifikaciji Matrixa. Kot takšna vsebuje vse v trenutni stabilni specifikaciji z pomembnimi izjemami pri VoIP, nitih in nekaterih vidikov šifriranja od konca do konca. Obstaja nekaj drugih manjših opustitev zaradi dejstva, da se specifikacija Matrix nenehno razvija, vendar cilj ostaja zagotoviti morebitno podporo celotni specifikaciji.</p>
     <p xml:lang="sv">NeoChat har som mål att vara ett fullständigt program enligt Matrix-specifikationen. Som sådant stöds allt i den nuvarande stabila specifikationen, med de nämnvärda undantagen VoIP, trådar och några aspekter av kryptering hela vägen. Det finns några ytterligare utelämnanden på grund av att Matrix-specifikationen hela tiden utvecklas, men målet förblir att till slut erbjuda stöd för hela specifikationen.</p>
-    <p xml:lang="tr">NeoChat, Matrix belirtimi için tam özellikli bir uygulama olmayı hedefler. Bu nedenle; VoIP, ileti zincirleri ve Uçtan Uca Şifreleme'nin bazı yönleri gibi dikkate değer istisnalar dışında var olan kararlı belirtimdeki her şey desteklenir. Matrix belirtiminin sürekli gelişmesi nedeniyle birkaç küçük eksiklik daha var; ancak amaç tüm belirtim için nihai destek sağlamak olmayı sürdürüyor.</p>
+    <p xml:lang="tr">NeoChat, Matrix belirtimi için tam özellikli bir uygulama olmayı hedefler. Bu nedenle; VoIP, ileti zincirleri ve Uçtan Uca Şifreleme’nin bazı yönleri gibi dikkate değer istisnalar dışında var olan kararlı belirtimdeki her şey desteklenir. Matrix belirtiminin sürekli gelişmesi nedeniyle birkaç küçük eksiklik daha var; ancak amaç tüm belirtim için nihai destek sağlamak olmayı sürdürüyor.</p>
     <p xml:lang="uk">Метою створення NeoChat є повноцінна реалізація програми для специфікації Matrix. Як наслідок, реалізовано усе у поточній стабільній специфікації, окрім голосового інтернет-зв'язку, потоків та деяких аспектів міжвузлового шифрування. Є також декілька інших незначних прогалин через те, що специфікація Matrix постійно змінюється, але метою лишається повна підтримка специфікації.</p>
     <p xml:lang="x-test">xxNeoChat aims to be a fully featured application for the Matrix specification. As such everything in the current stable specification with the notable exceptions of VoIP, threads and some aspects of End-to-End Encryption are supported. There are a few other smaller omissions due to the fact that the Matrix spec is constantly evolving but the aim remains to provide eventual support for the entire spec.xx</p>
     <p xml:lang="zh-TW">NeoChat 以完整支援 Matrix 標準為目標，因此目前穩定版標準除了 VoIP、對話串與端對端加密的某些部分以外的所有部分都有支援。其他部分還有一些較小的不支援的部分，這是因為 Matrix 標準隨時都在改進，但目標仍然時最終提供整個標準的完整支援。</p>
@@ -175,7 +163,7 @@ to provide a convergent experience across multiple platforms.</p>
       <li xml:lang="sl">Polls - MSC3381</li>
       <li xml:lang="sv">Polls - MSC3381</li>
       <li xml:lang="ta">வாக்கெடுப்புகள் - MSC3381</li>
-      <li xml:lang="tr">Anketler - MSC3381</li>
+      <li xml:lang="tr">Anketler — MSC3381</li>
       <li xml:lang="uk">Опитування - MSC3381</li>
       <li xml:lang="x-test">xxPolls - MSC3381xx</li>
       <li xml:lang="zh-TW">投票 - MSC3381</li>
@@ -201,7 +189,7 @@ to provide a convergent experience across multiple platforms.</p>
       <li xml:lang="sl">Sticker Packs - MSC2545</li>
       <li xml:lang="sv">Sticker Packs - MSC2545</li>
       <li xml:lang="ta">ஒட்டி தொகுப்புகள் - MSC2545</li>
-      <li xml:lang="tr">Yapışkan Paketleri - MSC2545</li>
+      <li xml:lang="tr">Yapışkan Paketleri — MSC2545</li>
       <li xml:lang="uk">Пакунки наліпок - MSC2545</li>
       <li xml:lang="x-test">xxSticker Packs - MSC2545xx</li>
       <li xml:lang="zh-TW">貼圖包 - MSC2545</li>
@@ -227,7 +215,7 @@ to provide a convergent experience across multiple platforms.</p>
       <li xml:lang="sl">Location Events - MSC3488</li>
       <li xml:lang="sv">Location Events - MSC3488</li>
       <li xml:lang="ta">இட நிகழ்வுகள் - MSC3488</li>
-      <li xml:lang="tr">Konum Etkinlikleri - MSC3488</li>
+      <li xml:lang="tr">Konum Etkinlikleri — MSC3488</li>
       <li xml:lang="uk">Місцеві зустрічі - MSC3488</li>
       <li xml:lang="x-test">xxLocation Events - MSC3488xx</li>
       <li xml:lang="zh-TW">位置事件 - MSC3488</li>
@@ -235,47 +223,22 @@ to provide a convergent experience across multiple platforms.</p>
   </description>
   <url type="homepage">https://apps.kde.org/neochat</url>
   <url type="bugtracker">https://bugs.kde.org/enter_bug.cgi?product=NeoChat</url>
+  <url type="vcs-browser">https://invent.kde.org/network/neochat</url>
+  <url type="contact">https://go.kde.org/matrix/#/#neochat:kde.org</url>
+  <url type="donation">https://kde.org/community/donations/?app=neochat</url>
+  <url type="contribute">https://community.kde.org/Get_Involved/</url>
   <categories>
     <category>Network</category>
   </categories>
-  <developer_name>The KDE Community</developer_name>
-  <developer_name xml:lang="ar">مجتمع كِيدِي</developer_name>
-  <developer_name xml:lang="az">KDE Cəmiyyəti</developer_name>
-  <developer_name xml:lang="ca">La comunitat KDE</developer_name>
-  <developer_name xml:lang="ca-valencia">La comunitat KDE</developer_name>
-  <developer_name xml:lang="cs">Komunita KDE</developer_name>
-  <developer_name xml:lang="de">Die KDE-Gemeinschaft</developer_name>
-  <developer_name xml:lang="el">Η Κοινότητα του KDE</developer_name>
-  <developer_name xml:lang="en-GB">The KDE Community</developer_name>
-  <developer_name xml:lang="eo">La KDE-Komunumo</developer_name>
-  <developer_name xml:lang="es">La comunidad KDE</developer_name>
-  <developer_name xml:lang="eu">KDE komunitatea</developer_name>
-  <developer_name xml:lang="fi">KDE-yhteisö</developer_name>
-  <developer_name xml:lang="fr">La communauté de KDE</developer_name>
-  <developer_name xml:lang="gl">A comunidade KDE</developer_name>
-  <developer_name xml:lang="hu">A KDE Közösség</developer_name>
-  <developer_name xml:lang="ia">Le communitate de KDE</developer_name>
-  <developer_name xml:lang="id">Komunitas KDE</developer_name>
-  <developer_name xml:lang="ie">Li comunité de KDE</developer_name>
-  <developer_name xml:lang="it">La comunità KDE</developer_name>
-  <developer_name xml:lang="ka">KDE-ის საზოგადოება</developer_name>
-  <developer_name xml:lang="ko">KDE 커뮤니티</developer_name>
-  <developer_name xml:lang="nl">De KDE gemeenschap</developer_name>
-  <developer_name xml:lang="nn">KDE-fellesskapet</developer_name>
-  <developer_name xml:lang="pa">ਕੇਡੀਈ ਕਮਿਊਨਟੀ</developer_name>
-  <developer_name xml:lang="pl">Społeczność KDE</developer_name>
-  <developer_name xml:lang="pt">A Comunidade do KDE</developer_name>
-  <developer_name xml:lang="pt-BR">A comunidade KDE</developer_name>
-  <developer_name xml:lang="ru">Сообщество KDE</developer_name>
-  <developer_name xml:lang="sk">KDE Komunita</developer_name>
-  <developer_name xml:lang="sl">Skupnost KDE</developer_name>
-  <developer_name xml:lang="sv">KDE-gemenskapen</developer_name>
-  <developer_name xml:lang="ta">கே.டீ.யீ. சமூகம்</developer_name>
-  <developer_name xml:lang="tr">KDE Topluluğu</developer_name>
-  <developer_name xml:lang="uk">Спільнота KDE</developer_name>
-  <developer_name xml:lang="x-test">xxThe KDE Communityxx</developer_name>
-  <developer_name xml:lang="zh-CN">KDE 社区</developer_name>
-  <developer_name xml:lang="zh-TW">KDE 社群</developer_name>
+  <keywords>
+    <keyword>Matrix</keyword>
+    <keyword>Kirigami</keyword>
+  </keywords>
+  <developer>
+    <id>kde.org</id>
+    <name>The KDE Community</name>
+    <url>https://kde.org</url>
+  </developer>
   <metadata_license>CC0-1.0</metadata_license>
   <project_license>GPL-3.0</project_license>
   <custom>
@@ -290,11 +253,57 @@ to provide a convergent experience across multiple platforms.</p>
   <launchable type="desktop-id">org.kde.neochat.desktop</launchable>
   <screenshots>
     <screenshot type="default">
-      <image>https://cdn.kde.org/screenshots/neochat/application-mobile.png</image>
+      <image>https://cdn.kde.org/screenshots/neochat/application.png</image>
+      <caption>Main view with room list, chat, and room information</caption>
+      <caption xml:lang="ar">العرض الرئيسة مع قائمة الغرف والدردشات و معلومات الغرفة</caption>
+      <caption xml:lang="ca">Vista principal amb la llista de sales, xats i informació de les sales</caption>
+      <caption xml:lang="ca-valencia">Vista principal amb la llista de sales, xats i informació de les sales</caption>
+      <caption xml:lang="eo">Ĉefa vido kun ĉambra listo, babilejo kaj ĉambra informo</caption>
+      <caption xml:lang="es">Vista principal con la lista de salas, chat e información de la sala</caption>
+      <caption xml:lang="eu">Ikuspegi nagusia gela-zerrenda, berriketa, eta gelako informazioarekin</caption>
+      <caption xml:lang="fi">Päänäkymä, jossa huoneluettelo, keskustelu ja huoneen tiedot</caption>
+      <caption xml:lang="fr">Vue principale avec la liste des salons ainsi que des informations sur les salons et forums de discussions</caption>
+      <caption xml:lang="gl">Vista principal coa lista de salas, a charla, e información da sala.</caption>
+      <caption xml:lang="ia">Vista principal con lista de sala, chat e information de sala</caption>
+      <caption xml:lang="it">Vista principale con elenco delle stanze, chat e informazioni sulla stanza</caption>
+      <caption xml:lang="ka">მთავარი ხედი სურათების სიით, ჩატით და ოთახის ინფორმაციით</caption>
+      <caption xml:lang="ko">대화방 목록, 채팅, 대화방 정보가 표시된 주 보기</caption>
+      <caption xml:lang="nl">Hoofdweergave met lijst met rooms, chat en roominformatie</caption>
+      <caption xml:lang="nn">Hovudvising med romliste, pratevindauge og rominformasjon</caption>
+      <caption xml:lang="pl">Główny widok z wykazem pokojów, rozmowami i szczegółami pokojów</caption>
+      <caption xml:lang="pt">A área principal com a lista de salas e com informações sobre a conversa e a sala</caption>
+      <caption xml:lang="sl">Glavni pogled s seznamom sob, klepetom in informacijami o sobah</caption>
+      <caption xml:lang="sv">Huvudvy med rumslista, chatt, och rumsinformation</caption>
+      <caption xml:lang="ta">அரங்குப்பட்டியல், உரையாடல், மற்றும் அரங்குவிவரங்களைக் கொண்டுள்ள பிரதான காட்சி</caption>
+      <caption xml:lang="tr">Oda listesini, sohbet penceresini ve oda bilgisini gösteren ana görünüm</caption>
+      <caption xml:lang="uk">Головна панель із списком кімнат, спілкуванням та даними щодо кімнати</caption>
+      <caption xml:lang="x-test">xxMain view with room list, chat, and room informationxx</caption>
+      <caption xml:lang="zh-TW">主頁面，包含聊天室列表、聊天內容，與聊天室資訊</caption>
     </screenshot>
     <screenshot type="default">
-      <image>https://cdn.kde.org/screenshots/neochat/application.png</image>
+      <image>https://cdn.kde.org/screenshots/neochat/spaces.png</image>
+      <caption>Discover new communities with Matrix Spaces</caption>
+      <caption xml:lang="ca">Descobriu comunitats noves amb els espais de Matrix</caption>
+      <caption xml:lang="ca-valencia">Descobriu comunitats noves amb els espais de Matrix</caption>
+      <caption xml:lang="es">Descubra nuevas comunidades con los espacios de Matrix</caption>
+      <caption xml:lang="eu">Ezagutu komunitate berriak Matrixeko Tokiak erabiliz</caption>
+      <caption xml:lang="ia">Discoperi nove communitate con Matrix Spaces (Spatios de Matrix)</caption>
+      <caption xml:lang="it">Scopri nuove comunità con Matrix Spaces</caption>
+      <caption xml:lang="ka">აღმოაჩინეთ ახალი საზოგადოებები Matrix Spaces-თან ერთად</caption>
+      <caption xml:lang="nl">Ontdek nieuwe gemeenschappen met Matrix-ruimten</caption>
+      <caption xml:lang="pl">Odkrywaj nowe społeczności w Przestrzeniach Matriksa</caption>
+      <caption xml:lang="sl">Odkrijte nove skupnosti z Matrix Spaces</caption>
+      <caption xml:lang="tr">Matrix Alanlar ile yeni topluluklar keşfedin</caption>
+      <caption xml:lang="uk">Пошук нових спільнот за допомогою Matrix Spaces</caption>
+      <caption xml:lang="x-test">xxDiscover new communities with Matrix Spacesxx</caption>
     </screenshot>
+    <!--
+    Currently invalid. See https://github.com/ximion/appstream/issues/611
+    <screenshot type="default" environment="plasma-mobile">
+      <image>https://cdn.kde.org/screenshots/neochat/neochat-1.png</image>
+      <caption>List of chats on mobile</caption>
+    </screenshot>
+    -->
     <screenshot environment="windows">
       <image>https://cdn.kde.org/screenshots/neochat/NeoChat-Windows-Timeline.png</image>
       <caption>Main view with room list, chat, and room information</caption>
@@ -357,6 +366,24 @@ to provide a convergent experience across multiple platforms.</p>
     <content_attribute id="social-chat">intense</content_attribute>
   </content_rating>
   <releases>
+    <release version="24.02.0" date="2024-02-28">
+      <url>https://kde.org/announcements/megarelease/6/#neochat</url>
+      <description>
+        <p>In the newest version, when launching the app, you will get a welcome page that lets you choose which account you want to use and lets you log in to other accounts. The welcome screen will also warn you when NeoChat cannot load an account.</p>
+        <p>NeoChat will also let you register a new account directly from the app itself. Deactivating your Matrix account is also possible from within NeoChat.</p>
+        <p>Spaces are a relatively new feature of Matrix that let you group chat channels together. This is used to improve the discoverability of rooms, manage large communities, or just tidy all the channels you are in. You can now do all this without leaving NeoChat.</p>
+        <p>NeoChat won't let you miss any new notifications anymore. We added a new page that includes all your recent notifications and when NeoChat is closed, you will still be able to receive push notifications. The main timeline will let you know when more messages are loading and when you reach the end of it.</p>
+        <p>More NeoChat Goodies</p>
+        <ul>
+          <li>QR Codes to share contacts</li>
+          <li>Improved room upgrades</li>
+          <li>Added button to reject invitation and ignore user</li>
+          <li>Display device security details</li>
+          <li>Added room security settings</li>
+        </ul>
+      </description>
+    </release>
+    <release version="23.08.5" date="2024-02-15"/>
     <release version="23.08.4" date="2023-12-07"/>
     <release version="23.08.3" date="2023-11-09"/>
     <release version="23.08.2" date="2023-10-12"/>
@@ -504,4 +531,8 @@ to provide a convergent experience across multiple platforms.</p>
       <url>https://carlschwan.eu/2020/12/23/announcing-neochat-1.0-the-kde-matrix-client/</url>
     </release>
   </releases>
+  <branding>
+    <color type="primary" scheme_preference="light">#a6e4f3</color>
+    <color type="primary" scheme_preference="dark">#235670</color>
+  </branding>
 </component>

org.kde.neochat.desktop

@@ -65,7 +65,7 @@ GenericName[ie]=Cliente de Matrix
 GenericName[it]=Client Matrix
 GenericName[ka]=Matrix -ის კლიენტი
 GenericName[ko]=Matrix 클라이언트
-GenericName[lt]=Matrix kliento programą
+GenericName[lt]=Matrix kliento programa
 GenericName[nl]=Matrix-client
 GenericName[nn]=Matrix-klient
 GenericName[pa]=ਮੈਟਰਿਕਸ ਕਲਾਈਂਟ

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

@@ -77,7 +77,7 @@ SPDX-License-Identifier: CC-BY-SA-4.0
 ></term>
   <listitem>
     <para
->Bir kullanıcı veya oda için matrix URI'si; örneğin, matrix:u/kullanıcı:örnek.org ve matrix:r/kök:örnek.org. Bu, NeoChat'in verilen odayı veya konuşmayı açmayı denemesini sağlar. </para>
+>Bir kullanıcı veya oda için matrix URI’si; örneğin, matrix:u/kullanıcı:örnek.org ve matrix:r/kök:örnek.org. Bu, NeoChat’in verilen odayı veya konuşmayı açmayı denemesini sağlar. </para>
   </listitem>
   </varlistentry>
 </variablelist>

src/CMakeLists.txt

@@ -56,6 +56,8 @@ add_library(neochat STATIC
     notificationsmanager.h
     models/sortfilterroomlistmodel.cpp
     models/sortfilterroomlistmodel.h
+    models/roomtreemodel.cpp
+    models/roomtreemodel.h
     chatdocumenthandler.cpp
     chatdocumenthandler.h
     models/devicesmodel.cpp
@@ -144,6 +146,25 @@ add_library(neochat STATIC
     models/timelinemodel.cpp
     models/timelinemodel.h
     enums/pushrule.h
+    models/itinerarymodel.cpp
+    models/itinerarymodel.h
+    proxycontroller.cpp
+    proxycontroller.h
+    models/linemodel.cpp
+    models/linemodel.h
+    events/locationbeaconevent.h
+    events/serveraclevent.h
+    events/widgetevent.h
+    enums/messagecomponenttype.h
+    models/messagecontentmodel.cpp
+    models/messagecontentmodel.h
+    enums/neochatroomtype.h
+    models/sortfilterroomtreemodel.cpp
+    models/sortfilterroomtreemodel.h
+    mediamanager.cpp
+    mediamanager.h
+    models/statekeysmodel.cpp
+    models/statekeysmodel.h
 )
 
 qt_add_qml_module(neochat URI org.kde.neochat NO_PLUGIN
@@ -161,11 +182,10 @@ qt_add_qml_module(neochat URI org.kde.neochat NO_PLUGIN
         qml/UserInfoDesktop.qml
         qml/RoomPage.qml
         qml/RoomWindow.qml
-        qml/JoinRoomPage.qml
+        qml/ExploreRoomsPage.qml
         qml/ManualRoomDialog.qml
         qml/ExplorerDelegate.qml
         qml/InviteUserPage.qml
-        qml/StartChatPage.qml
         qml/ImageEditorPage.qml
         qml/WelcomePage.qml
         qml/General.qml
@@ -190,21 +210,12 @@ qt_add_qml_module(neochat URI org.kde.neochat NO_PLUGIN
         qml/TimelineDelegate.qml
         qml/ReplyComponent.qml
         qml/StateDelegate.qml
-        qml/RichLabel.qml
         qml/MessageDelegate.qml
         qml/Bubble.qml
         qml/SectionDelegate.qml
-        qml/VideoDelegate.qml
         qml/ReactionDelegate.qml
-        qml/LinkPreviewDelegate.qml
-        qml/AudioDelegate.qml
-        qml/FileDelegate.qml
-        qml/ImageDelegate.qml
-        qml/EncryptedDelegate.qml
         qml/EventDelegate.qml
-        qml/TextDelegate.qml
         qml/ReadMarkerDelegate.qml
-        qml/PollDelegate.qml
         qml/MimeComponent.qml
         qml/StateComponent.qml
         qml/MessageEditComponent.qml
@@ -267,15 +278,13 @@ qt_add_qml_module(neochat URI org.kde.neochat NO_PLUGIN
         qml/EmojiTonesPicker.qml
         qml/EmojiDelegate.qml
         qml/EmojiGrid.qml
-        qml/SearchPage.qml
-        qml/LocationDelegate.qml
+        qml/RoomSearchPage.qml
         qml/LocationChooser.qml
         qml/TimelineView.qml
         qml/InvitationView.qml
         qml/AvatarTabButton.qml
         qml/SpaceDrawer.qml
         qml/OsmLocationPlugin.qml
-        qml/LiveLocationDelegate.qml
         qml/FullScreenMap.qml
         qml/LocationsPage.qml
         qml/LocationMapItem.qml
@@ -286,7 +295,6 @@ qt_add_qml_module(neochat URI org.kde.neochat NO_PLUGIN
         qml/RoomInformation.qml
         qml/RoomMedia.qml
         qml/ChooseRoomDialog.qml
-        qml/ShareAction.qml
         qml/SpaceHomePage.qml
         qml/SpaceHierarchyDelegate.qml
         qml/RemoveChildDialog.qml
@@ -298,11 +306,49 @@ qt_add_qml_module(neochat URI org.kde.neochat NO_PLUGIN
         qml/NotificationsView.qml
         qml/LoadingDelegate.qml
         qml/TimelineEndDelegate.qml
+        qml/SearchPage.qml
+        qml/ServerComboBox.qml
+        qml/UserSearchPage.qml
+        qml/ManualUserDialog.qml
+        qml/MessageComponentChooser.qml
+        qml/TextComponent.qml
+        qml/ImageComponent.qml
+        qml/VideoComponent.qml
+        qml/AudioComponent.qml
+        qml/EncryptedComponent.qml
+        qml/FileComponent.qml
+        qml/LocationComponent.qml
+        qml/LiveLocationComponent.qml
+        qml/PollComponent.qml
+        qml/LinkPreviewComponent.qml
+        qml/LoadComponent.qml
+        qml/RecommendedSpaceDialog.qml
+        qml/RoomTreeSection.qml
+        qml/DelegateContextMenu.qml
+        qml/ShareDialog.qml
+        qml/FeatureFlagPage.qml
+        qml/IgnoredUsersDialog.qml
+        qml/AccountData.qml
+        qml/StateKeys.qml
+        qml/CodeComponent.qml
+        qml/QuoteComponent.qml
     RESOURCES
         qml/confetti.png
         qml/glowdot.png
 )
 
+if(UNIX)
+    qt_target_qml_sources(neochat QML_FILES qml/ShareAction.qml)
+else()
+    set_source_files_properties(qml/ShareActionStub.qml PROPERTIES
+        QT_RESOURCE_ALIAS qml/ShareAction.qml
+    )
+    qt_target_qml_sources(neochat QML_FILES qml/ShareActionStub.qml)
+endif()
+
+
+configure_file(config-neochat.h.in ${CMAKE_CURRENT_BINARY_DIR}/config-neochat.h)
+
 if(WIN32)
     set_target_properties(neochat PROPERTIES OUTPUT_NAME "neochatlib")
 endif()
@@ -316,6 +362,15 @@ ecm_qt_declare_logging_category(neochat
     EXPORT NEOCHAT
 )
 
+ecm_qt_declare_logging_category(neochat
+    HEADER "publicroomlist_logging.h"
+    IDENTIFIER "PublicRoomList"
+    CATEGORY_NAME "org.kde.neochat.publicroomlistmodel"
+    DESCRIPTION "Neochat: publicroomlistmodel"
+    DEFAULT_SEVERITY Info
+    EXPORT NEOCHAT
+)
+
 ecm_qt_declare_logging_category(neochat
     HEADER "eventhandler_logging.h"
     IDENTIFIER "EventHandling"

src/chatbarcache.cpp

@@ -43,14 +43,14 @@ void ChatBarCache::setReplyId(const QString &replyId)
     if (m_relationType == Reply && m_relationId == replyId) {
         return;
     }
-    m_relationId = replyId;
+    const auto oldEventId = std::exchange(m_relationId, replyId);
     if (m_relationId.isEmpty()) {
         m_relationType = None;
     } else {
         m_relationType = Reply;
     }
     m_attachmentPath = QString();
-    Q_EMIT relationIdChanged();
+    Q_EMIT relationIdChanged(oldEventId, m_relationId);
     Q_EMIT attachmentPathChanged();
 }
 
@@ -72,14 +72,14 @@ void ChatBarCache::setEditId(const QString &editId)
     if (m_relationType == Edit && m_relationId == editId) {
         return;
     }
-    m_relationId = editId;
+    const auto oldEventId = std::exchange(m_relationId, editId);
     if (m_relationId.isEmpty()) {
         m_relationType = None;
     } else {
         m_relationType = Edit;
     }
     m_attachmentPath = QString();
-    Q_EMIT relationIdChanged();
+    Q_EMIT relationIdChanged(oldEventId, m_relationId);
     Q_EMIT attachmentPathChanged();
 }
 
@@ -114,10 +114,9 @@ QString ChatBarCache::relationMessage() const
         qWarning() << "ChatBarCache created with incorrect parent, a NeoChatRoom must be set as the parent on creation.";
         return {};
     }
-    EventHandler eventhandler;
-    eventhandler.setRoom(room);
+
     if (auto event = room->findInTimeline(m_relationId); event != room->historyEdge()) {
-        eventhandler.setEvent(&**event);
+        EventHandler eventhandler(room, &**event);
         return eventhandler.getPlainBody();
     }
     return {};
@@ -154,9 +153,9 @@ void ChatBarCache::setAttachmentPath(const QString &attachmentPath)
     }
     m_attachmentPath = attachmentPath;
     m_relationType = None;
-    m_relationId = QString();
+    const auto oldEventId = std::exchange(m_relationId, QString());
     Q_EMIT attachmentPathChanged();
-    Q_EMIT relationIdChanged();
+    Q_EMIT relationIdChanged(oldEventId, m_relationId);
 }
 
 QList<Mention> *ChatBarCache::mentions()

src/chatbarcache.h

@@ -186,7 +186,7 @@ public:
 
 Q_SIGNALS:
     void textChanged();
-    void relationIdChanged();
+    void relationIdChanged(const QString &oldEventId, const QString &newEventId);
     void threadIdChanged();
     void attachmentPathChanged();
 

src/config-neochat.h.in

@@ -0,0 +1,8 @@
+/*
+   SPDX-FileCopyrightText: 2024 Tobias Fella <tobias.fella@kde.org>
+   SPDX-License-Identifier: LGPL-2.0-or-later
+*/
+
+#pragma once
+
+#define CMAKE_INSTALL_FULL_LIBEXECDIR_KF6 "${KDE_INSTALL_FULL_LIBEXECDIR_KF}"

src/controller.cpp

@@ -23,12 +23,13 @@
 #include <Quotient/csapi/logout.h>
 #include <Quotient/csapi/notifications.h>
 #include <Quotient/eventstats.h>
-#include <Quotient/jobs/downloadfilejob.h>
 #include <Quotient/qt_connection_util.h>
 
 #include "neochatconfig.h"
+#include "neochatconnection.h"
 #include "neochatroom.h"
 #include "notificationsmanager.h"
+#include "proxycontroller.h"
 #include "roommanager.h"
 
 #if defined(Q_OS_WIN) || defined(Q_OS_MAC)
@@ -37,6 +38,14 @@
 #include "trayicon_sni.h"
 #endif
 
+#if QT_VERSION < QT_VERSION_CHECK(6, 6, 0)
+#ifndef Q_OS_ANDROID
+#include <QDBusConnection>
+#include <QDBusInterface>
+#include <QDBusMessage>
+#endif
+#endif
+
 bool testMode = false;
 
 using namespace Quotient;
@@ -46,7 +55,7 @@ Controller::Controller(QObject *parent)
 {
     Connection::setRoomType<NeoChatRoom>();
 
-    setApplicationProxy();
+    ProxyController::instance().setApplicationProxy();
 
 #ifndef Q_OS_ANDROID
     setQuitOnLastWindowClosed();
@@ -102,7 +111,9 @@ Controller::Controller(QObject *parent)
                 NotificationsManager::instance().handleNotifications(connection);
             });
             connectSingleShot(connection, &NeoChatConnection::syncDone, this, [this, connection] {
-                connection->setupPushNotifications(m_endpoint);
+                if (!m_endpoint.isEmpty()) {
+                    connection->setupPushNotifications(m_endpoint);
+                }
             });
         }
         oldAccountCount = m_accountRegistry.size();
@@ -118,7 +129,9 @@ Controller::Controller(QObject *parent)
         }
     });
 
-    connector->registerClient(i18n("Receiving push notifications"));
+    connector->registerClient(
+        i18nc("The reason for using push notifications, as in: '[Push notifications are used for] Receiving notifications for new messages'",
+              "Receiving notifications for new messages"));
 
     m_endpoint = connector->endpoint();
 #endif
@@ -145,6 +158,7 @@ void Controller::addConnection(NeoChatConnection *c)
     connect(c, &NeoChatConnection::loggedOut, this, [this, c] {
         dropConnection(c);
     });
+    connect(c, &NeoChatConnection::badgeNotificationCountChanged, this, &Controller::updateBadgeNotificationCount);
 
     c->sync();
 
@@ -178,10 +192,12 @@ void Controller::invokeLogin()
                 }
 
                 auto connection = new NeoChatConnection(account.homeserver());
-                connect(connection, &NeoChatConnection::connected, this, [this, connection] {
+                m_connectionsLoading[accountId] = connection;
+                connect(connection, &NeoChatConnection::connected, this, [this, connection, accountId] {
                     connection->loadState();
                     addConnection(connection);
                     m_accountsLoading.removeAll(connection->userId());
+                    m_connectionsLoading.remove(accountId);
                     Q_EMIT accountsLoadingChanged();
                 });
                 connect(connection, &NeoChatConnection::networkError, this, [this](const QString &error, const QString &, int, int) {
@@ -285,26 +301,15 @@ void Controller::setActiveConnection(NeoChatConnection *connection)
     if (connection == m_connection) {
         return;
     }
-    if (m_connection != nullptr) {
-        disconnect(m_connection, &NeoChatConnection::syncError, this, nullptr);
-        disconnect(m_connection, &NeoChatConnection::accountDataChanged, this, nullptr);
-    }
-    m_connection = connection;
-    if (connection != nullptr) {
-        connect(connection, &NeoChatConnection::requestFailed, this, [](BaseJob *job) {
-            if (dynamic_cast<DownloadFileJob *>(job) && job->jsonData()["errcode"_ls].toString() == "M_TOO_LARGE"_ls) {
-                RoomManager::instance().warning(i18n("File too large to download."), i18n("Contact your matrix server administrator for support."));
-            }
-        });
-    }
-    NeoChatConfig::self()->save();
-    Q_EMIT activeConnectionChanged();
-}
 
-void Controller::forceRefreshTextDocument(QQuickTextDocument *textDocument, QQuickItem *item)
-{
-    // HACK: Workaround bug QTBUG 93281
-    connect(textDocument->textDocument(), SIGNAL(imagesLoaded()), item, SLOT(updateWholeDocument()));
+    m_connection = connection;
+
+    if (m_connection != nullptr) {
+        m_connection->refreshBadgeNotificationCount();
+        updateBadgeNotificationCount(m_connection, m_connection->badgeNotificationCount());
+    }
+
+    Q_EMIT activeConnectionChanged();
 }
 
 void Controller::listenForNotifications()
@@ -328,34 +333,34 @@ void Controller::listenForNotifications()
 #endif
 }
 
-void Controller::setApplicationProxy()
+void Controller::updateBadgeNotificationCount(NeoChatConnection *connection, int count)
 {
-    NeoChatConfig *cfg = NeoChatConfig::self();
-    QNetworkProxy proxy;
+    if (connection == m_connection) {
+#if QT_VERSION < QT_VERSION_CHECK(6, 6, 0)
+#ifndef Q_OS_ANDROID
+        // copied from Telegram desktop
+        const auto launcherUrl = "application://org.kde.neochat.desktop"_ls;
+        // Gnome requires that count is a 64bit integer
+        const qint64 counterSlice = std::min(count, 9999);
+        QVariantMap dbusUnityProperties;
 
-    // type match to ProxyType from neochatconfig.kcfg
-    switch (cfg->proxyType()) {
-    case 1: // HTTP
-        proxy.setType(QNetworkProxy::HttpProxy);
-        proxy.setHostName(cfg->proxyHost());
-        proxy.setPort(cfg->proxyPort());
-        proxy.setUser(cfg->proxyUser());
-        proxy.setPassword(cfg->proxyPassword());
-        break;
-    case 2: // SOCKS 5
-        proxy.setType(QNetworkProxy::Socks5Proxy);
-        proxy.setHostName(cfg->proxyHost());
-        proxy.setPort(cfg->proxyPort());
-        proxy.setUser(cfg->proxyUser());
-        proxy.setPassword(cfg->proxyPassword());
-        break;
-    case 0: // System Default
-    default:
-        // do nothing
-        break;
+        if (counterSlice > 0) {
+            dbusUnityProperties["count"_ls] = counterSlice;
+            dbusUnityProperties["count-visible"_ls] = true;
+        } else {
+            dbusUnityProperties["count-visible"_ls] = false;
+        }
+
+        auto signal = QDBusMessage::createSignal("/com/canonical/unity/launcherentry/neochat"_ls, "com.canonical.Unity.LauncherEntry"_ls, "Update"_ls);
+
+        signal.setArguments({launcherUrl, dbusUnityProperties});
+
+        QDBusConnection::sessionBus().send(signal);
+#endif // Q_OS_ANDROID
+#else
+        qGuiApp->setBadgeNumber(count);
+#endif // QT_VERSION_CHECK(6, 6, 0)
     }
-
-    QNetworkProxy::setApplicationProxy(proxy);
 }
 
 bool Controller::isFlatpak() const
@@ -378,3 +383,13 @@ void Controller::setTestMode(bool test)
 {
     testMode = test;
 }
+
+void Controller::removeConnection(const QString &userId)
+{
+    if (m_connectionsLoading.contains(userId) && m_connectionsLoading[userId]) {
+        auto connection = m_connectionsLoading[userId];
+        m_accountsLoading.removeAll(userId);
+        Q_EMIT accountsLoadingChanged();
+        SettingsGroup("Accounts"_ls).remove(userId);
+    }
+}

src/controller.h

@@ -84,22 +84,8 @@ public:
 
     [[nodiscard]] bool supportSystemTray() const;
 
-    /**
-     * @brief Sets the QNetworkProxy for the application.
-     *
-     * @sa QNetworkProxy::setApplicationProxy
-     */
-    Q_INVOKABLE void setApplicationProxy();
-
     bool isFlatpak() const;
 
-    /**
-     * @brief Force a QQuickTextDocument to refresh when images are loaded.
-     *
-     * HACK: This is a workaround for QTBUG 93281.
-     */
-    Q_INVOKABLE void forceRefreshTextDocument(QQuickTextDocument *textDocument, QQuickItem *item);
-
     /**
      * @brief Start listening for notifications in dbus-activated mode.
      * These notifications will quit the application when closed.
@@ -110,6 +96,8 @@ public:
 
     static void setTestMode(bool testMode);
 
+    Q_INVOKABLE void removeConnection(const QString &userId);
+
 private:
     explicit Controller(QObject *parent = nullptr);
 
@@ -123,11 +111,13 @@ private:
 
     Quotient::AccountRegistry m_accountRegistry;
     QStringList m_accountsLoading;
+    QMap<QString, QPointer<Quotient::Connection>> m_connectionsLoading;
     QString m_endpoint;
 
 private Q_SLOTS:
     void invokeLogin();
     void setQuitOnLastWindowClosed();
+    void updateBadgeNotificationCount(NeoChatConnection *connection, int count);
 
 Q_SIGNALS:
     void errorOccured(const QString &error, const QString &detail);

src/enums/delegatetype.h

@@ -6,6 +6,13 @@
 #include <QObject>
 #include <QQmlEngine>
 
+#include <Quotient/events/encryptedevent.h>
+#include <Quotient/events/roomevent.h>
+#include <Quotient/events/roommessageevent.h>
+#include <Quotient/events/stickerevent.h>
+
+#include "events/pollevent.h"
+
 /**
  * @class DelegateType
  *
@@ -26,23 +33,34 @@ public:
      *       similar to the spec it is not the same.
      */
     enum Type {
-        Emote, /**< A message that begins with /me. */
-        Notice, /**< A notice event. */
-        Image, /**< A message that is an image. */
-        Audio, /**< A message that is an audio recording. */
-        Video, /**< A message that is a video. */
-        File, /**< A message that is a file. */
         Message, /**< A text message. */
-        Sticker, /**< A message that is a sticker. */
         State, /**< A state event in the room. */
-        Encrypted, /**< An encrypted message that cannot be decrypted. */
         ReadMarker, /**< The local user read marker. */
-        Poll, /**< The initial event for a poll. */
-        Location, /**< A location event. */
-        LiveLocation, /**< The initial event of a shared live location (i.e., the place where this is supposed to be shown in the timeline). */
         Loading, /**< A delegate to tell the user more messages are being loaded. */
         TimelineEnd, /**< A delegate to inform that all messages are loaded. */
         Other, /**< Anything that cannot be classified as another type. */
     };
     Q_ENUM(Type);
+
+    /**
+     * @brief Return the delegate type for the given event.
+     *
+     * @param event the event to return a type for.
+     *
+     * @sa Type
+     */
+    static Type typeForEvent(const Quotient::RoomEvent &event)
+    {
+        if (event.is<Quotient::RoomMessageEvent>() || event.is<Quotient::StickerEvent>() || event.is<Quotient::EncryptedEvent>()
+            || event.is<Quotient::PollStartEvent>()) {
+            return Message;
+        }
+        if (event.isStateEvent()) {
+            if (event.matrixType() == QStringLiteral("org.matrix.msc3672.beacon_info")) {
+                return Message;
+            }
+            return State;
+        }
+        return Other;
+    }
 };

src/enums/messagecomponenttype.h

@@ -0,0 +1,127 @@
+// SPDX-FileCopyrightText: 2024 James Graham <james.h.graham@protonmail.com>
+// SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
+
+#pragma once
+
+#include <QObject>
+#include <QQmlEngine>
+
+#include <Quotient/events/encryptedevent.h>
+#include <Quotient/events/roomevent.h>
+#include <Quotient/events/roommessageevent.h>
+#include <Quotient/events/stickerevent.h>
+
+#include "events/pollevent.h"
+
+/**
+ * @class MessageComponentType
+ *
+ * This class is designed to define the MessageComponentType enumeration.
+ */
+class MessageComponentType : public QObject
+{
+    Q_OBJECT
+    QML_ELEMENT
+    QML_UNCREATABLE("")
+
+public:
+    /**
+     * @brief The type of component that is needed for an event.
+     *
+     * @note While similar this is not the matrix event or message type. This is
+     *       to tell a QML Bubble what component to use to visualise all or part of
+     *       a room message.
+     */
+    enum Type {
+        Text, /**< A text message. */
+        Image, /**< A message that is an image. */
+        Audio, /**< A message that is an audio recording. */
+        Video, /**< A message that is a video. */
+        Code, /**< A code section. */
+        Quote, /**< A quote section. */
+        File, /**< A message that is a file. */
+        Poll, /**< The initial event for a poll. */
+        Location, /**< A location event. */
+        LiveLocation, /**< The initial event of a shared live location (i.e., the place where this is supposed to be shown in the timeline). */
+        Encrypted, /**< An encrypted message that cannot be decrypted. */
+        Reply, /**< A component to show a replied-to message. */
+        ReplyLoad, /**< A loading dialog for a reply. */
+        LinkPreview, /**< A preview of a URL in the message. */
+        LinkPreviewLoad, /**< A loading dialog for a link preview. */
+        Edit, /**< A text edit for editing a message. */
+        Other, /**< Anything that cannot be classified as another type. */
+    };
+    Q_ENUM(Type);
+
+    /**
+     * @brief Return the delegate type for the given event.
+     *
+     * @param event the event to return a type for.
+     *
+     * @sa Type
+     */
+    static Type typeForEvent(const Quotient::RoomEvent &event)
+    {
+        using namespace Quotient;
+
+        if (const auto e = eventCast<const RoomMessageEvent>(&event)) {
+            switch (e->msgtype()) {
+            case MessageEventType::Emote:
+                return MessageComponentType::Text;
+            case MessageEventType::Notice:
+                return MessageComponentType::Text;
+            case MessageEventType::Image:
+                return MessageComponentType::Image;
+            case MessageEventType::Audio:
+                return MessageComponentType::Audio;
+            case MessageEventType::Video:
+                return MessageComponentType::Video;
+            case MessageEventType::Location:
+                return MessageComponentType::Location;
+            case MessageEventType::File:
+                return MessageComponentType::File;
+            default:
+                return MessageComponentType::Text;
+            }
+        }
+        if (is<const StickerEvent>(event)) {
+            return MessageComponentType::Image;
+        }
+        if (event.isStateEvent()) {
+            if (event.matrixType() == QStringLiteral("org.matrix.msc3672.beacon_info")) {
+                return MessageComponentType::LiveLocation;
+            }
+            return MessageComponentType::Other;
+        }
+        if (is<const EncryptedEvent>(event)) {
+            return MessageComponentType::Encrypted;
+        }
+        if (is<PollStartEvent>(event)) {
+            const auto pollEvent = eventCast<const PollStartEvent>(&event);
+            if (pollEvent->isRedacted()) {
+                return MessageComponentType::Text;
+            }
+            return MessageComponentType::Poll;
+        }
+
+        return MessageComponentType::Other;
+    }
+
+    /**
+     * @brief Return MessageComponentType for the given html tag.
+     *
+     * @param tag the tag name to return a type for.
+     *
+     * @sa Type
+     */
+    static Type typeForTag(const QString &tag)
+    {
+        if (tag == QLatin1String("pre") || tag == QLatin1String("pre")) {
+            return Code;
+        }
+        if (tag == QLatin1String("blockquote")) {
+            return Quote;
+        }
+        return Text;
+    }
+};

src/enums/neochatroomtype.h

@@ -0,0 +1,99 @@
+// SPDX-FileCopyrightText: 2023 Tobias Fella <tobias.fella@kde.org>
+// SPDX-License-Identifier: LGPL-2.0-or-later
+
+#pragma once
+
+#include <QObject>
+
+#include "neochatroom.h"
+#include <Quotient/quotient_common.h>
+
+#include <KLocalizedString>
+
+class NeoChatRoomType : public QObject
+{
+    Q_OBJECT
+    QML_ELEMENT
+    QML_UNCREATABLE("")
+
+public:
+    /**
+     * @brief Defines the room list categories a room can be assigned.
+     */
+    enum Types {
+        Search = 0, /**< So we can show a search delegate if needed, e.g. collapsed mode. */
+        Invited, /**< The user has been invited to the room. */
+        Favorite, /**< The room is set as a favourite. */
+        Direct, /**< The room is a direct chat. */
+        Normal, /**< The default category for a joined room. */
+        Deprioritized, /**< The room is set as low priority. */
+        Space, /**< The room is a space. */
+        AddDirect, /**< So we can show the add friend delegate. */
+        TypesCount, /**< Number of different types. */
+    };
+    Q_ENUM(Types);
+
+    static NeoChatRoomType::Types typeForRoom(const NeoChatRoom *room)
+    {
+        if (room->isSpace()) {
+            return NeoChatRoomType::Space;
+        }
+        if (room->joinState() == Quotient::JoinState::Invite) {
+            return NeoChatRoomType::Invited;
+        }
+        // HACK for the unit tests
+        if (room->isFavourite() || room->property("isFavorite").toBool()) {
+            return NeoChatRoomType::Favorite;
+        }
+        if (room->isLowPriority()) {
+            return NeoChatRoomType::Deprioritized;
+        }
+        if (room->isDirectChat()) {
+            return NeoChatRoomType::Direct;
+        }
+        return NeoChatRoomType::Normal;
+    }
+
+    static QString typeName(int category)
+    {
+        switch (category) {
+        case NeoChatRoomType::Invited:
+            return i18n("Invited");
+        case NeoChatRoomType::Favorite:
+            return i18n("Favorite");
+        case NeoChatRoomType::Direct:
+            return i18n("Friends");
+        case NeoChatRoomType::Normal:
+            return i18n("Normal");
+        case NeoChatRoomType::Deprioritized:
+            return i18n("Low priority");
+        case NeoChatRoomType::Space:
+            return i18n("Spaces");
+        case NeoChatRoomType::Search:
+            return i18n("Search");
+        default:
+            return {};
+        }
+    }
+    static QString typeIconName(int category)
+    {
+        switch (category) {
+        case NeoChatRoomType::Invited:
+            return QStringLiteral("user-invisible");
+        case NeoChatRoomType::Favorite:
+            return QStringLiteral("favorite");
+        case NeoChatRoomType::Direct:
+            return QStringLiteral("dialog-messages");
+        case NeoChatRoomType::Normal:
+            return QStringLiteral("group");
+        case NeoChatRoomType::Deprioritized:
+            return QStringLiteral("object-order-lower");
+        case NeoChatRoomType::Space:
+            return QStringLiteral("group");
+        case NeoChatRoomType::Search:
+            return QStringLiteral("search");
+        default:
+            return QStringLiteral("tools-report-bug");
+        }
+    }
+};

src/eventhandler.cpp

@@ -14,15 +14,19 @@
 #include <Quotient/events/roomavatarevent.h>
 #include <Quotient/events/roomcanonicalaliasevent.h>
 #include <Quotient/events/roommemberevent.h>
+#include <Quotient/events/roommessageevent.h>
 #include <Quotient/events/roompowerlevelsevent.h>
 #include <Quotient/events/simplestateevents.h>
 #include <Quotient/events/stickerevent.h>
 #include <Quotient/quotient_common.h>
 
-#include "delegatetype.h"
 #include "eventhandler_logging.h"
+#include "events/locationbeaconevent.h"
 #include "events/pollevent.h"
+#include "events/serveraclevent.h"
+#include "events/widgetevent.h"
 #include "linkpreviewer.h"
+#include "messagecomponenttype.h"
 #include "models/reactionmodel.h"
 #include "neochatconfig.h"
 #include "neochatroom.h"
@@ -31,34 +35,10 @@
 
 using namespace Quotient;
 
-const NeoChatRoom *EventHandler::getRoom() const
+EventHandler::EventHandler(const NeoChatRoom *room, const RoomEvent *event)
+    : m_room(room)
+    , m_event(event)
 {
-    return m_room;
-}
-
-void EventHandler::setRoom(const NeoChatRoom *room)
-{
-    if (room == m_room) {
-        return;
-    }
-    m_room = room;
-}
-
-const Quotient::Event *EventHandler::getEvent() const
-{
-    return m_event;
-}
-
-void EventHandler::setEvent(const Quotient::RoomEvent *event)
-{
-    if (m_room == nullptr) {
-        qCWarning(EventHandling) << "cannot setEvent when m_room is set to nullptr.";
-        return;
-    }
-    if (event == m_event) {
-        return;
-    }
-    m_event = event;
 }
 
 QString EventHandler::getId() const
@@ -71,62 +51,14 @@ QString EventHandler::getId() const
     return !m_event->id().isEmpty() ? m_event->id() : m_event->transactionId();
 }
 
-DelegateType::Type EventHandler::getDelegateTypeForEvent(const Quotient::RoomEvent *event) const
-{
-    if (auto e = eventCast<const RoomMessageEvent>(event)) {
-        switch (e->msgtype()) {
-        case MessageEventType::Emote:
-            return DelegateType::Emote;
-        case MessageEventType::Notice:
-            return DelegateType::Notice;
-        case MessageEventType::Image:
-            return DelegateType::Image;
-        case MessageEventType::Audio:
-            return DelegateType::Audio;
-        case MessageEventType::Video:
-            return DelegateType::Video;
-        case MessageEventType::Location:
-            return DelegateType::Location;
-        default:
-            break;
-        }
-        if (e->hasFileContent()) {
-            return DelegateType::File;
-        }
-
-        return DelegateType::Message;
-    }
-    if (is<const StickerEvent>(*event)) {
-        return DelegateType::Sticker;
-    }
-    if (event->isStateEvent()) {
-        if (event->matrixType() == QStringLiteral("org.matrix.msc3672.beacon_info")) {
-            return DelegateType::LiveLocation;
-        }
-        return DelegateType::State;
-    }
-    if (is<const EncryptedEvent>(*event)) {
-        return DelegateType::Encrypted;
-    }
-    if (is<PollStartEvent>(*event)) {
-        const auto pollEvent = eventCast<const PollStartEvent>(event);
-        if (pollEvent->isRedacted()) {
-            return DelegateType::Message;
-        }
-        return DelegateType::Poll;
-    }
-
-    return DelegateType::Other;
-}
-
-DelegateType::Type EventHandler::getDelegateType() const
+MessageComponentType::Type EventHandler::messageComponentType() const
 {
     if (m_event == nullptr) {
-        qCWarning(EventHandling) << "getDelegateType called with m_event set to nullptr.";
-        return DelegateType::Other;
+        qCWarning(EventHandling) << "messageComponentType called with m_event set to nullptr.";
+        return MessageComponentType::Other;
     }
 
-    return getDelegateTypeForEvent(m_event);
+    return MessageComponentType::typeForEvent(*m_event);
 }
 
 QVariantMap EventHandler::getAuthor(bool isPending) const
@@ -300,6 +232,36 @@ bool EventHandler::isHidden()
     return false;
 }
 
+Qt::TextFormat EventHandler::messageBodyInputFormat(const Quotient::RoomMessageEvent &event)
+{
+    if (event.mimeType().name() == "text/plain"_ls) {
+        return Qt::PlainText;
+    } else {
+        return Qt::RichText;
+    }
+}
+
+QString EventHandler::rawMessageBody(const Quotient::RoomMessageEvent &event)
+{
+    if (event.hasFileContent()) {
+        auto fileCaption = event.content()->fileInfo()->originalName;
+        if (fileCaption.isEmpty()) {
+            fileCaption = event.plainBody();
+        } else if (event.content()->fileInfo()->originalName != event.plainBody()) {
+            fileCaption = event.plainBody() + " | "_ls + fileCaption;
+        }
+        return fileCaption;
+    }
+
+    QString body;
+    if (event.hasTextContent() && event.content()) {
+        body = static_cast<const MessageEventContent::TextContent *>(event.content())->body;
+    } else {
+        body = event.plainBody();
+    }
+    return body;
+}
+
 QString EventHandler::getRichBody(bool stripNewlines) const
 {
     if (m_event == nullptr) {
@@ -345,8 +307,7 @@ QString EventHandler::getBody(const Quotient::RoomEvent *event, Qt::TextFormat f
             }
 
             if (prettyPrint) {
-                subjectName = QStringLiteral("<a href=\"https://matrix.to/#/%1\" style=\"color: %2\">%3</a>")
-                                  .arg(e.userId(), Utils::getUserColor(m_room->user(e.userId())->hueF()).name(), subjectName);
+                subjectName = QStringLiteral("<a href=\"https://matrix.to/#/%1\">%2</a>").arg(e.userId(), subjectName);
             }
 
             // The below code assumes senderName output in AuthorRole
@@ -457,22 +418,22 @@ QString EventHandler::getBody(const Quotient::RoomEvent *event, Qt::TextFormat f
         [](const RoomPowerLevelsEvent &) {
             return i18nc("'power level' means permission level", "changed the power levels for this room");
         },
+        [](const LocationBeaconEvent &e) {
+            return e.contentJson()["description"_ls].toString();
+        },
+        [](const ServerAclEvent &) {
+            return i18n("changed the server access control lists for this room");
+        },
+        [](const WidgetEvent &e) {
+            if (e.fullJson()["unsigned"_ls]["prev_content"_ls].toObject().isEmpty()) {
+                return i18nc("[User] added <name> widget", "added %1 widget", e.contentJson()["name"_ls].toString());
+            }
+            if (e.contentJson().isEmpty()) {
+                return i18nc("[User] removed <name> widget", "removed %1 widget", e.fullJson()["unsigned"_ls]["prev_content"_ls]["name"_ls].toString());
+            }
+            return i18nc("[User] configured <name> widget", "configured %1 widget", e.contentJson()["name"_ls].toString());
+        },
         [prettyPrint](const StateEvent &e) {
-            if (e.matrixType() == QLatin1String("m.room.server_acl")) {
-                return i18n("changed the server access control lists for this room");
-            }
-            if (e.matrixType() == QLatin1String("im.vector.modular.widgets")) {
-                if (e.fullJson()["unsigned"_ls]["prev_content"_ls].toObject().isEmpty()) {
-                    return i18nc("[User] added <name> widget", "added %1 widget", e.contentJson()["name"_ls].toString());
-                }
-                if (e.contentJson().isEmpty()) {
-                    return i18nc("[User] removed <name> widget", "removed %1 widget", e.fullJson()["unsigned"_ls]["prev_content"_ls]["name"_ls].toString());
-                }
-                return i18nc("[User] configured <name> widget", "configured %1 widget", e.contentJson()["name"_ls].toString());
-            }
-            if (e.matrixType() == "org.matrix.msc3672.beacon_info"_ls) {
-                return e.contentJson()["description"_ls].toString();
-            }
             return e.stateKey().isEmpty() ? i18n("updated %1 state", e.matrixType())
                                           : i18n("updated %1 state for %2", e.matrixType(), prettyPrint ? e.stateKey().toHtmlEscaped() : e.stateKey());
         },
@@ -514,7 +475,7 @@ QString EventHandler::getMessageBody(const RoomMessageEvent &event, Qt::TextForm
     }
 
     if (format == Qt::RichText) {
-        return textHandler.handleRecieveRichText(inputFormat, m_room, &event, stripNewlines);
+        return textHandler.handleRecieveRichText(inputFormat, m_room, &event, stripNewlines, event.isReplaced());
     } else {
         return textHandler.handleRecievePlainText(inputFormat, stripNewlines);
     }
@@ -626,19 +587,22 @@ QString EventHandler::getGenericBody() const
         [](const RoomPowerLevelsEvent &) {
             return i18nc("'power level' means permission level", "changed the power levels for this room");
         },
-        [](const StateEvent &e) {
-            if (e.matrixType() == QLatin1String("m.room.server_acl")) {
-                return i18n("changed the server access control lists for this room");
+        [](const LocationBeaconEvent &) {
+            return i18n("sent a live location beacon");
+        },
+        [](const ServerAclEvent &) {
+            return i18n("changed the server access control lists for this room");
+        },
+        [](const WidgetEvent &e) {
+            if (e.fullJson()["unsigned"_ls]["prev_content"_ls].toObject().isEmpty()) {
+                return i18n("added a widget");
             }
-            if (e.matrixType() == QLatin1String("im.vector.modular.widgets")) {
-                if (e.fullJson()["unsigned"_ls]["prev_content"_ls].toObject().isEmpty()) {
-                    return i18n("added a widget");
-                }
-                if (e.contentJson().isEmpty()) {
-                    return i18n("removed a widget");
-                }
-                return i18n("configured a widget");
+            if (e.contentJson().isEmpty()) {
+                return i18n("removed a widget");
             }
+            return i18n("configured a widget");
+        },
+        [](const StateEvent &) {
             return i18n("updated the state");
         },
         [](const PollStartEvent &e) {
@@ -795,22 +759,22 @@ QString EventHandler::getReplyId() const
     return m_event->contentJson()["m.relates_to"_ls].toObject()["m.in_reply_to"_ls].toObject()["event_id"_ls].toString();
 }
 
-DelegateType::Type EventHandler::getReplyDelegateType() const
+MessageComponentType::Type EventHandler::replyMessageComponentType() const
 {
     if (m_room == nullptr) {
-        qCWarning(EventHandling) << "getReplyDelegateType called with m_room set to nullptr.";
-        return DelegateType::Other;
+        qCWarning(EventHandling) << "replyMessageComponentType called with m_room set to nullptr.";
+        return MessageComponentType::Other;
     }
     if (m_event == nullptr) {
-        qCWarning(EventHandling) << "getReplyDelegateType called with m_event set to nullptr.";
-        return DelegateType::Other;
+        qCWarning(EventHandling) << "replyMessageComponentType called with m_event set to nullptr.";
+        return MessageComponentType::Other;
     }
 
     auto replyEvent = m_room->getReplyForEvent(*m_event);
     if (replyEvent == nullptr) {
-        return DelegateType::Other;
+        return MessageComponentType::Other;
     }
-    return getDelegateTypeForEvent(replyEvent);
+    return MessageComponentType::typeForEvent(*replyEvent);
 }
 
 QVariantMap EventHandler::getReplyAuthor() const

src/eventhandler.h

@@ -11,7 +11,7 @@
 #include <Quotient/events/roomevent.h>
 #include <Quotient/events/roommessageevent.h>
 
-#include "enums/delegatetype.h"
+#include "enums/messagecomponenttype.h"
 
 class LinkPreviewer;
 class NeoChatRoom;
@@ -31,30 +31,12 @@ class ReactionModel;
  *       information. This is to minimize warnings from QML especially during startup
  *       and room changes.
  */
-class EventHandler : public QObject
+class EventHandler
 {
-    Q_OBJECT
+    Q_GADGET
 
 public:
-    /**
-     * @brief Return the current room the EventHandler is using.
-     */
-    const NeoChatRoom *getRoom() const;
-
-    /**
-     * @brief Set the current room the EventHandler to using.
-     */
-    void setRoom(const NeoChatRoom *room);
-
-    /**
-     * @brief Return the current event the EventHandler is using.
-     */
-    const Quotient::Event *getEvent() const;
-
-    /**
-     * @brief Set the current event the EventHandler to using.
-     */
-    void setEvent(const Quotient::RoomEvent *event);
+    EventHandler(const NeoChatRoom *room, const Quotient::RoomEvent *event);
 
     /**
      * @brief Return the Matrix ID of the event.
@@ -62,13 +44,9 @@ public:
     QString getId() const;
 
     /**
-     * @brief Return the DelegateType of the event.
-     *
-     * @note While similar this is not the matrix event or message type. This is
-     *       to tell a QML ListView what delegate to show for each event. So while
-     *       similar to the spec it is not the same.
+     * @brief The MessageComponentType to use to visualise the main event content.
      */
-    DelegateType::Type getDelegateType() const;
+    MessageComponentType::Type messageComponentType() const;
 
     /**
      * @brief Get the author of the event in context of the room.
@@ -159,6 +137,22 @@ public:
      */
     bool isHidden();
 
+    /**
+     * @brief The input format of the body in the message.
+     *
+     * I.e. if the message has only a body the format will be Qt::PlainText, if it
+     * has a formatted body it will be Qt::RichText.
+     */
+    static Qt::TextFormat messageBodyInputFormat(const Quotient::RoomMessageEvent &event);
+
+    /**
+     * @brief Output a string for the room message content without any formatting.
+     *
+     * This is the content of the formatted_body key if present or the body key if
+     * not.
+     */
+    static QString rawMessageBody(const Quotient::RoomMessageEvent &event);
+
     /**
      * @brief Output a string for the message content ready for display in a rich text field.
      *
@@ -242,13 +236,9 @@ public:
     QString getReplyId() const;
 
     /**
-     * @brief Return the DelegateType of the event replied to.
-     *
-     * @note While similar this is not the matrix event or message type. This is
-     *       to tell a QML ListView what delegate to show for each event. So while
-     *       similar to the spec it is not the same.
+     * @brief The MessageComponentType to use to visualise the reply content.
      */
-    DelegateType::Type getReplyDelegateType() const;
+    MessageComponentType::Type replyMessageComponentType() const;
 
     /**
      * @brief Get the author of the event replied to in context of the room.
@@ -404,8 +394,6 @@ private:
 
     KFormat m_format;
 
-    DelegateType::Type getDelegateTypeForEvent(const Quotient::RoomEvent *event) const;
-
     QString getBody(const Quotient::RoomEvent *event, Qt::TextFormat format, bool stripNewlines) const;
     QString getMessageBody(const Quotient::RoomMessageEvent &event, Qt::TextFormat format, bool stripNewlines) const;
 

src/events/locationbeaconevent.h

@@ -0,0 +1,14 @@
+// SPDX-FileCopyrightText: 2024 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 <Quotient/events/simplestateevents.h>
+
+namespace Quotient
+{
+
+// Defined so we can directly switch on type.
+DEFINE_SIMPLE_STATE_EVENT(LocationBeaconEvent, "org.matrix.msc3672.beacon_info", QString, body, "body")
+
+} // namespace Quotient

src/events/serveraclevent.h

@@ -0,0 +1,14 @@
+// SPDX-FileCopyrightText: 2024 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 <Quotient/events/simplestateevents.h>
+
+namespace Quotient
+{
+
+// Defined so we can directly switch on type.
+DEFINE_SIMPLE_STATE_EVENT(ServerAclEvent, "m.room.server_acl", bool, allow_ip_literals, "allow_ip_literals")
+
+} // namespace Quotient

src/events/widgetevent.h

@@ -0,0 +1,14 @@
+// SPDX-FileCopyrightText: 2024 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 <Quotient/events/simplestateevents.h>
+
+namespace Quotient
+{
+
+// Defined so we can directly switch on type.
+DEFINE_SIMPLE_STATE_EVENT(WidgetEvent, "im.vector.modular.widgets", QString, name, "name")
+
+} // namespace Quotient

src/linkpreviewer.cpp

@@ -13,8 +13,8 @@
 
 using namespace Quotient;
 
-LinkPreviewer::LinkPreviewer(const NeoChatRoom *room, const Quotient::RoomMessageEvent *event)
-    : QObject(nullptr)
+LinkPreviewer::LinkPreviewer(const NeoChatRoom *room, const Quotient::RoomMessageEvent *event, QObject *parent)
+    : QObject(parent)
     , m_currentRoom(room)
     , m_event(event)
     , m_loaded(false)

src/linkpreviewer.h

@@ -60,7 +60,7 @@ class LinkPreviewer : public QObject
     Q_PROPERTY(bool empty READ empty NOTIFY emptyChanged)
 
 public:
-    explicit LinkPreviewer(const NeoChatRoom *room = nullptr, const Quotient::RoomMessageEvent *event = nullptr);
+    explicit LinkPreviewer(const NeoChatRoom *room = nullptr, const Quotient::RoomMessageEvent *event = nullptr, QObject *parent = nullptr);
 
     [[nodiscard]] QUrl url() const;
     [[nodiscard]] bool loaded() const;

src/main.cpp

@@ -139,7 +139,7 @@ int main(int argc, char *argv[])
     about.addAuthor(i18n("Tobias Fella"), i18n("Maintainer"), QStringLiteral("tobias.fella@kde.org"), QStringLiteral("https://tobiasfella.de"));
     about.addAuthor(i18n("James Graham"), i18n("Maintainer"), QStringLiteral("james.h.graham@protonmail.com"));
     about.addCredit(i18n("Black Hat"), i18n("Original author of Spectral"), QStringLiteral("bhat@encom.eu.org"));
-    about.addCredit(i18n("Alexey Rusakov"), i18n("Maintainer of Quotient"), QStringLiteral("Kitsune-Ral@users.sf.net"));
+    about.addCredit(i18n("Alexey Rusakov"), i18n("Maintainer of libQuotient"), QStringLiteral("Kitsune-Ral@users.sf.net"));
     about.setTranslator(i18nc("NAME OF TRANSLATORS", "Your names"), i18nc("EMAIL OF TRANSLATORS", "Your emails"));
     about.setOrganizationDomain("kde.org");
 
@@ -250,7 +250,7 @@ int main(int argc, char *argv[])
     engine.addImageProvider(QLatin1String("mxc"), MatrixImageProvider::create(&engine, &engine));
     engine.addImageProvider(QLatin1String("blurhash"), new BlurhashImageProvider);
 
-    engine.load(QUrl(QStringLiteral("qrc:/org/kde/neochat/qml/main.qml")));
+    engine.load(QUrl(QStringLiteral("qrc:/qt/qml/org/kde/neochat/qml/main.qml")));
     if (engine.rootObjects().isEmpty()) {
         return -1;
     }

src/mediamanager.cpp

@@ -0,0 +1,9 @@
+// SPDX-FileCopyrightText: 2023 Tobias Fella <tobias.fella@kde.org>
+// SPDX-License-Identifier: LGPL-2.0-or-later
+
+#include "mediamanager.h"
+
+void MediaManager::startPlayback()
+{
+    Q_EMIT playbackStarted();
+}

src/mediamanager.h

@@ -0,0 +1,42 @@
+// SPDX-FileCopyrightText: 2023 Tobias Fella <tobias.fella@kde.org>
+// SPDX-License-Identifier: LGPL-2.0-or-later
+
+#pragma once
+
+#include <QObject>
+#include <QQmlEngine>
+
+/**
+ * @class MediaManager
+ *
+ * Manages media playback, like voice/audio messages, videos, etc.
+ */
+class MediaManager : public QObject
+{
+    Q_OBJECT
+    QML_ELEMENT
+    QML_SINGLETON
+
+public:
+    static MediaManager &instance()
+    {
+        static MediaManager _instance;
+        return _instance;
+    }
+    static MediaManager *create(QQmlEngine *, QJSEngine *)
+    {
+        QQmlEngine::setObjectOwnership(&instance(), QQmlEngine::CppOwnership);
+        return &instance();
+    }
+
+    /**
+     * @brief Notify other objects that media playback has started.
+     */
+    Q_INVOKABLE void startPlayback();
+
+Q_SIGNALS:
+    /**
+     * @brief Emitted when any media player starts playing. Other objects should stop / pause playback.
+     */
+    void playbackStarted();
+};

src/models/actionsmodel.cpp

@@ -230,7 +230,7 @@ QList<ActionsModel::Action> actions{
             }
             auto targetRoom = text.startsWith(QLatin1Char('!')) ? room->connection()->room(text) : room->connection()->roomByAlias(text);
             if (targetRoom) {
-                RoomManager::instance().enterRoom(dynamic_cast<NeoChatRoom *>(targetRoom));
+                RoomManager::instance().resolveResource(targetRoom->id());
                 return QString();
             }
             Q_EMIT room->showMessage(NeoChatRoom::Info, i18nc("Joining room <roomname>.", "Joining room %1.", text));
@@ -256,7 +256,7 @@ QList<ActionsModel::Action> actions{
             }
             auto targetRoom = text.startsWith(QLatin1Char('!')) ? room->connection()->room(text) : room->connection()->roomByAlias(text);
             if (targetRoom) {
-                RoomManager::instance().enterRoom(dynamic_cast<NeoChatRoom *>(targetRoom));
+                RoomManager::instance().resolveResource(targetRoom->id());
                 return QString();
             }
             Q_EMIT room->showMessage(NeoChatRoom::Info, i18nc("Knocking room <roomname>.", "Knocking room %1.", text));
@@ -354,17 +354,12 @@ QList<ActionsModel::Action> actions{
                 Q_EMIT room->showMessage(NeoChatRoom::Error, i18nc("'<text>' does not look like a matrix id.", "'%1' does not look like a matrix id.", text));
                 return QString();
             }
-            auto user = room->connection()->users()[text];
-            if (room->connection()->ignoredUsers().contains(user->id())) {
+            if (room->connection()->ignoredUsers().contains(text)) {
                 Q_EMIT room->showMessage(NeoChatRoom::Info, i18nc("<username> is already ignored.", "%1 is already ignored.", text));
                 return QString();
             }
-            if (user) {
-                room->connection()->addToIgnoredUsers(user);
-                Q_EMIT room->showMessage(NeoChatRoom::Positive, i18nc("<username> is now ignored", "%1 is now ignored.", text));
-            } else {
-                Q_EMIT room->showMessage(NeoChatRoom::Error, i18nc("<username> is not a known user", "%1 is not a known user.", text));
-            }
+            room->connection()->addToIgnoredUsers(room->connection()->user(text));
+            Q_EMIT room->showMessage(NeoChatRoom::Positive, i18nc("<username> is now ignored", "%1 is now ignored.", text));
             return QString();
         },
         false,
@@ -382,17 +377,12 @@ QList<ActionsModel::Action> actions{
                 Q_EMIT room->showMessage(NeoChatRoom::Error, i18nc("'<text>' does not look like a matrix id.", "'%1' does not look like a matrix id.", text));
                 return QString();
             }
-            auto user = room->connection()->users()[text];
-            if (user) {
-                if (!room->connection()->ignoredUsers().contains(user->id())) {
-                    Q_EMIT room->showMessage(NeoChatRoom::Info, i18nc("<username> is not ignored.", "%1 is not ignored.", text));
-                    return QString();
-                }
-                room->connection()->removeFromIgnoredUsers(user);
-                Q_EMIT room->showMessage(NeoChatRoom::Positive, i18nc("<username> is no longer ignored.", "%1 is no longer ignored.", text));
-            } else {
-                Q_EMIT room->showMessage(NeoChatRoom::Error, i18nc("<username> is not a known user", "%1 is not a known user.", text));
+            if (!room->connection()->ignoredUsers().contains(text)) {
+                Q_EMIT room->showMessage(NeoChatRoom::Info, i18nc("<username> is not ignored.", "%1 is not ignored.", text));
+                return QString();
             }
+            room->connection()->removeFromIgnoredUsers(room->connection()->user(text));
+            Q_EMIT room->showMessage(NeoChatRoom::Positive, i18nc("<username> is no longer ignored.", "%1 is no longer ignored.", text));
             return QString();
         },
         false,

src/models/imagepacksmodel.cpp

@@ -64,11 +64,13 @@ void ImagePacksModel::setRoom(NeoChatRoom *room)
     }
     m_room = room;
 
-    connect(m_room->connection(), &Connection::accountDataChanged, this, [this](const QString &type) {
-        if (type == "im.ponies.user_emotes"_ls) {
-            reloadImages();
-        }
-    });
+    if (m_room) {
+        connect(m_room->connection(), &Connection::accountDataChanged, this, [this](const QString &type) {
+            if (type == "im.ponies.user_emotes"_ls) {
+                reloadImages();
+            }
+        });
+    }
     // TODO listen to packs changing
     reloadImages();
     Q_EMIT roomChanged();
@@ -76,6 +78,9 @@ void ImagePacksModel::setRoom(NeoChatRoom *room)
 
 void ImagePacksModel::reloadImages()
 {
+    if (!m_room) {
+        return;
+    }
     beginResetModel();
     m_events.clear();
 

src/models/itinerarymodel.cpp

@@ -0,0 +1,163 @@
+// SPDX-FileCopyrightText: 2024 Tobias Fella <tobias.fella@kde.org>
+// SPDX-License-Identifier: LGPL-2.0-or-later
+
+#include "itinerarymodel.h"
+
+#include <QProcess>
+
+#include "config-neochat.h"
+
+#ifndef Q_OS_ANDROID
+#include <KIO/ApplicationLauncherJob>
+#endif
+
+ItineraryModel::ItineraryModel(QObject *parent)
+    : QAbstractListModel(parent)
+{
+}
+
+void ItineraryModel::setConnection(NeoChatConnection *connection)
+{
+    if (m_connection == connection) {
+        return;
+    }
+    m_connection = connection;
+    Q_EMIT connectionChanged();
+}
+
+NeoChatConnection *ItineraryModel::connection() const
+{
+    return m_connection;
+}
+
+QVariant ItineraryModel::data(const QModelIndex &index, int role) const
+{
+    if (!index.isValid()) {
+        return {};
+    }
+    auto row = index.row();
+    auto data = m_data[row];
+    if (role == NameRole) {
+        if (data[QStringLiteral("@type")] == QStringLiteral("TrainReservation")) {
+            return data[QStringLiteral("reservationFor")][QStringLiteral("trainNumber")];
+        }
+        if (data[QStringLiteral("@type")] == QStringLiteral("LodgingReservation")) {
+            return data[QStringLiteral("reservationFor")][QStringLiteral("name")];
+        }
+    }
+    if (role == TypeRole) {
+        return data[QStringLiteral("@type")];
+    }
+    if (role == DepartureStationRole) {
+        return data[QStringLiteral("reservationFor")][QStringLiteral("departureStation")][QStringLiteral("name")];
+    }
+    if (role == ArrivalStationRole) {
+        return data[QStringLiteral("reservationFor")][QStringLiteral("arrivalStation")][QStringLiteral("name")];
+    }
+    if (role == DepartureTimeRole) {
+        const auto &time = data[QStringLiteral("reservationFor")][QStringLiteral("departureTime")];
+        auto dateTime = (time.isString() ? time : time[QStringLiteral("@value")]).toVariant().toDateTime();
+        if (const auto &timeZone = time[QStringLiteral("timezone")].toString(); timeZone.length() > 0) {
+            dateTime.setTimeZone(QTimeZone(timeZone.toLatin1().data()));
+        }
+        return dateTime.toString(QLocale::system().dateTimeFormat(QLocale::ShortFormat));
+    }
+    if (role == ArrivalTimeRole) {
+        const auto &time = data[QStringLiteral("reservationFor")][QStringLiteral("arrivalTime")];
+        auto dateTime = (time.isString() ? time : time[QStringLiteral("@value")]).toVariant().toDateTime();
+        if (const auto &timeZone = time[QStringLiteral("timezone")].toString(); timeZone.length() > 0) {
+            dateTime.setTimeZone(QTimeZone(timeZone.toLatin1().data()));
+        }
+        return dateTime.toString(QLocale::system().dateTimeFormat(QLocale::ShortFormat));
+    }
+    if (role == AddressRole) {
+        const auto &addressData = data[QStringLiteral("reservationFor")][QStringLiteral("address")];
+        return QStringLiteral("%1 - %2 %3 %4")
+            .arg(addressData[QStringLiteral("streetAddress")].toString(),
+                 addressData[QStringLiteral("postalCode")].toString(),
+                 addressData[QStringLiteral("addressLocality")].toString(),
+                 addressData[QStringLiteral("addressCountry")].toString());
+    }
+    if (role == StartTimeRole) {
+        auto dateTime = data[QStringLiteral("checkinTime")][QStringLiteral("@value")].toVariant().toDateTime();
+        return dateTime.toString(QLocale::system().dateTimeFormat(QLocale::ShortFormat));
+    }
+    if (role == EndTimeRole) {
+        auto dateTime = data[QStringLiteral("checkoutTime")][QStringLiteral("@value")].toVariant().toDateTime();
+        return dateTime.toString(QLocale::system().dateTimeFormat(QLocale::ShortFormat));
+    }
+    if (role == DeparturePlatformRole) {
+        return data[QStringLiteral("reservationFor")][QStringLiteral("departurePlatform")];
+    }
+    if (role == ArrivalPlatformRole) {
+        return data[QStringLiteral("reservationFor")][QStringLiteral("arrivalPlatform")];
+    }
+    if (role == CoachRole) {
+        return data[QStringLiteral("reservedTicket")][QStringLiteral("ticketedSeat")][QStringLiteral("seatSection")];
+    }
+    if (role == SeatRole) {
+        return data[QStringLiteral("reservedTicket")][QStringLiteral("ticketedSeat")][QStringLiteral("seatNumber")];
+    }
+    return {};
+}
+
+int ItineraryModel::rowCount(const QModelIndex &parent) const
+{
+    Q_UNUSED(parent);
+    return m_data.size();
+}
+
+QHash<int, QByteArray> ItineraryModel::roleNames() const
+{
+    return {
+        {NameRole, "name"},
+        {TypeRole, "type"},
+        {DepartureStationRole, "departureStation"},
+        {ArrivalStationRole, "arrivalStation"},
+        {DepartureTimeRole, "departureTime"},
+        {ArrivalTimeRole, "arrivalTime"},
+        {AddressRole, "address"},
+        {StartTimeRole, "startTime"},
+        {EndTimeRole, "endTime"},
+        {DeparturePlatformRole, "departurePlatform"},
+        {ArrivalPlatformRole, "arrivalPlatform"},
+        {CoachRole, "coach"},
+        {SeatRole, "seat"},
+    };
+}
+
+QString ItineraryModel::path() const
+{
+    return m_path;
+}
+
+void ItineraryModel::setPath(const QString &path)
+{
+    if (path == m_path) {
+        return;
+    }
+    m_path = path;
+    Q_EMIT pathChanged();
+    loadData();
+}
+
+void ItineraryModel::loadData()
+{
+    auto process = new QProcess(this);
+    process->start(QLatin1String(CMAKE_INSTALL_FULL_LIBEXECDIR_KF6) + QLatin1String("/kitinerary-extractor"), {m_path.mid(7)});
+    connect(process, &QProcess::finished, this, [this, process]() {
+        auto data = process->readAllStandardOutput();
+        beginResetModel();
+        m_data = QJsonDocument::fromJson(data).array();
+        endResetModel();
+    });
+}
+
+void ItineraryModel::sendToItinerary()
+{
+#ifndef Q_OS_ANDROID
+    auto job = new KIO::ApplicationLauncherJob(KService::serviceByDesktopName(QStringLiteral("org.kde.itinerary")));
+    job->setUrls({QUrl::fromLocalFile(m_path.mid(7))});
+    job->start();
+#endif
+}

src/models/itinerarymodel.h

@@ -0,0 +1,62 @@
+// SPDX-FileCopyrightText: 2024 Tobias Fella <tobias.fella@kde.org>
+// SPDX-License-Identifier: LGPL-2.0-or-later
+
+#pragma once
+
+#include <QAbstractListModel>
+#include <QPointer>
+#include <QQmlEngine>
+#include <QString>
+
+#include "neochatconnection.h"
+
+class ItineraryModel : public QAbstractListModel
+{
+    Q_OBJECT
+    QML_ELEMENT
+
+    Q_PROPERTY(NeoChatConnection *connection READ connection WRITE setConnection NOTIFY connectionChanged)
+    Q_PROPERTY(QString path READ path WRITE setPath NOTIFY pathChanged)
+
+public:
+    enum Roles {
+        NameRole = Qt::DisplayRole,
+        TypeRole,
+        DepartureStationRole,
+        ArrivalStationRole,
+        DepartureTimeRole,
+        ArrivalTimeRole,
+        AddressRole,
+        StartTimeRole,
+        EndTimeRole,
+        DeparturePlatformRole,
+        ArrivalPlatformRole,
+        CoachRole,
+        SeatRole,
+    };
+    Q_ENUM(Roles)
+    explicit ItineraryModel(QObject *parent = nullptr);
+
+    void setConnection(NeoChatConnection *connection);
+    NeoChatConnection *connection() const;
+
+    QVariant data(const QModelIndex &index, int role) const override;
+    int rowCount(const QModelIndex &parent = {}) const override;
+
+    QHash<int, QByteArray> roleNames() const override;
+
+    QString path() const;
+    void setPath(const QString &path);
+
+    Q_INVOKABLE void sendToItinerary();
+
+Q_SIGNALS:
+    void connectionChanged();
+    void pathChanged();
+
+private:
+    QPointer<NeoChatConnection> m_connection;
+    QJsonArray m_data;
+    QString m_path;
+    void loadData();
+};

src/models/linemodel.cpp

@@ -0,0 +1,64 @@
+// SPDX-FileCopyrightText: 2024 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 "linemodel.h"
+
+LineModel::LineModel(QObject *parent)
+    : QAbstractListModel(parent)
+{
+}
+
+QQuickTextDocument *LineModel::document() const
+{
+    return m_document;
+}
+
+void LineModel::setDocument(QQuickTextDocument *document)
+{
+    if (document == m_document) {
+        return;
+    }
+
+    m_document = document;
+    Q_EMIT documentChanged();
+
+    resetModel();
+}
+
+QVariant LineModel::data(const QModelIndex &index, int role) const
+{
+    if (!index.isValid()) {
+        return {};
+    }
+
+    const auto &row = index.row();
+    if (row < 0 || row > rowCount()) {
+        return {};
+    }
+
+    if (role == LineHeightRole) {
+        auto textDoc = m_document->textDocument();
+        return int(textDoc->documentLayout()->blockBoundingRect(textDoc->findBlockByNumber(row)).height());
+    }
+    return {};
+}
+
+int LineModel::rowCount(const QModelIndex &parent) const
+{
+    Q_UNUSED(parent);
+    if (m_document == nullptr) {
+        return 0;
+    }
+    return m_document->textDocument()->blockCount();
+}
+
+QHash<int, QByteArray> LineModel::roleNames() const
+{
+    return {{LineHeightRole, "docLineHeight"}};
+}
+
+void LineModel::resetModel()
+{
+    beginResetModel();
+    endResetModel();
+}

src/models/linemodel.h

@@ -0,0 +1,80 @@
+// SPDX-FileCopyrightText: 2024 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 <QAbstractListModel>
+#include <QAbstractTextDocumentLayout>
+#include <QQmlEngine>
+#include <QQuickTextDocument>
+#include <QTextBlock>
+#include <qtmetamacros.h>
+
+/**
+ * @class LineModel
+ *
+ * A model to provide line info for a QQuickTextDocument.
+ *
+ * @sa QQuickTextDocument
+ */
+class LineModel : public QAbstractListModel
+{
+    Q_OBJECT
+    QML_ELEMENT
+
+    /**
+     * @brief The QQuickTextDocument that is being handled.
+     */
+    Q_PROPERTY(QQuickTextDocument *document READ document WRITE setDocument NOTIFY documentChanged)
+
+public:
+    /**
+     * @brief Defines the model roles.
+     */
+    enum Roles {
+        LineHeightRole = Qt::UserRole + 1, /**< The delegate type of the message. */
+    };
+    Q_ENUM(Roles)
+
+    explicit LineModel(QObject *parent = nullptr);
+
+    [[nodiscard]] QQuickTextDocument *document() const;
+    void setDocument(QQuickTextDocument *document);
+
+    /**
+     * @brief Get the given role value at the given index.
+     *
+     * @sa QAbstractItemModel::data
+     */
+    [[nodiscard]] QVariant data(const QModelIndex &index, int role) const override;
+
+    /**
+     * @brief Number of rows in the model.
+     *
+     * @sa QAbstractItemModel::rowCount
+     */
+    [[nodiscard]] int rowCount(const QModelIndex &parent = QModelIndex()) const override;
+
+    /**
+     * @brief Returns a mapping from Role enum values to role names.
+     *
+     * @sa Roles, QAbstractItemModel::roleNames()
+     */
+    [[nodiscard]] QHash<int, QByteArray> roleNames() const override;
+
+    /**
+     * @brief Reset the model.
+     *
+     * This needs to be called when the QQuickTextDocument container changes width
+     * or height as this may change line heights due to wrapping.
+     *
+     * @sa QQuickTextDocument
+     */
+    Q_INVOKABLE void resetModel();
+
+Q_SIGNALS:
+    void documentChanged();
+
+private:
+    QPointer<QQuickTextDocument> m_document = nullptr;
+};

src/models/mediamessagefiltermodel.cpp

@@ -3,9 +3,9 @@
 
 #include "mediamessagefiltermodel.h"
 
+#include <Quotient/events/roommessageevent.h>
 #include <Quotient/room.h>
 
-#include "enums/delegatetype.h"
 #include "messageeventmodel.h"
 #include "messagefiltermodel.h"
 
@@ -20,8 +20,8 @@ bool MediaMessageFilterModel::filterAcceptsRow(int sourceRow, const QModelIndex
 {
     const QModelIndex index = sourceModel()->index(sourceRow, 0, sourceParent);
 
-    if (index.data(MessageEventModel::DelegateTypeRole).toInt() == DelegateType::Image
-        || index.data(MessageEventModel::DelegateTypeRole).toInt() == DelegateType::Video) {
+    if (index.data(MessageEventModel::MediaInfoRole).toMap()[QLatin1String("mimeType")].toString().contains(QLatin1String("image"))
+        || index.data(MessageEventModel::MediaInfoRole).toMap()[QLatin1String("mimeType")].toString().contains(QLatin1String("video"))) {
         return true;
     }
     return false;
@@ -30,9 +30,9 @@ bool MediaMessageFilterModel::filterAcceptsRow(int sourceRow, const QModelIndex
 QVariant MediaMessageFilterModel::data(const QModelIndex &index, int role) const
 {
     if (role == SourceRole) {
-        if (mapToSource(index).data(MessageEventModel::DelegateTypeRole).toInt() == DelegateType::Image) {
+        if (mapToSource(index).data(MessageEventModel::MediaInfoRole).toMap()[QLatin1String("mimeType")].toString().contains(QLatin1String("image"))) {
             return mapToSource(index).data(MessageEventModel::MediaInfoRole).toMap()[QStringLiteral("source")].toUrl();
-        } else if (mapToSource(index).data(MessageEventModel::DelegateTypeRole).toInt() == DelegateType::Video) {
+        } else if (mapToSource(index).data(MessageEventModel::MediaInfoRole).toMap()[QLatin1String("mimeType")].toString().contains(QLatin1String("video"))) {
             auto progressInfo = mapToSource(index).data(MessageEventModel::ProgressInfoRole).value<Quotient::FileTransferInfo>();
 
             if (progressInfo.completed()) {
@@ -48,7 +48,7 @@ QVariant MediaMessageFilterModel::data(const QModelIndex &index, int role) const
         return mapToSource(index).data(MessageEventModel::MediaInfoRole).toMap()[QStringLiteral("tempInfo")].toMap()[QStringLiteral("source")].toUrl();
     }
     if (role == TypeRole) {
-        if (mapToSource(index).data(MessageEventModel::DelegateTypeRole).toInt() == DelegateType::Image) {
+        if (mapToSource(index).data(MessageEventModel::MediaInfoRole).toMap()[QLatin1String("mimeType")].toString().contains(QLatin1String("image"))) {
             return MediaType::Image;
         } else {
             return MediaType::Video;

src/models/messagecontentmodel.cpp

@@ -0,0 +1,262 @@
+// SPDX-FileCopyrightText: 2024 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 "messagecontentmodel.h"
+
+#include <Quotient/events/redactionevent.h>
+#include <Quotient/events/roommessageevent.h>
+#include <Quotient/events/stickerevent.h>
+
+#include <KLocalizedString>
+
+#include "chatbarcache.h"
+#include "enums/messagecomponenttype.h"
+#include "eventhandler.h"
+#include "linkpreviewer.h"
+#include "neochatroom.h"
+#include "texthandler.h"
+
+MessageContentModel::MessageContentModel(const Quotient::RoomEvent *event, NeoChatRoom *room)
+    : QAbstractListModel(nullptr)
+    , m_room(room)
+    , m_event(event)
+{
+    if (m_room != nullptr) {
+        connect(m_room, &NeoChatRoom::pendingEventAboutToMerge, this, [this](Quotient::RoomEvent *serverEvent) {
+            if (m_room != nullptr && m_event != nullptr) {
+                if (m_event->id() == serverEvent->id()) {
+                    beginResetModel();
+                    m_event = serverEvent;
+                    endResetModel();
+                }
+            }
+        });
+        connect(m_room, &NeoChatRoom::replacedEvent, this, [this](const Quotient::RoomEvent *newEvent) {
+            if (m_room != nullptr && m_event != nullptr) {
+                if (m_event->id() == newEvent->id()) {
+                    beginResetModel();
+                    m_event = newEvent;
+                    endResetModel();
+                }
+            }
+        });
+        connect(m_room, &NeoChatRoom::replyLoaded, this, [this](const QString &eventId, const QString &replyId) {
+            Q_UNUSED(eventId)
+            if (m_event != nullptr && m_room != nullptr) {
+                const auto eventHandler = EventHandler(m_room, m_event);
+                if (replyId == eventHandler.getReplyId()) {
+                    // HACK: Because DelegateChooser can't switch the delegate on dataChanged it has to think there is a new delegate.
+                    beginResetModel();
+                    m_components[0].type = MessageComponentType::Reply;
+                    endResetModel();
+                }
+            }
+        });
+        connect(m_room, &NeoChatRoom::newFileTransfer, this, [this](const QString &eventId) {
+            if (m_event != nullptr && eventId == m_event->id()) {
+                Q_EMIT dataChanged(index(0), index(rowCount() - 1), {FileTransferInfoRole});
+            }
+        });
+        connect(m_room, &NeoChatRoom::fileTransferProgress, this, [this](const QString &eventId) {
+            if (m_event != nullptr && eventId == m_event->id()) {
+                Q_EMIT dataChanged(index(0), index(rowCount() - 1), {FileTransferInfoRole});
+            }
+        });
+        connect(m_room, &NeoChatRoom::fileTransferCompleted, this, [this](const QString &eventId) {
+            if (m_event != nullptr && eventId == m_event->id()) {
+                Q_EMIT dataChanged(index(0), index(rowCount() - 1), {FileTransferInfoRole});
+            }
+        });
+        connect(m_room, &NeoChatRoom::fileTransferFailed, this, [this](const QString &eventId) {
+            if (m_event != nullptr && eventId == m_event->id()) {
+                Q_EMIT dataChanged(index(0), index(rowCount() - 1), {FileTransferInfoRole});
+            }
+        });
+        connect(m_room->editCache(), &ChatBarCache::relationIdChanged, this, [this](const QString &oldEventId, const QString &newEventId) {
+            if (m_event != nullptr && (oldEventId == m_event->id() || newEventId == m_event->id())) {
+                // HACK: Because DelegateChooser can't switch the delegate on dataChanged it has to think there is a new delegate.
+                beginResetModel();
+                updateComponents(newEventId == m_event->id());
+                endResetModel();
+            }
+        });
+    }
+
+    if (const auto event = eventCast<const Quotient::RoomMessageEvent>(m_event)) {
+        if (LinkPreviewer::hasPreviewableLinks(event)) {
+            m_linkPreviewer = new LinkPreviewer(m_room, event, this);
+
+            connect(m_linkPreviewer, &LinkPreviewer::loadedChanged, [this]() {
+                if (m_linkPreviewer->loaded()) {
+                    // HACK: Because DelegateChooser can't switch the delegate on dataChanged it has to think there is a new delegate.
+                    beginResetModel();
+                    m_components[m_components.size() - 1].type = MessageComponentType::LinkPreview;
+                    endResetModel();
+                }
+            });
+        }
+    }
+
+    updateComponents();
+}
+
+static LinkPreviewer *emptyLinkPreview = new LinkPreviewer;
+
+QVariant MessageContentModel::data(const QModelIndex &index, int role) const
+{
+    if (!index.isValid()) {
+        return {};
+    }
+
+    if (index.row() >= rowCount()) {
+        qDebug() << "MessageContentModel, something's wrong: index.row() >= rowCount()";
+        return {};
+    }
+
+    EventHandler eventHandler(m_room, m_event);
+    const auto component = m_components[index.row()];
+
+    if (role == DisplayRole) {
+        if (m_event->isRedacted()) {
+            auto reason = m_event->redactedBecause()->reason();
+            return (reason.isEmpty()) ? i18n("<i>[This message was deleted]</i>")
+                                      : i18n("<i>[This message was deleted: %1]</i>", m_event->redactedBecause()->reason());
+        }
+        if (!component.content.isEmpty()) {
+            return component.content;
+        }
+        return eventHandler.getRichBody();
+    }
+    if (role == ComponentTypeRole) {
+        return component.type;
+    }
+    if (role == ComponentAttributesRole) {
+        return component.attributes;
+    }
+    if (role == EventIdRole) {
+        return eventHandler.getId();
+    }
+    if (role == AuthorRole) {
+        return eventHandler.getAuthor(false);
+    }
+    if (role == MediaInfoRole) {
+        return eventHandler.getMediaInfo();
+    }
+    if (role == FileTransferInfoRole) {
+        if (auto event = eventCast<const Quotient::RoomMessageEvent>(m_event)) {
+            if (event->hasFileContent()) {
+                return QVariant::fromValue(m_room->fileTransferInfo(event->id()));
+            }
+        }
+        if (auto event = eventCast<const Quotient::StickerEvent>(m_event)) {
+            return QVariant::fromValue(m_room->fileTransferInfo(event->id()));
+        }
+    }
+    if (role == LatitudeRole) {
+        return eventHandler.getLatitude();
+    }
+    if (role == LongitudeRole) {
+        return eventHandler.getLongitude();
+    }
+    if (role == AssetRole) {
+        return eventHandler.getLocationAssetType();
+    }
+    if (role == PollHandlerRole) {
+        return QVariant::fromValue<PollHandler *>(m_room->poll(m_event->id()));
+    }
+    if (role == IsReplyRole) {
+        return eventHandler.hasReply();
+    }
+    if (role == ReplyComponentType) {
+        return eventHandler.replyMessageComponentType();
+    }
+    if (role == ReplyEventIdRole) {
+        return eventHandler.getReplyId();
+    }
+    if (role == ReplyAuthorRole) {
+        return eventHandler.getReplyAuthor();
+    }
+    if (role == ReplyDisplayRole) {
+        return eventHandler.getReplyRichBody();
+    }
+    if (role == ReplyMediaInfoRole) {
+        return eventHandler.getReplyMediaInfo();
+    }
+    if (role == LinkPreviewerRole) {
+        if (m_linkPreviewer != nullptr) {
+            return QVariant::fromValue<LinkPreviewer *>(m_linkPreviewer);
+        } else {
+            return QVariant::fromValue<LinkPreviewer *>(emptyLinkPreview);
+        }
+    }
+
+    return {};
+}
+
+int MessageContentModel::rowCount(const QModelIndex &parent) const
+{
+    Q_UNUSED(parent)
+    return m_components.size();
+}
+
+QHash<int, QByteArray> MessageContentModel::roleNames() const
+{
+    QHash<int, QByteArray> roles = QAbstractItemModel::roleNames();
+    roles[DisplayRole] = "display";
+    roles[ComponentTypeRole] = "componentType";
+    roles[ComponentAttributesRole] = "componentAttributes";
+    roles[EventIdRole] = "eventId";
+    roles[AuthorRole] = "author";
+    roles[MediaInfoRole] = "mediaInfo";
+    roles[FileTransferInfoRole] = "fileTransferInfo";
+    roles[LatitudeRole] = "latitude";
+    roles[LongitudeRole] = "longitude";
+    roles[AssetRole] = "asset";
+    roles[PollHandlerRole] = "pollHandler";
+    roles[IsReplyRole] = "isReply";
+    roles[ReplyComponentType] = "replyComponentType";
+    roles[ReplyEventIdRole] = "replyEventId";
+    roles[ReplyAuthorRole] = "replyAuthor";
+    roles[ReplyDisplayRole] = "replyDisplay";
+    roles[ReplyMediaInfoRole] = "replyMediaInfo";
+    roles[LinkPreviewerRole] = "linkPreviewer";
+    return roles;
+}
+
+void MessageContentModel::updateComponents(bool isEditing)
+{
+    beginResetModel();
+    m_components.clear();
+
+    EventHandler eventHandler(m_room, m_event);
+    if (eventHandler.hasReply()) {
+        if (m_room->findInTimeline(eventHandler.getReplyId()) == m_room->historyEdge()) {
+            m_components += MessageComponent{MessageComponentType::ReplyLoad, QString(), {}};
+            m_room->loadReply(m_event->id(), eventHandler.getReplyId());
+        } else {
+            m_components += MessageComponent{MessageComponentType::Reply, QString(), {}};
+        }
+    }
+
+    if (isEditing) {
+        m_components += MessageComponent{MessageComponentType::Edit, QString(), {}};
+    } else {
+        if (eventHandler.messageComponentType() == MessageComponentType::Text) {
+            const auto event = eventCast<const Quotient::RoomMessageEvent>(m_event);
+            auto body = EventHandler::rawMessageBody(*event);
+            m_components.append(TextHandler().textComponents(body, EventHandler::messageBodyInputFormat(*event), m_room, event, event->isReplaced()));
+        } else {
+            m_components += MessageComponent{eventHandler.messageComponentType(), QString(), {}};
+        }
+    }
+
+    if (m_linkPreviewer != nullptr) {
+        if (m_linkPreviewer->loaded()) {
+            m_components += MessageComponent{MessageComponentType::LinkPreview, QString(), {}};
+        } else {
+            m_components += MessageComponent{MessageComponentType::LinkPreviewLoad, QString(), {}};
+        }
+    }
+
+    endResetModel();
+}

src/models/messagecontentmodel.h

@@ -0,0 +1,95 @@
+// SPDX-FileCopyrightText: 2024 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 <QAbstractListModel>
+#include <QQmlEngine>
+
+#include "enums/messagecomponenttype.h"
+#include "eventhandler.h"
+#include "linkpreviewer.h"
+#include "neochatroom.h"
+
+struct MessageComponent {
+    MessageComponentType::Type type;
+    QString content;
+    QVariantMap attributes;
+
+    int operator==(const MessageComponent &right) const
+    {
+        return type == right.type && content == right.content && attributes == right.attributes;
+    }
+};
+
+/**
+ * @class MessageContentModel
+ *
+ * A model to visualise the components of a single RoomMessageEvent.
+ */
+class MessageContentModel : public QAbstractListModel
+{
+    Q_OBJECT
+    QML_ELEMENT
+    QML_UNCREATABLE("")
+
+public:
+    /**
+     * @brief Defines the model roles.
+     */
+    enum Roles {
+        DisplayRole = Qt::DisplayRole, /**< The display text for the message. */
+        ComponentTypeRole, /**< The type of component to visualise the message. */
+        ComponentAttributesRole, /**< The attributes of the component. */
+        EventIdRole, /**< The matrix event ID of the event. */
+        AuthorRole, /**< The author of the event. */
+        MediaInfoRole, /**< The media info for the event. */
+        FileTransferInfoRole, /**< FileTransferInfo for any downloading files. */
+        LatitudeRole, /**< Latitude for a location event. */
+        LongitudeRole, /**< Longitude for a location event. */
+        AssetRole, /**< Type of location event, e.g. self pin of the user location. */
+        PollHandlerRole, /**< The PollHandler for the event, if any. */
+
+        IsReplyRole, /**< Is the message a reply to another event. */
+        ReplyComponentType, /**< The type of component to visualise the reply message. */
+        ReplyEventIdRole, /**< The matrix ID of the message that was replied to. */
+        ReplyAuthorRole, /**< The author of the event that was replied to. */
+        ReplyDisplayRole, /**< The body of the message that was replied to. */
+        ReplyMediaInfoRole, /**< The media info of the message that was replied to. */
+
+        LinkPreviewerRole, /**< The link preview details. */
+    };
+    Q_ENUM(Roles)
+
+    explicit MessageContentModel(const Quotient::RoomEvent *event, NeoChatRoom *room);
+
+    /**
+     * @brief Get the given role value at the given index.
+     *
+     * @sa QAbstractItemModel::data
+     */
+    [[nodiscard]] QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
+
+    /**
+     * @brief Number of rows in the model.
+     *
+     * @sa  QAbstractItemModel::rowCount
+     */
+    [[nodiscard]] int rowCount(const QModelIndex &parent = QModelIndex()) const override;
+
+    /**
+     * @brief Returns a mapping from Role enum values to role names.
+     *
+     * @sa Roles, QAbstractItemModel::roleNames()
+     */
+    [[nodiscard]] QHash<int, QByteArray> roleNames() const override;
+
+private:
+    NeoChatRoom *m_room = nullptr;
+    const Quotient::RoomEvent *m_event = nullptr;
+
+    QList<MessageComponent> m_components;
+    void updateComponents(bool isEditing = false);
+
+    LinkPreviewer *m_linkPreviewer = nullptr;
+};

src/models/messageeventmodel.cpp

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
 #include "messageeventmodel.h"
-#include "linkpreviewer.h"
+#include "messagecomponenttype.h"
 #include "messageeventmodel_logging.h"
 
 #include "neochatconfig.h"
@@ -10,6 +10,7 @@
 #include <Quotient/connection.h>
 #include <Quotient/csapi/rooms.h>
 #include <Quotient/events/redactionevent.h>
+#include <Quotient/events/roommessageevent.h>
 #include <Quotient/events/stickerevent.h>
 #include <Quotient/user.h>
 
@@ -22,6 +23,9 @@
 #include "enums/delegatetype.h"
 #include "eventhandler.h"
 #include "events/pollevent.h"
+#include "linkpreviewer.h"
+#include "messagecontentmodel.h"
+#include "models/messagefiltermodel.h"
 #include "models/reactionmodel.h"
 #include "texthandler.h"
 
@@ -31,7 +35,6 @@ QHash<int, QByteArray> MessageEventModel::roleNames() const
 {
     QHash<int, QByteArray> roles = QAbstractItemModel::roleNames();
     roles[DelegateTypeRole] = "delegateType";
-    roles[PlainText] = "plainText";
     roles[EventIdRole] = "eventId";
     roles[TimeRole] = "time";
     roles[TimeStringRole] = "timeString";
@@ -40,18 +43,8 @@ QHash<int, QByteArray> MessageEventModel::roleNames() const
     roles[HighlightRole] = "isHighlighted";
     roles[SpecialMarksRole] = "marks";
     roles[ProgressInfoRole] = "progressInfo";
-    roles[ShowLinkPreviewRole] = "showLinkPreview";
-    roles[LinkPreviewRole] = "linkPreview";
-    roles[MediaInfoRole] = "mediaInfo";
-    roles[IsReplyRole] = "isReply";
-    roles[ReplyAuthor] = "replyAuthor";
-    roles[ReplyIdRole] = "replyId";
-    roles[ReplyDelegateTypeRole] = "replyDelegateType";
-    roles[ReplyDisplayRole] = "replyDisplay";
-    roles[ReplyMediaInfoRole] = "replyMediaInfo";
     roles[IsThreadedRole] = "isThreaded";
     roles[ThreadRootRole] = "threadRoot";
-    roles[ShowAuthorRole] = "showAuthor";
     roles[ShowSectionRole] = "showSection";
     roles[ReadMarkersRole] = "readMarkers";
     roles[ExcessReadMarkersRole] = "excessReadMarkers";
@@ -64,10 +57,9 @@ QHash<int, QByteArray> MessageEventModel::roleNames() const
     roles[IsRedactedRole] = "isRedacted";
     roles[GenericDisplayRole] = "genericDisplay";
     roles[IsPendingRole] = "isPending";
-    roles[LatitudeRole] = "latitude";
-    roles[LongitudeRole] = "longitude";
-    roles[AssetRole] = "asset";
-    roles[PollHandlerRole] = "pollHandler";
+    roles[ContentModelRole] = "contentModel";
+    roles[MediaInfoRole] = "mediaInfo";
+    roles[IsEditableRole] = "isEditable";
     return roles;
 }
 
@@ -96,7 +88,6 @@ void MessageEventModel::setRoom(NeoChatRoom *room)
     beginResetModel();
     if (m_currentRoom) {
         m_currentRoom->disconnect(this);
-        m_linkPreviewers.clear();
         m_reactionModels.clear();
     }
 
@@ -119,14 +110,6 @@ void MessageEventModel::setRoom(NeoChatRoom *room)
             room->getPreviousContent(50);
         }
         lastReadEventId = room->lastFullyReadEventId();
-        connect(m_currentRoom, &NeoChatRoom::replyLoaded, this, [this](const auto &eventId, const auto &replyId) {
-            Q_UNUSED(replyId);
-            auto row = eventIdToRow(eventId);
-            if (row == -1) {
-                return;
-            }
-            Q_EMIT dataChanged(index(row, 0), index(row, 0), {ReplyDelegateTypeRole, ReplyDisplayRole, ReplyMediaInfoRole, ReplyAuthor});
-        });
 
         connect(m_currentRoom, &Room::aboutToAddNewMessages, this, [this](RoomEventsRange events) {
             for (auto &&event : events) {
@@ -195,7 +178,7 @@ void MessageEventModel::setRoom(NeoChatRoom *room)
             }
             if (biggest < m_currentRoom->maxTimelineIndex()) {
                 auto rowBelowInserted = m_currentRoom->maxTimelineIndex() - biggest + timelineBaseIndex() - 1;
-                refreshEventRoles(rowBelowInserted, {ShowAuthorRole});
+                refreshEventRoles(rowBelowInserted, {MessageFilterModel::ShowAuthorRole});
             }
             for (auto i = m_currentRoom->maxTimelineIndex() - biggest; i <= m_currentRoom->maxTimelineIndex() - lowest; ++i) {
                 refreshLastUserEvents(i);
@@ -225,7 +208,7 @@ void MessageEventModel::setRoom(NeoChatRoom *room)
             refreshRow(timelineBaseIndex()); // Refresh the looks
             refreshLastUserEvents(0);
             if (timelineBaseIndex() > 0) { // Refresh below, see #312
-                refreshEventRoles(timelineBaseIndex() - 1, {ShowAuthorRole});
+                refreshEventRoles(timelineBaseIndex() - 1, {MessageFilterModel::ShowAuthorRole});
             }
         });
         connect(m_currentRoom, &Room::pendingEventChanged, this, &MessageEventModel::refreshRow);
@@ -238,7 +221,6 @@ void MessageEventModel::setRoom(NeoChatRoom *room)
             moveReadMarker(toEventId);
         });
         connect(m_currentRoom, &Room::replacedEvent, this, [this](const RoomEvent *newEvent) {
-            refreshLastUserEvents(refreshEvent(newEvent->id()) - timelineBaseIndex());
             const RoomMessageEvent *message = eventCast<const RoomMessageEvent>(newEvent);
             if (message != nullptr) {
                 createEventObjects(message);
@@ -265,10 +247,6 @@ void MessageEventModel::setRoom(NeoChatRoom *room)
                 refreshEventRoles(event->id(), {ReadMarkersRole, ReadMarkersStringRole, ExcessReadMarkersRole});
             }
         });
-        connect(m_currentRoom, &Room::newFileTransfer, this, &MessageEventModel::refreshEvent);
-        connect(m_currentRoom, &Room::fileTransferProgress, this, &MessageEventModel::refreshEvent);
-        connect(m_currentRoom, &Room::fileTransferCompleted, this, &MessageEventModel::refreshEvent);
-        connect(m_currentRoom, &Room::fileTransferFailed, this, &MessageEventModel::refreshEvent);
         connect(m_currentRoom->connection(), &Connection::ignoredUsersListChanged, this, [this] {
             beginResetModel();
             endResetModel();
@@ -439,8 +417,6 @@ void MessageEventModel::fetchMore(const QModelIndex &parent)
     }
 }
 
-static LinkPreviewer *emptyLinkPreview = new LinkPreviewer;
-
 QVariant MessageEventModel::data(const QModelIndex &idx, int role) const
 {
     if (!checkIndex(idx, QAbstractItemModel::CheckIndexOption::IndexIsValid)) {
@@ -481,9 +457,7 @@ QVariant MessageEventModel::data(const QModelIndex &idx, int role) const
     const auto pendingIt = m_currentRoom->pendingEvents().crbegin() + std::min(row, timelineBaseIndex());
     const auto &evt = isPending ? **pendingIt : **timelineIt;
 
-    EventHandler eventHandler;
-    eventHandler.setRoom(m_currentRoom);
-    eventHandler.setEvent(&evt);
+    EventHandler eventHandler(m_currentRoom, &evt);
 
     if (role == Qt::DisplayRole) {
         if (evt.isRedacted()) {
@@ -494,16 +468,24 @@ QVariant MessageEventModel::data(const QModelIndex &idx, int role) const
         return eventHandler.getRichBody();
     }
 
+    if (role == ContentModelRole) {
+        if (!evt.isStateEvent()) {
+            return QVariant::fromValue<MessageContentModel *>(new MessageContentModel(&evt, m_currentRoom));
+        }
+        if (evt.isStateEvent()) {
+            if (evt.matrixType() == QStringLiteral("org.matrix.msc3672.beacon_info")) {
+                return QVariant::fromValue<MessageContentModel *>(new MessageContentModel(&evt, m_currentRoom));
+            }
+        }
+        return {};
+    }
+
     if (role == GenericDisplayRole) {
         return eventHandler.getGenericBody();
     }
 
-    if (role == PlainText) {
-        return eventHandler.getPlainBody();
-    }
-
     if (role == DelegateTypeRole) {
-        return eventHandler.getDelegateType();
+        return DelegateType::typeForEvent(evt);
     }
 
     if (role == AuthorRole) {
@@ -561,46 +543,6 @@ QVariant MessageEventModel::data(const QModelIndex &idx, int role) const
         return eventHandler.getTimeString(true, QLocale::ShortFormat, isPending, lastUpdated);
     }
 
-    if (role == ShowLinkPreviewRole) {
-        return m_linkPreviewers.contains(evt.id());
-    }
-
-    if (role == LinkPreviewRole) {
-        if (m_linkPreviewers.contains(evt.id())) {
-            return QVariant::fromValue<LinkPreviewer *>(m_linkPreviewers[evt.id()].data());
-        } else {
-            return QVariant::fromValue<LinkPreviewer *>(emptyLinkPreview);
-        }
-    }
-
-    if (role == MediaInfoRole) {
-        return eventHandler.getMediaInfo();
-    }
-
-    if (role == IsReplyRole) {
-        return eventHandler.hasReply();
-    }
-
-    if (role == ReplyIdRole) {
-        return eventHandler.getReplyId();
-    }
-
-    if (role == ReplyDelegateTypeRole) {
-        return eventHandler.getReplyDelegateType();
-    }
-
-    if (role == ReplyAuthor) {
-        return eventHandler.getReplyAuthor();
-    }
-
-    if (role == ReplyDisplayRole) {
-        return eventHandler.getReplyRichBody();
-    }
-
-    if (role == ReplyMediaInfoRole) {
-        return eventHandler.getReplyMediaInfo();
-    }
-
     if (role == IsThreadedRole) {
         return eventHandler.isThreaded();
     }
@@ -609,25 +551,6 @@ QVariant MessageEventModel::data(const QModelIndex &idx, int role) const
         return eventHandler.threadRoot();
     }
 
-    if (role == ShowAuthorRole) {
-        for (auto r = row + 1; r < rowCount(); ++r) {
-            auto i = index(r);
-            // Note !itemData(i).empty() is a check for instances where rows have been removed, e.g. when the read marker is moved.
-            // While the row is removed the subsequent row indexes are not changed so we need to skip over the removed index.
-            // See - https://doc.qt.io/qt-5/qabstractitemmodel.html#beginRemoveRows
-            if (data(i, SpecialMarksRole) != EventStatus::Hidden && !itemData(i).empty()) {
-                return data(i, AuthorRole) != data(idx, AuthorRole) || data(i, DelegateTypeRole) == DelegateType::State
-                    || data(i, TimeRole).toDateTime().msecsTo(data(idx, TimeRole).toDateTime()) > 600000
-                    || data(i, TimeRole).toDateTime().toLocalTime().date().day() != data(idx, TimeRole).toDateTime().toLocalTime().date().day()
-                    // FIXME: This should not be necessary; the proper fix is to calculate this role in MessageFilterModel with the knowledge about the filtered
-                    // events.
-                    || data(i, IsRedactedRole).toBool();
-            }
-        }
-
-        return true;
-    }
-
     if (role == ShowSectionRole) {
         for (auto r = row + 1; r < rowCount(); ++r) {
             auto i = index(r);
@@ -644,18 +567,6 @@ QVariant MessageEventModel::data(const QModelIndex &idx, int role) const
         return false;
     }
 
-    if (role == LatitudeRole) {
-        return eventHandler.getLatitude();
-    }
-
-    if (role == LongitudeRole) {
-        return eventHandler.getLongitude();
-    }
-
-    if (role == AssetRole) {
-        return eventHandler.getLocationAssetType();
-    }
-
     if (role == ReadMarkersRole) {
         return eventHandler.getReadMarkers();
     }
@@ -705,8 +616,12 @@ QVariant MessageEventModel::data(const QModelIndex &idx, int role) const
         return row < static_cast<int>(m_currentRoom->pendingEvents().size());
     }
 
-    if (role == PollHandlerRole) {
-        return QVariant::fromValue<PollHandler *>(m_currentRoom->poll(evt.id()));
+    if (role == MediaInfoRole) {
+        return eventHandler.getMediaInfo();
+    }
+
+    if (role == IsEditableRole) {
+        return eventHandler.messageComponentType() == MessageComponentType::Text && evt.senderId() == m_currentRoom->localUser()->id();
     }
 
     return {};
@@ -726,16 +641,6 @@ void MessageEventModel::createEventObjects(const Quotient::RoomMessageEvent *eve
 {
     auto eventId = event->id();
 
-    if (m_linkPreviewers.contains(eventId)) {
-        if (!LinkPreviewer::hasPreviewableLinks(event)) {
-            m_linkPreviewers.remove(eventId);
-        }
-    } else {
-        if (LinkPreviewer::hasPreviewableLinks(event)) {
-            m_linkPreviewers[eventId] = QSharedPointer<LinkPreviewer>(new LinkPreviewer(m_currentRoom, event));
-        }
-    }
-
     // ReactionModel handles updates to add and remove reactions, we only need to
     // handle adding and removing whole models here.
     if (m_reactionModels.contains(eventId)) {
@@ -763,7 +668,7 @@ void MessageEventModel::createEventObjects(const Quotient::RoomMessageEvent *eve
 bool MessageEventModel::event(QEvent *event)
 {
     if (event->type() == QEvent::ApplicationPaletteChange) {
-        Q_EMIT dataChanged(index(0, 0), index(rowCount() - 1, 0), {AuthorRole, ReplyAuthor, ReadMarkersRole});
+        Q_EMIT dataChanged(index(0, 0), index(rowCount() - 1, 0), {AuthorRole, ReadMarkersRole});
     }
     return QObject::event(event);
 }

src/models/messageeventmodel.h

@@ -40,7 +40,6 @@ public:
      */
     enum EventRoles {
         DelegateTypeRole = Qt::UserRole + 1, /**< The delegate type of the message. */
-        PlainText, /**< Plain text representation of the message. */
         EventIdRole, /**< The matrix event ID of the event. */
         TimeRole, /**< The timestamp for when the event was sent (as a QDateTime). */
         TimeStringRole, /**< The timestamp for when the event was sent as a string (in QLocale::ShortFormat). */
@@ -50,23 +49,13 @@ public:
         SpecialMarksRole, /**< Whether the event is hidden or not. */
         ProgressInfoRole, /**< Progress info when downloading files. */
         GenericDisplayRole, /**< A generic string based upon the message type. */
-
-        ShowLinkPreviewRole, /**< Whether a link preview should be shown. */
-        LinkPreviewRole, /**< The link preview details. */
-
         MediaInfoRole, /**< The media info for the event. */
 
-        IsReplyRole, /**< Is the message a reply to another event. */
-        ReplyAuthor, /**< The author of the event that was replied to. */
-        ReplyIdRole, /**< The matrix ID of the message that was replied to. */
-        ReplyDelegateTypeRole, /**< The delegate type of the message that was replied to. */
-        ReplyDisplayRole, /**< The body of the message that was replied to. */
-        ReplyMediaInfoRole, /**< The media info of the message that was replied to. */
+        ContentModelRole, /**< The MessageContentModel for the event. */
 
         IsThreadedRole,
         ThreadRootRole,
 
-        ShowAuthorRole, /**< Whether the author's name should be shown. */
         ShowSectionRole, /**< Whether the section header should be shown. */
 
         ReadMarkersRole, /**< The first 5 other users at the event for read marker tracking. */
@@ -80,10 +69,7 @@ public:
         AuthorDisplayNameRole, /**< The displayname for the event's sender; for name change events, the old displayname. */
         IsRedactedRole, /**< Whether an event has been deleted. */
         IsPendingRole, /**< Whether an event is waiting to be accepted by the server. */
-        LatitudeRole, /**< Latitude for a location event. */
-        LongitudeRole, /**< Longitude for a location event. */
-        AssetRole, /**< Type of location event, e.g. self pin of the user location. */
-        PollHandlerRole, /**< The PollHandler for the event, if any. */
+        IsEditableRole, /**< Whether the event can be edited by the user. */
         LastRole, // Keep this last
     };
     Q_ENUM(EventRoles)
@@ -135,7 +121,6 @@ private:
     bool movingEvent = false;
     KFormat m_format;
 
-    QMap<QString, QSharedPointer<LinkPreviewer>> m_linkPreviewers;
     QMap<QString, QSharedPointer<ReactionModel>> m_reactionModels;
 
     [[nodiscard]] int timelineBaseIndex() const;

src/models/messagefiltermodel.cpp

@@ -80,8 +80,24 @@ QVariant MessageFilterModel::data(const QModelIndex &index, int role) const
         return authorList(mapToSource(index).row());
     } else if (role == ExcessAuthorsRole) {
         return excessAuthors(mapToSource(index).row());
+    } else if (role == ShowAuthorRole) {
+        for (auto r = index.row() + 1; r < rowCount(); ++r) {
+            auto i = this->index(r, 0);
+            // Note !itemData(i).empty() is a check for instances where rows have been removed, e.g. when the read marker is moved.
+            // While the row is removed the subsequent row indexes are not changed so we need to skip over the removed index.
+            // See - https://doc.qt.io/qt-5/qabstractitemmodel.html#beginRemoveRows
+            if (data(i, MessageEventModel::SpecialMarksRole) != EventStatus::Hidden && !itemData(i).empty()) {
+                return data(i, MessageEventModel::AuthorRole) != data(index, MessageEventModel::AuthorRole)
+                    || data(i, MessageEventModel::DelegateTypeRole) == DelegateType::State
+                    || data(i, MessageEventModel::TimeRole).toDateTime().msecsTo(data(index, MessageEventModel::TimeRole).toDateTime()) > 600000
+                    || data(i, MessageEventModel::TimeRole).toDateTime().toLocalTime().date().day()
+                    != data(index, MessageEventModel::TimeRole).toDateTime().toLocalTime().date().day();
+            }
+        }
+
+        return true;
     }
-    return sourceModel()->data(mapToSource(index), role);
+    return QSortFilterProxyModel::data(index, role);
 }
 
 QHash<int, QByteArray> MessageFilterModel::roleNames() const
@@ -91,6 +107,7 @@ QHash<int, QByteArray> MessageFilterModel::roleNames() const
     roles[StateEventsRole] = "stateEvents";
     roles[AuthorListRole] = "authorList";
     roles[ExcessAuthorsRole] = "excessAuthors";
+    roles[ShowAuthorRole] = "showAuthor";
     return roles;
 }
 
@@ -127,9 +144,8 @@ QString MessageFilterModel::aggregateEventToString(int sourceRow) const
         chunks.removeDuplicates();
         // The author text is either "n users" if > 1 user or the matrix.to link to a single user.
         QString userText = uniqueAuthors.length() > 1 ? i18ncp("n users", " %1 user ", " %1 users ", uniqueAuthors.length())
-                                                      : QStringLiteral("<a href=\"https://matrix.to/#/%1\" style=\"color: %2\">%3</a> ")
+                                                      : QStringLiteral("<a href=\"https://matrix.to/#/%1\">%3</a> ")
                                                             .arg(uniqueAuthors[0].toMap()[QStringLiteral("id")].toString(),
-                                                                 uniqueAuthors[0].toMap()[QStringLiteral("color")].toString(),
                                                                  uniqueAuthors[0].toMap()[QStringLiteral("displayName")].toString().toHtmlEscaped());
 
         QString chunksText;

src/models/messagefiltermodel.h

@@ -34,6 +34,7 @@ public:
         StateEventsRole, /**< List of state events in the aggregated state. */
         AuthorListRole, /**< List of the first 5 unique authors of the aggregated state event. */
         ExcessAuthorsRole, /**< The number of unique authors beyond the first 5. */
+        ShowAuthorRole, /**< Whether the author (name and avatar) should be shown at this message. */
         LastRole, // Keep this last
     };
 

src/models/notificationsmodel.cpp

@@ -122,9 +122,7 @@ void NotificationsModel::loadData()
                 const auto &authorAvatar = avatar.isValid() && avatar.scheme() == QStringLiteral("mxc") ? avatar : QUrl();
 
                 const auto &roomEvent = eventCast<const RoomEvent>(notification.event.get());
-                EventHandler eventHandler;
-                eventHandler.setRoom(dynamic_cast<NeoChatRoom *>(room));
-                eventHandler.setEvent(roomEvent);
+                EventHandler eventHandler(dynamic_cast<NeoChatRoom *>(room), roomEvent);
                 beginInsertRows({}, m_notifications.length(), m_notifications.length());
                 m_notifications += Notification{
                     .roomId = notification.roomId,

src/models/publicroomlistmodel.cpp

@@ -5,6 +5,8 @@
 
 #include <Quotient/connection.h>
 
+#include "publicroomlist_logging.h"
+
 using namespace Quotient;
 
 PublicRoomListModel::PublicRoomListModel(QObject *parent)
@@ -41,7 +43,7 @@ void PublicRoomListModel::setConnection(Connection *conn)
     if (job) {
         job->abandon();
         job = nullptr;
-        Q_EMIT loadingChanged();
+        Q_EMIT searchingChanged();
     }
 
     if (m_connection) {
@@ -50,7 +52,6 @@ void PublicRoomListModel::setConnection(Connection *conn)
 
     Q_EMIT connectionChanged();
     Q_EMIT serverChanged();
-    Q_EMIT hasMoreChanged();
 }
 
 QString PublicRoomListModel::server() const
@@ -71,14 +72,13 @@ void PublicRoomListModel::setServer(const QString &value)
     nextBatch = QString();
     attempted = false;
     rooms.clear();
-    Q_EMIT loadingChanged();
 
     endResetModel();
 
     if (job) {
         job->abandon();
         job = nullptr;
-        Q_EMIT loadingChanged();
+        Q_EMIT searchingChanged();
     }
 
     if (m_connection) {
@@ -86,42 +86,30 @@ void PublicRoomListModel::setServer(const QString &value)
     }
 
     Q_EMIT serverChanged();
-    Q_EMIT hasMoreChanged();
 }
 
-QString PublicRoomListModel::keyword() const
+QString PublicRoomListModel::searchText() const
 {
-    return m_keyword;
+    return m_searchText;
 }
 
-void PublicRoomListModel::setKeyword(const QString &value)
+void PublicRoomListModel::setSearchText(const QString &value)
 {
-    if (m_keyword == value) {
+    if (m_searchText == value) {
         return;
     }
 
-    m_keyword = value;
-
-    beginResetModel();
+    m_searchText = value;
+    Q_EMIT searchTextChanged();
 
     nextBatch = QString();
     attempted = false;
-    rooms.clear();
-
-    endResetModel();
 
     if (job) {
         job->abandon();
         job = nullptr;
-        Q_EMIT loadingChanged();
+        Q_EMIT searchingChanged();
     }
-
-    if (m_connection) {
-        next();
-    }
-
-    Q_EMIT keywordChanged();
-    Q_EMIT hasMoreChanged();
 }
 
 bool PublicRoomListModel::showOnlySpaces() const
@@ -138,15 +126,28 @@ void PublicRoomListModel::setShowOnlySpaces(bool showOnlySpaces)
     Q_EMIT showOnlySpacesChanged();
 }
 
-void PublicRoomListModel::next(int count)
+void PublicRoomListModel::search(int limit)
 {
-    if (count < 1) {
+    if (limit < 1 || attempted) {
         return;
     }
 
     if (job) {
-        qDebug() << "PublicRoomListModel: Other jobs running, ignore";
+        qCDebug(PublicRoomList) << "Other job running, ignore";
+        return;
+    }
 
+    next(limit);
+}
+
+void PublicRoomListModel::next(int limit)
+{
+    if (m_connection == nullptr || limit < 1) {
+        return;
+    }
+
+    if (job) {
+        qCDebug(PublicRoomList) << "Other job running, ignore";
         return;
     }
 
@@ -154,11 +155,17 @@ void PublicRoomListModel::next(int count)
     if (m_showOnlySpaces) {
         roomTypes += QLatin1String("m.space");
     }
-    job = m_connection->callApi<QueryPublicRoomsJob>(m_server, count, nextBatch, QueryPublicRoomsJob::Filter{m_keyword, roomTypes});
-    Q_EMIT loadingChanged();
+    job = m_connection->callApi<QueryPublicRoomsJob>(m_server, limit, nextBatch, QueryPublicRoomsJob::Filter{m_searchText, roomTypes});
+    Q_EMIT searchingChanged();
 
     connect(job, &BaseJob::finished, this, [this] {
-        attempted = true;
+        if (!attempted) {
+            beginResetModel();
+            rooms.clear();
+            endResetModel();
+
+            attempted = true;
+        }
 
         if (job->status() == BaseJob::Success) {
             nextBatch = job->nextBatch();
@@ -166,14 +173,10 @@ void PublicRoomListModel::next(int count)
             this->beginInsertRows({}, rooms.count(), rooms.count() + job->chunk().count() - 1);
             rooms.append(job->chunk());
             this->endInsertRows();
-
-            if (job->nextBatch().isEmpty()) {
-                Q_EMIT hasMoreChanged();
-            }
         }
 
         this->job = nullptr;
-        Q_EMIT loadingChanged();
+        Q_EMIT searchingChanged();
     });
 }
 
@@ -184,8 +187,7 @@ QVariant PublicRoomListModel::data(const QModelIndex &index, int role) const
     }
 
     if (index.row() >= rooms.count()) {
-        qDebug() << "PublicRoomListModel, something's wrong: index.row() >= "
-                    "rooms.count()";
+        qCDebug(PublicRoomList) << "something's wrong: index.row() >= rooms.count()";
         return {};
     }
     auto room = rooms.at(index.row());
@@ -271,12 +273,19 @@ int PublicRoomListModel::rowCount(const QModelIndex &parent) const
     return rooms.count();
 }
 
-bool PublicRoomListModel::hasMore() const
+bool PublicRoomListModel::canFetchMore(const QModelIndex &parent) const
 {
-    return !(attempted && nextBatch.isEmpty());
+    Q_UNUSED(parent)
+    return !nextBatch.isEmpty();
 }
 
-bool PublicRoomListModel::loading() const
+void PublicRoomListModel::fetchMore(const QModelIndex &parent)
+{
+    Q_UNUSED(parent)
+    next();
+}
+
+bool PublicRoomListModel::searching() const
 {
     return job != nullptr;
 }

src/models/publicroomlistmodel.h

@@ -41,9 +41,9 @@ class PublicRoomListModel : public QAbstractListModel
     Q_PROPERTY(QString server READ server WRITE setServer NOTIFY serverChanged)
 
     /**
-     * @brief The filter keyword for the list of public rooms.
+     * @brief The text to search the public room list for.
      */
-    Q_PROPERTY(QString keyword READ keyword WRITE setKeyword NOTIFY keywordChanged)
+    Q_PROPERTY(QString searchText READ searchText WRITE setSearchText NOTIFY searchTextChanged)
 
     /**
      * @brief Whether only space rooms should be shown.
@@ -51,14 +51,9 @@ class PublicRoomListModel : public QAbstractListModel
     Q_PROPERTY(bool showOnlySpaces READ showOnlySpaces WRITE setShowOnlySpaces NOTIFY showOnlySpacesChanged)
 
     /**
-     * @brief Whether the model has more items to load.
+     * @brief Whether the model is searching.
      */
-    Q_PROPERTY(bool hasMore READ hasMore NOTIFY hasMoreChanged)
-
-    /**
-     * @biref Whether the model is still loading.
-     */
-    Q_PROPERTY(bool loading READ loading NOTIFY loadingChanged)
+    Q_PROPERTY(bool searching READ searching NOTIFY searchingChanged)
 
 public:
     /**
@@ -105,31 +100,38 @@ public:
     [[nodiscard]] QString server() const;
     void setServer(const QString &value);
 
-    [[nodiscard]] QString keyword() const;
-    void setKeyword(const QString &value);
+    [[nodiscard]] QString searchText() const;
+    void setSearchText(const QString &searchText);
 
     [[nodiscard]] bool showOnlySpaces() const;
     void setShowOnlySpaces(bool showOnlySpaces);
 
-    [[nodiscard]] bool hasMore() const;
+    [[nodiscard]] bool searching() const;
 
-    [[nodiscard]] bool loading() const;
+    /**
+     * @brief Search the room directory.
+     *
+     * @param limit the maximum number of rooms to load.
+     */
+    Q_INVOKABLE void search(int limit = 50);
+
+private:
+    QPointer<Quotient::Connection> m_connection = nullptr;
+    QString m_server;
+    QString m_searchText;
+    bool m_showOnlySpaces = false;
 
     /**
      * @brief Load the next set of rooms.
      *
-     * @param count the maximum number of rooms to load.
+     * @param limit the maximum number of rooms to load.
      */
-    Q_INVOKABLE void next(int count = 50);
-
-private:
-    Quotient::Connection *m_connection = nullptr;
-    QString m_server;
-    QString m_keyword;
-    bool m_showOnlySpaces = false;
+    void next(int limit = 50);
+    bool canFetchMore(const QModelIndex &parent) const override;
+    void fetchMore(const QModelIndex &parent) override;
 
     bool attempted = false;
-    bool m_loading = false;
+    bool m_searching = false;
     QString nextBatch;
 
     QList<Quotient::PublicRoomsChunk> rooms;
@@ -139,8 +141,7 @@ private:
 Q_SIGNALS:
     void connectionChanged();
     void serverChanged();
-    void keywordChanged();
+    void searchTextChanged();
     void showOnlySpacesChanged();
-    void hasMoreChanged();
-    void loadingChanged();
+    void searchingChanged();
 };

src/models/reactionmodel.cpp

@@ -23,7 +23,7 @@ ReactionModel::ReactionModel(const Quotient::RoomMessageEvent *event, const NeoC
 {
     if (m_event != nullptr && m_room != nullptr) {
         connect(m_room, &NeoChatRoom::updatedEvent, this, [this](const QString &eventId) {
-            if (m_event->id() == eventId) {
+            if (m_event && m_event->id() == eventId) {
                 updateReactions();
             }
         });
@@ -80,7 +80,7 @@ QVariant ReactionModel::data(const QModelIndex &index, int role) const
                       "%2 reacted with %3",
                       reaction.authors.count(),
                       text,
-                      reactionText(reaction.reaction));
+                      m_shortcodes.contains(reaction.reaction) ? m_shortcodes[reaction.reaction] : reactionText(reaction.reaction));
         return text;
     }
 
@@ -111,6 +111,7 @@ void ReactionModel::updateReactions()
     beginResetModel();
 
     m_reactions.clear();
+    m_shortcodes.clear();
 
     const auto &annotations = m_room->relatedEvents(*m_event, Quotient::EventRelation::AnnotationType);
     if (annotations.isEmpty()) {
@@ -125,6 +126,9 @@ void ReactionModel::updateReactions()
         }
         if (const auto &e = eventCast<const Quotient::ReactionEvent>(a)) {
             reactions[e->key()].append(m_room->user(e->senderId()));
+            if (e->contentJson()[QStringLiteral("shortcode")].toString().length()) {
+                m_shortcodes[e->key()] = e->contentJson()[QStringLiteral("shortcode")].toString().toHtmlEscaped();
+            }
         }
     }
 
@@ -158,8 +162,18 @@ QHash<int, QByteArray> ReactionModel::roleNames() const
     };
 }
 
-QString ReactionModel::reactionText(const QString &text)
+QString ReactionModel::reactionText(QString text) const
 {
+    text = text.toHtmlEscaped();
+    if (text.startsWith(QStringLiteral("mxc://"))) {
+        static QFont font;
+        static int size = font.pixelSize();
+        if (size == -1) {
+            size = font.pointSizeF() * 1.333;
+        }
+        return QStringLiteral("<img src=\"%1\" width=\"%2\" height=\"%2\">")
+            .arg(m_room->connection()->makeMediaUrl(QUrl(text)).toString(), QString::number(size));
+    }
     const auto isEmoji = [](const QString &text) {
 #ifdef HAVE_ICU
         QTextBoundaryFinder finder(QTextBoundaryFinder::Grapheme, text);

src/models/reactionmodel.h

@@ -71,8 +71,9 @@ private:
     const NeoChatRoom *m_room;
     const Quotient::RoomMessageEvent *m_event;
     QList<Reaction> m_reactions;
+    QMap<QString, QString> m_shortcodes;
 
     void updateReactions();
-    static QString reactionText(const QString &text);
+    QString reactionText(QString text) const;
 };
 Q_DECLARE_METATYPE(ReactionModel *)

src/models/roomlistmodel.cpp

@@ -9,17 +9,7 @@
 #include "roommanager.h"
 #include "spacehierarchycache.h"
 
-#include <QDebug>
-#if QT_VERSION < QT_VERSION_CHECK(6, 6, 0)
-#ifndef Q_OS_ANDROID
-#include <QDBusConnection>
-#include <QDBusInterface>
-#include <QDBusMessage>
-#endif
-#endif
-
 #include <KLocalizedString>
-#include <QGuiApplication>
 
 using namespace Quotient;
 
@@ -28,37 +18,6 @@ Q_DECLARE_METATYPE(Quotient::JoinState)
 RoomListModel::RoomListModel(QObject *parent)
     : QAbstractListModel(parent)
 {
-    const auto collapsedSections = NeoChatConfig::collapsedSections();
-    for (auto collapsedSection : collapsedSections) {
-        m_categoryVisibility[collapsedSection] = false;
-    }
-
-    connect(this, &RoomListModel::highlightCountChanged, this, [this]() {
-#if QT_VERSION < QT_VERSION_CHECK(6, 6, 0)
-#ifndef Q_OS_ANDROID
-        // copied from Telegram desktop
-        const auto launcherUrl = "application://org.kde.neochat.desktop"_ls;
-        // Gnome requires that count is a 64bit integer
-        const qint64 counterSlice = std::min(m_highlightCount, 9999);
-        QVariantMap dbusUnityProperties;
-
-        if (counterSlice > 0) {
-            dbusUnityProperties["count"_ls] = counterSlice;
-            dbusUnityProperties["count-visible"_ls] = true;
-        } else {
-            dbusUnityProperties["count-visible"_ls] = false;
-        }
-
-        auto signal = QDBusMessage::createSignal("/com/canonical/unity/launcherentry/neochat"_ls, "com.canonical.Unity.LauncherEntry"_ls, "Update"_ls);
-
-        signal.setArguments({launcherUrl, dbusUnityProperties});
-
-        QDBusConnection::sessionBus().send(signal);
-#endif // Q_OS_ANDROID
-#else
-        qGuiApp->setBadgeNumber(m_highlightCount);
-#endif // QT_VERSION_CHECK(6, 6, 0)
-    });
     connect(&SpaceHierarchyCache::instance(), &SpaceHierarchyCache::spaceHierarchyChanged, this, [this]() {
         Q_EMIT dataChanged(index(0, 0), index(rowCount(), 0), {IsChildSpaceRole});
     });
@@ -127,7 +86,6 @@ void RoomListModel::doResetModel()
         doAddRoom(room);
     }
     endResetModel();
-    refreshNotificationCount();
 }
 
 NeoChatRoom *RoomListModel::roomAt(int row) const
@@ -153,7 +111,7 @@ void RoomListModel::connectRoomSignals(NeoChatRoom *room)
         refresh(room, {DisplayNameRole});
     });
     connect(room, &Room::unreadStatsChanged, this, [this, room] {
-        refresh(room, {NotificationCountRole, HighlightCountRole});
+        refresh(room, {ContextNotificationCountRole, HasHighlightNotificationsRole});
     });
     connect(room, &Room::notificationCountChanged, this, [this, room] {
         refresh(room);
@@ -176,44 +134,6 @@ void RoomListModel::connectRoomSignals(NeoChatRoom *room)
     connect(room, &Room::pendingEventMerged, this, [this, room] {
         refresh(room, {SubtitleTextRole});
     });
-    connect(room, &Room::unreadStatsChanged, this, &RoomListModel::refreshNotificationCount);
-    connect(room, &Room::highlightCountChanged, this, &RoomListModel::refreshHighlightCount);
-}
-
-int RoomListModel::notificationCount() const
-{
-    return m_notificationCount;
-}
-
-int RoomListModel::highlightCount() const
-{
-    return m_highlightCount;
-}
-
-void RoomListModel::refreshNotificationCount()
-{
-    int count = 0;
-    for (auto room : std::as_const(m_rooms)) {
-        count += room->notificationCount();
-    }
-    if (m_notificationCount == count) {
-        return;
-    }
-    m_notificationCount = count;
-    Q_EMIT notificationCountChanged();
-}
-
-void RoomListModel::refreshHighlightCount()
-{
-    int count = 0;
-    for (auto room : std::as_const(m_rooms)) {
-        count += room->highlightCount();
-    }
-    if (m_highlightCount == count) {
-        return;
-    }
-    m_highlightCount = count;
-    Q_EMIT highlightCountChanged();
 }
 
 void RoomListModel::updateRoom(Room *room, Room *prev)
@@ -288,6 +208,9 @@ QVariant RoomListModel::data(const QModelIndex &index, int role) const
     if (role == DisplayNameRole) {
         return room->displayName();
     }
+    if (role == EscapedDisplayNameRole) {
+        return room->displayName().toHtmlEscaped();
+    }
     if (role == AvatarRole) {
         return room->avatarMediaId();
     }
@@ -298,36 +221,13 @@ QVariant RoomListModel::data(const QModelIndex &index, int role) const
         return room->topic();
     }
     if (role == CategoryRole) {
-        if (room->joinState() == JoinState::Invite) {
-            return NeoChatRoomType::Invited;
-        }
-        if (room->isFavourite()) {
-            return NeoChatRoomType::Favorite;
-        }
-        if (room->isLowPriority()) {
-            return NeoChatRoomType::Deprioritized;
-        }
-        if (room->isDirectChat()) {
-            return NeoChatRoomType::Direct;
-        }
-        const RoomCreateEvent *creationEvent = room->creation();
-        if (!creationEvent) {
-            return NeoChatRoomType::Normal;
-        }
-        QJsonObject contentJson = creationEvent->contentJson();
-        QJsonObject::const_iterator typeIter = contentJson.find("type"_ls);
-        if (typeIter != contentJson.end()) {
-            if (typeIter.value().toString() == "m.space"_ls) {
-                return NeoChatRoomType::Space;
-            }
-        }
-        return NeoChatRoomType::Normal;
+        return NeoChatRoomType::typeForRoom(room);
     }
-    if (role == NotificationCountRole) {
-        return room->notificationCount();
+    if (role == ContextNotificationCountRole) {
+        return room->contextAwareNotificationCount();
     }
-    if (role == HighlightCountRole) {
-        return room->highlightCount();
+    if (role == HasHighlightNotificationsRole) {
+        return room->highlightCount() > 0 && room->contextAwareNotificationCount() > 0;
     }
     if (role == LastActiveTimeRole) {
         return room->lastActiveTime();
@@ -341,16 +241,11 @@ QVariant RoomListModel::data(const QModelIndex &index, int role) const
     if (role == CurrentRoomRole) {
         return QVariant::fromValue(room);
     }
-    if (role == CategoryVisibleRole) {
-        return m_categoryVisibility.value(data(index, CategoryRole).toInt(), true);
-    }
     if (role == SubtitleTextRole) {
         if (room->lastEvent() == nullptr || room->lastEventIsSpoiler()) {
             return QString();
         }
-        EventHandler eventHandler;
-        eventHandler.setRoom(room);
-        eventHandler.setEvent(room->lastEvent());
+        EventHandler eventHandler(room, room->lastEvent());
         return eventHandler.subtitleText();
     }
     if (role == AvatarImageRole) {
@@ -363,11 +258,14 @@ QVariant RoomListModel::data(const QModelIndex &index, int role) const
         return room->isSpace();
     }
     if (role == IsChildSpaceRole) {
-        return SpaceHierarchyCache::instance().isChildSpace(room->id());
+        return SpaceHierarchyCache::instance().isChild(room->id());
     }
     if (role == ReplacementIdRole) {
         return room->successorId();
     }
+    if (role == IsDirectChat) {
+        return room->isDirectChat();
+    }
 
     return QVariant();
 }
@@ -387,84 +285,24 @@ QHash<int, QByteArray> RoomListModel::roleNames() const
 {
     QHash<int, QByteArray> roles;
     roles[DisplayNameRole] = "displayName";
+    roles[EscapedDisplayNameRole] = "escapedDisplayName";
     roles[AvatarRole] = "avatar";
     roles[CanonicalAliasRole] = "canonicalAlias";
     roles[TopicRole] = "topic";
     roles[CategoryRole] = "category";
-    roles[NotificationCountRole] = "notificationCount";
-    roles[HighlightCountRole] = "highlightCount";
+    roles[ContextNotificationCountRole] = "contextNotificationCount";
+    roles[HasHighlightNotificationsRole] = "hasHighlightNotifications";
     roles[LastActiveTimeRole] = "lastActiveTime";
     roles[JoinStateRole] = "joinState";
     roles[CurrentRoomRole] = "currentRoom";
-    roles[CategoryVisibleRole] = "categoryVisible";
     roles[SubtitleTextRole] = "subtitleText";
     roles[IsSpaceRole] = "isSpace";
     roles[RoomIdRole] = "roomId";
     roles[IsChildSpaceRole] = "isChildSpace";
+    roles[IsDirectChat] = "isDirectChat";
     return roles;
 }
 
-QString RoomListModel::categoryName(int category)
-{
-    switch (category) {
-    case NeoChatRoomType::Invited:
-        return i18n("Invited");
-    case NeoChatRoomType::Favorite:
-        return i18n("Favorite");
-    case NeoChatRoomType::Direct:
-        return i18n("Direct Messages");
-    case NeoChatRoomType::Normal:
-        return i18n("Normal");
-    case NeoChatRoomType::Deprioritized:
-        return i18n("Low priority");
-    case NeoChatRoomType::Space:
-        return i18n("Spaces");
-    default:
-        return {};
-    }
-}
-
-QString RoomListModel::categoryIconName(int category)
-{
-    switch (category) {
-    case NeoChatRoomType::Invited:
-        return QStringLiteral("user-invisible");
-    case NeoChatRoomType::Favorite:
-        return QStringLiteral("favorite");
-    case NeoChatRoomType::Direct:
-        return QStringLiteral("dialog-messages");
-    case NeoChatRoomType::Normal:
-        return QStringLiteral("group");
-    case NeoChatRoomType::Deprioritized:
-        return QStringLiteral("object-order-lower");
-    case NeoChatRoomType::Space:
-        return QStringLiteral("group");
-    default:
-        return QStringLiteral("tools-report-bug");
-    }
-}
-
-void RoomListModel::setCategoryVisible(int category, bool visible)
-{
-    beginResetModel();
-    auto collapsedSections = NeoChatConfig::collapsedSections();
-    if (visible) {
-        collapsedSections.removeAll(category);
-    } else {
-        collapsedSections.push_back(category);
-    }
-    NeoChatConfig::setCollapsedSections(collapsedSections);
-    NeoChatConfig::self()->save();
-
-    m_categoryVisibility[category] = visible;
-    endResetModel();
-}
-
-bool RoomListModel::categoryVisible(int category) const
-{
-    return m_categoryVisibility.value(category, true);
-}
-
 NeoChatRoom *RoomListModel::roomByAliasOrId(const QString &aliasOrId)
 {
     for (const auto &room : std::as_const(m_rooms)) {

src/models/roomlistmodel.h

@@ -6,6 +6,8 @@
 #include <QAbstractListModel>
 #include <QQmlEngine>
 
+#include "enums/neochatroomtype.h"
+
 class NeoChatRoom;
 
 namespace Quotient
@@ -14,27 +16,6 @@ class Connection;
 class Room;
 }
 
-class NeoChatRoomType : public QObject
-{
-    Q_OBJECT
-    QML_ELEMENT
-    QML_UNCREATABLE("")
-
-public:
-    /**
-     * @brief Defines the room list categories a room can be assigned.
-     */
-    enum Types {
-        Invited = 1, /**< The user has been invited to the room. */
-        Favorite, /**< The room is set as a favourite. */
-        Direct, /**< The room is a direct chat. */
-        Normal, /**< The default category for a joined room. */
-        Deprioritized, /**< The room is set as low priority. */
-        Space, /**< The room is a space. */
-    };
-    Q_ENUM(Types)
-};
-
 /**
  * @class RoomListModel
  *
@@ -50,33 +31,29 @@ class RoomListModel : public QAbstractListModel
      */
     Q_PROPERTY(Quotient::Connection *connection READ connection WRITE setConnection NOTIFY connectionChanged)
 
-    /**
-     * @brief The total number of notifications for all the rooms.
-     */
-    Q_PROPERTY(int notificationCount READ notificationCount NOTIFY notificationCountChanged)
-
 public:
     /**
      * @brief Defines the model roles.
      */
     enum EventRoles {
         DisplayNameRole = Qt::DisplayRole, /**< The display name of the room. */
+        EscapedDisplayNameRole, /**< HTML-Escaped display name of the room. */
         AvatarRole, /**< The source URL for the room's avatar. */
         CanonicalAliasRole, /**< The room canonical alias. */
         TopicRole, /**< The room topic. */
         CategoryRole, /**< The room category, e.g favourite. */
-        NotificationCountRole, /**< The number of notifications in the room. */
-        HighlightCountRole, /**< The number of highlighted messages in the room. */
+        ContextNotificationCountRole, /**< The context aware notification count for the room. */
+        HasHighlightNotificationsRole, /**< Whether there are any highlight notifications. */
         LastActiveTimeRole, /**< The timestamp of the last event sent in the room. */
         JoinStateRole, /**< The local user's join state in the room. */
         CurrentRoomRole, /**< The room object for the room. */
-        CategoryVisibleRole, /**< If the room's category is visible. */
         SubtitleTextRole, /**< The text to show as the room subtitle. */
         AvatarImageRole, /**< The room avatar as an image. */
         RoomIdRole, /**< The room matrix ID. */
         IsSpaceRole, /**< Whether the room is a space. */
         IsChildSpaceRole, /**< Whether this space is a child of a different space. */
         ReplacementIdRole, /**< The room id of the room replacing this one, if any. */
+        IsDirectChat, /**< Whether this room is a direct chat. */
     };
     Q_ENUM(EventRoles)
 
@@ -86,9 +63,6 @@ public:
     [[nodiscard]] Quotient::Connection *connection() const;
     void setConnection(Quotient::Connection *connection);
 
-    [[nodiscard]] int notificationCount() const;
-    [[nodiscard]] int highlightCount() const;
-
     /**
      * @brief Get the given role value at the given index.
      *
@@ -115,30 +89,6 @@ public:
      */
     Q_INVOKABLE [[nodiscard]] NeoChatRoom *roomAt(int row) const;
 
-    /**
-     * @brief Return a string to represent the given room category.
-     */
-    Q_INVOKABLE [[nodiscard]] static QString categoryName(int category);
-
-    /**
-     * @brief Return a string with the name of the given room category icon.
-     */
-    Q_INVOKABLE [[nodiscard]] static QString categoryIconName(int category);
-
-    /**
-     * @brief Set whether a given category should be visible or not.
-     *
-     * @param category the NeoChatRoomType::Types value for the category (it's an
-     *                 int due to the pain of Q_INVOKABLES and cpp enums).
-     * @param visible true if the category should be visible, false if not.
-     */
-    Q_INVOKABLE void setCategoryVisible(int category, bool visible);
-
-    /**
-     * @brief Return whether a room category is set to be visible.
-     */
-    Q_INVOKABLE [[nodiscard]] bool categoryVisible(int category) const;
-
     /**
      * @brief Return the model row for the given room.
      */
@@ -157,25 +107,16 @@ private Q_SLOTS:
     void updateRoom(Quotient::Room *room, Quotient::Room *prev);
     void deleteRoom(Quotient::Room *room);
     void refresh(NeoChatRoom *room, const QList<int> &roles = {});
-    void refreshNotificationCount();
-    void refreshHighlightCount();
 
 private:
     Quotient::Connection *m_connection = nullptr;
     QList<NeoChatRoom *> m_rooms;
 
-    QMap<int, bool> m_categoryVisibility;
-
-    int m_notificationCount = 0;
-    int m_highlightCount = 0;
     QString m_activeSpaceId;
 
     void connectRoomSignals(NeoChatRoom *room);
 
 Q_SIGNALS:
     void connectionChanged();
-    void notificationCountChanged();
-    void highlightCountChanged();
-
     void roomAdded(NeoChatRoom *_t1);
 };

src/models/roomtreemodel.cpp

@@ -0,0 +1,465 @@
+// SPDX-FileCopyrightText: 2023 Tobias Fella <tobias.fella@kde.org>
+// SPDX-License-Identifier: LGPL-2.0-or-later
+
+#include "roomtreemodel.h"
+
+#include <Quotient/connection.h>
+#include <Quotient/room.h>
+
+#include "eventhandler.h"
+#include "neochatconnection.h"
+#include "neochatroomtype.h"
+#include "spacehierarchycache.h"
+
+using namespace Quotient;
+
+TreeItem::TreeItem(TreeData treeData, TreeItem *parent)
+    : m_treeData(treeData)
+    , m_parentItem(parent)
+{
+}
+
+void TreeItem::appendChild(std::unique_ptr<TreeItem> &&child)
+{
+    m_childItems.push_back(std::move(child));
+}
+
+bool TreeItem::insertChildren(int position, int count, TreeData treeData)
+{
+    if (position < 0 || position > qsizetype(m_childItems.size()))
+        return false;
+
+    for (int row = 0; row < count; ++row) {
+        m_childItems.insert(m_childItems.cbegin() + position, std::make_unique<TreeItem>(treeData, this));
+    }
+
+    return true;
+}
+
+bool TreeItem::removeChildren(int position, int count)
+{
+    if (position < 0 || position + count > qsizetype(m_childItems.size())) {
+        return false;
+    }
+
+    for (int row = 0; row < count; ++row) {
+        m_childItems.erase(m_childItems.cbegin() + position);
+        qWarning() << "removing" << position;
+    }
+
+    return true;
+}
+
+TreeItem *TreeItem::child(int row)
+{
+    return row >= 0 && row < childCount() ? m_childItems.at(row).get() : nullptr;
+}
+
+int TreeItem::childCount() const
+{
+    return int(m_childItems.size());
+}
+
+int TreeItem::row() const
+{
+    if (m_parentItem == nullptr) {
+        return 0;
+    }
+    const auto it = std::find_if(m_parentItem->m_childItems.cbegin(), m_parentItem->m_childItems.cend(), [this](const std::unique_ptr<TreeItem> &treeItem) {
+        return treeItem.get() == this;
+    });
+
+    if (it != m_parentItem->m_childItems.cend())
+        return std::distance(m_parentItem->m_childItems.cbegin(), it);
+    Q_ASSERT(false); // should not happen
+    return -1;
+}
+
+QVariant TreeItem::data(int role) const
+{
+    if (!m_parentItem) {
+        return {};
+    }
+
+    if (std::holds_alternative<NeoChatRoomType::Types>(m_treeData)) {
+        const auto row = this->row();
+        switch (role) {
+        case RoomTreeModel::IsCategoryRole:
+            return true;
+        case RoomTreeModel::DisplayNameRole:
+            return NeoChatRoomType::typeName(row);
+        case RoomTreeModel::DelegateTypeRole:
+            if (row == NeoChatRoomType::Search) {
+                return QStringLiteral("search");
+            }
+            if (row == NeoChatRoomType::AddDirect) {
+                return QStringLiteral("addDirect");
+            }
+            return QStringLiteral("section");
+        case RoomTreeModel::IconRole:
+            return NeoChatRoomType::typeIconName(row);
+        case RoomTreeModel::CategoryRole:
+            return row;
+        default:
+            return {};
+        }
+    }
+
+    const auto room = std::get<NeoChatRoom *>(m_treeData);
+
+    switch (role) {
+    case RoomTreeModel::IsCategoryRole:
+        return false;
+    case RoomTreeModel::DisplayNameRole:
+        return room->displayName();
+    case RoomTreeModel::AvatarRole:
+        return room->avatarMediaId();
+    case RoomTreeModel::CanonicalAliasRole:
+        return room->canonicalAlias();
+    case RoomTreeModel::TopicRole:
+        return room->topic();
+    case RoomTreeModel::CategoryRole:
+        return NeoChatRoomType::typeForRoom(room);
+    case RoomTreeModel::ContextNotificationCountRole:
+        return room->contextAwareNotificationCount();
+    case RoomTreeModel::HasHighlightNotificationsRole:
+        return room->highlightCount() > 0 && room->contextAwareNotificationCount() > 0;
+    case RoomTreeModel::LastActiveTimeRole:
+        return room->lastActiveTime();
+    case RoomTreeModel::JoinStateRole:
+        if (!room->successorId().isEmpty()) {
+            return QStringLiteral("upgraded");
+        }
+        return QVariant::fromValue(room->joinState());
+    case RoomTreeModel::CurrentRoomRole:
+        return QVariant::fromValue(room);
+    case RoomTreeModel::SubtitleTextRole: {
+        if (room->lastEvent() == nullptr || room->lastEventIsSpoiler()) {
+            return QString();
+        }
+        EventHandler eventHandler(room, room->lastEvent());
+        return eventHandler.subtitleText();
+    }
+    case RoomTreeModel::AvatarImageRole:
+        return room->avatar(128);
+    case RoomTreeModel::RoomIdRole:
+        return room->id();
+    case RoomTreeModel::IsSpaceRole:
+        return room->isSpace();
+    case RoomTreeModel::IsChildSpaceRole:
+        return SpaceHierarchyCache::instance().isChild(room->id());
+    case RoomTreeModel::ReplacementIdRole:
+        return room->successorId();
+    case RoomTreeModel::IsDirectChat:
+        return room->isDirectChat();
+    case RoomTreeModel::DelegateTypeRole:
+        return QStringLiteral("normal");
+    }
+
+    return {};
+}
+
+TreeItem *TreeItem::parentItem() const
+{
+    return m_parentItem;
+}
+
+std::optional<int> TreeItem::position(Quotient::Room *room) const
+{
+    Q_ASSERT_X(std::holds_alternative<NeoChatRoomType::Types>(m_treeData), __FUNCTION__, "containsRoom only works in category items");
+
+    int i = 0;
+    for (const auto &child : m_childItems) {
+        if (std::get<NeoChatRoom *>(child->treeData()) == room) {
+            return i;
+        }
+        i++;
+    }
+
+    return std::nullopt;
+}
+
+TreeItem::TreeData TreeItem::treeData() const
+{
+    return m_treeData;
+}
+
+RoomTreeModel::RoomTreeModel(QObject *parent)
+    : QAbstractItemModel(parent)
+{
+    initializeCategories();
+}
+
+void RoomTreeModel::initializeCategories()
+{
+    m_rootItem.reset(new TreeItem(nullptr, nullptr));
+    for (int i = 0; i < NeoChatRoomType::TypesCount; i++) {
+        m_rootItem->appendChild(std::make_unique<TreeItem>(NeoChatRoomType::Types(i), m_rootItem.get()));
+    }
+}
+
+TreeItem *RoomTreeModel::getItem(const QModelIndex &index) const
+{
+    if (index.isValid()) {
+        return static_cast<TreeItem *>(index.internalPointer());
+    }
+    return m_rootItem.get();
+}
+
+void RoomTreeModel::setConnection(NeoChatConnection *connection)
+{
+    if (m_connection == connection) {
+        return;
+    }
+    if (m_connection) {
+        disconnect(m_connection.get(), nullptr, this, nullptr);
+    }
+    m_connection = connection;
+    beginResetModel();
+    initializeCategories();
+    endResetModel();
+    connect(connection, &Connection::newRoom, this, &RoomTreeModel::newRoom);
+    connect(connection, &Connection::leftRoom, this, &RoomTreeModel::leftRoom);
+    connect(connection, &Connection::aboutToDeleteRoom, this, &RoomTreeModel::leftRoom);
+
+    for (const auto &room : m_connection->allRooms()) {
+        newRoom(dynamic_cast<NeoChatRoom *>(room));
+    }
+    Q_EMIT connectionChanged();
+}
+
+void RoomTreeModel::newRoom(Room *r)
+{
+    const auto room = dynamic_cast<NeoChatRoom *>(r);
+    const auto type = NeoChatRoomType::typeForRoom(room);
+    // Check if the room is already in the model.
+    const auto checkRoomIndex = indexForRoom(room);
+    if (checkRoomIndex.isValid()) {
+        // If the room is in the wrong type category for whatever reason, move it.
+        if (checkRoomIndex.parent().row() != type) {
+            moveRoom(room);
+        }
+        return;
+    }
+
+    auto categoryItem = m_rootItem->child(type);
+    beginInsertRows(index(type, 0), categoryItem->childCount(), categoryItem->childCount());
+    categoryItem->appendChild(std::make_unique<TreeItem>(room, categoryItem));
+    connectRoomSignals(room);
+    endInsertRows();
+    qWarning() << "adding room" << type << "new count" << categoryItem->childCount();
+}
+
+void RoomTreeModel::leftRoom(Room *r)
+{
+    const auto room = dynamic_cast<NeoChatRoom *>(r);
+
+    auto idx = indexForRoom(room);
+    if (!idx.isValid()) {
+        return;
+    }
+
+    auto parentItem = getItem(idx.parent());
+    Q_ASSERT(parentItem);
+
+    beginRemoveRows(idx.parent(), idx.row(), idx.row());
+    const bool success = parentItem->removeChildren(idx.row(), 1);
+    room->disconnect(this);
+    endRemoveRows();
+
+    if (success) {
+        qWarning() << "Unable to remove room";
+    }
+}
+
+void RoomTreeModel::moveRoom(Quotient::Room *room)
+{
+    // We can't assume the type as it has changed so currently the return of
+    // NeoChatRoomType::typeForRoom doesn't match it's current location. So find the room.
+    NeoChatRoomType::Types oldType;
+    int oldRow = -1;
+    for (int i = 0; i < NeoChatRoomType::TypesCount; i++) {
+        auto categoryItem = m_rootItem->child(i);
+        auto position = categoryItem->position(room);
+        if (position) {
+            oldType = static_cast<NeoChatRoomType::Types>(i);
+            oldRow = *position;
+        }
+    }
+
+    if (oldRow == -1) {
+        return;
+    }
+    auto neochatRoom = dynamic_cast<NeoChatRoom *>(room);
+    const auto newType = NeoChatRoomType::typeForRoom(neochatRoom);
+    if (newType == oldType) {
+        return;
+    }
+
+    const auto oldParent = index(oldType, 0, {});
+    auto oldParentItem = getItem(oldParent);
+    Q_ASSERT(oldParentItem);
+
+    const auto newParent = index(newType, 0, {});
+    auto newParentItem = getItem(newParent);
+    Q_ASSERT(newParentItem);
+
+    // HACK: We're doing this as a remove then insert because  moving doesn't work
+    // properly with DelegateChooser for whatever reason.
+
+    Q_ASSERT(checkIndex(index(oldRow, 0, oldParent), QAbstractItemModel::CheckIndexOption::IndexIsValid));
+    beginRemoveRows(oldParent, oldRow, oldRow);
+    const bool success = oldParentItem->removeChildren(oldRow, 1);
+    Q_ASSERT(success);
+    endRemoveRows();
+
+    beginInsertRows(newParent, newParentItem->childCount(), newParentItem->childCount());
+    newParentItem->appendChild(std::make_unique<TreeItem>(neochatRoom, newParentItem));
+    endInsertRows();
+
+    // Q_ASSERT(checkIndex(index(newParentItem->childCount() - 1, 0, newParent), QAbstractItemModel::CheckIndexOption::IndexIsValid));
+}
+
+void RoomTreeModel::connectRoomSignals(NeoChatRoom *room)
+{
+    connect(room, &Room::displaynameChanged, this, [this, room] {
+        refreshRoomRoles(room, {DisplayNameRole});
+    });
+    connect(room, &Room::unreadStatsChanged, this, [this, room] {
+        refreshRoomRoles(room, {ContextNotificationCountRole, HasHighlightNotificationsRole});
+    });
+    connect(room, &Room::avatarChanged, this, [this, room] {
+        refreshRoomRoles(room, {AvatarRole});
+    });
+    connect(room, &Room::tagsChanged, this, [this, room] {
+        moveRoom(room);
+    });
+    connect(room, &Room::joinStateChanged, this, [this, room] {
+        refreshRoomRoles(room);
+    });
+    connect(room, &Room::addedMessages, this, [this, room] {
+        refreshRoomRoles(room, {SubtitleTextRole, LastActiveTimeRole});
+    });
+    connect(room, &Room::pendingEventMerged, this, [this, room] {
+        refreshRoomRoles(room, {SubtitleTextRole});
+    });
+    connect(room, &NeoChatRoom::pushNotificationStateChanged, this, [this, room] {
+        refreshRoomRoles(room, {ContextNotificationCountRole, HasHighlightNotificationsRole});
+    });
+}
+
+void RoomTreeModel::refreshRoomRoles(NeoChatRoom *room, const QList<int> &roles)
+{
+    const auto idx = indexForRoom(room);
+    if (!idx.isValid()) {
+        qCritical() << "Room" << room->id() << "not found in the room list";
+        return;
+    }
+
+    Q_EMIT dataChanged(idx, idx, roles);
+}
+
+NeoChatConnection *RoomTreeModel::connection() const
+{
+    return m_connection;
+}
+
+int RoomTreeModel::columnCount(const QModelIndex &parent) const
+{
+    const TreeItem *parentItem = getItem(parent);
+    return parentItem ? 1 : 0;
+}
+
+int RoomTreeModel::rowCount(const QModelIndex &parent) const
+{
+    const TreeItem *parentItem = getItem(parent);
+    return parentItem ? parentItem->childCount() : 0;
+}
+
+QModelIndex RoomTreeModel::parent(const QModelIndex &index) const
+{
+    if (!index.isValid()) {
+        return {};
+    }
+
+    TreeItem *childItem = getItem(index);
+    Q_ASSERT(childItem);
+    TreeItem *parentItem = childItem->parentItem();
+
+    return parentItem != m_rootItem.get() ? createIndex(parentItem->row(), 0, parentItem) : QModelIndex{};
+}
+
+QModelIndex RoomTreeModel::index(int row, int column, const QModelIndex &parent) const
+{
+    if (parent.isValid() && parent.column() != 0) {
+        return {};
+    }
+
+    TreeItem *parentItem = getItem(parent);
+    Q_ASSERT(parentItem);
+
+    if (auto *childItem = parentItem->child(row)) {
+        return createIndex(row, column, childItem);
+    }
+    return {};
+}
+
+QHash<int, QByteArray> RoomTreeModel::roleNames() const
+{
+    QHash<int, QByteArray> roles;
+    roles[DisplayNameRole] = "displayName";
+    roles[AvatarRole] = "avatar";
+    roles[CanonicalAliasRole] = "canonicalAlias";
+    roles[TopicRole] = "topic";
+    roles[CategoryRole] = "category";
+    roles[ContextNotificationCountRole] = "contextNotificationCount";
+    roles[HasHighlightNotificationsRole] = "hasHighlightNotifications";
+    roles[LastActiveTimeRole] = "lastActiveTime";
+    roles[JoinStateRole] = "joinState";
+    roles[CurrentRoomRole] = "currentRoom";
+    roles[SubtitleTextRole] = "subtitleText";
+    roles[IsSpaceRole] = "isSpace";
+    roles[RoomIdRole] = "roomId";
+    roles[IsChildSpaceRole] = "isChildSpace";
+    roles[IsDirectChat] = "isDirectChat";
+    roles[DelegateTypeRole] = "delegateType";
+    roles[IconRole] = "icon";
+    roles[AttentionRole] = "attention";
+    roles[FavouriteRole] = "favourite";
+    return roles;
+}
+
+// TODO room type changes
+QVariant RoomTreeModel::data(const QModelIndex &index, int role) const
+{
+    if (!checkIndex(index, QAbstractItemModel::CheckIndexOption::IndexIsValid)) {
+        qWarning() << index.row() << rowCount(index.parent());
+        Q_ASSERT(false);
+        return {};
+    }
+
+    return getItem(index)->data(role);
+}
+
+QModelIndex RoomTreeModel::indexForRoom(NeoChatRoom *room) const
+{
+    if (room == nullptr) {
+        return {};
+    }
+
+    const auto roomType = NeoChatRoomType::typeForRoom(room);
+    const auto roomTypeItem = m_rootItem->child(roomType);
+
+    for (int i = 0, count = roomTypeItem->childCount(); i < count; i++) {
+        auto roomItem = roomTypeItem->child(i);
+        if (std::get<NeoChatRoom *>(roomItem->treeData()) == room) {
+            const auto parentIndex = index(roomType, 0, {});
+            const auto idx = index(i, 0, parentIndex);
+            return idx;
+        }
+    }
+
+    return {};
+}
+
+#include "moc_roomtreemodel.cpp"

src/models/roomtreemodel.h

@@ -0,0 +1,128 @@
+// SPDX-FileCopyrightText: 2023 Tobias Fella <tobias.fella@kde.org>
+// SPDX-License-Identifier: LGPL-2.0-or-later
+
+#pragma once
+
+#include <QAbstractItemModel>
+#include <QPointer>
+
+#include "enums/neochatroomtype.h"
+
+namespace Quotient
+{
+class Room;
+}
+
+class NeoChatConnection;
+class NeoChatRoom;
+class RoomTreeModelTest;
+
+class TreeItem
+{
+public:
+    using TreeData = std::variant<NeoChatRoom *, NeoChatRoomType::Types>;
+
+    explicit TreeItem(TreeData data, TreeItem *parentItem);
+
+    TreeItem *child(int row);
+    int childCount() const;
+    QVariant data(int role) const;
+    void appendChild(std::unique_ptr<TreeItem> &&child);
+    bool insertChildren(int position, int count, TreeData treeData);
+    TreeItem *parentItem() const;
+    bool removeChildren(int position, int count);
+    bool removeColumns(int position, int columns);
+    std::optional<int> position(Quotient::Room *room) const;
+    int row() const;
+    TreeData treeData() const;
+
+private:
+    std::vector<std::unique_ptr<TreeItem>> m_childItems;
+    TreeData m_treeData;
+    TreeItem *m_parentItem;
+};
+
+class RoomTreeModel : public QAbstractItemModel
+{
+    Q_OBJECT
+    QML_ELEMENT
+
+    Q_PROPERTY(NeoChatConnection *connection READ connection WRITE setConnection NOTIFY connectionChanged)
+
+public:
+    /**
+     * @brief Defines the model roles.
+     */
+    enum EventRoles {
+        DisplayNameRole = Qt::DisplayRole, /**< The display name of the room. */
+        AvatarRole, /**< The source URL for the room's avatar. */
+        CanonicalAliasRole, /**< The room canonical alias. */
+        TopicRole, /**< The room topic. */
+        CategoryRole, /**< The room category, e.g favourite. */
+        ContextNotificationCountRole, /**< The context aware notification count for the room. */
+        HasHighlightNotificationsRole, /**< Whether there are any highlight notifications. */
+        LastActiveTimeRole, /**< The timestamp of the last event sent in the room. */
+        JoinStateRole, /**< The local user's join state in the room. */
+        CurrentRoomRole, /**< The room object for the room. */
+        SubtitleTextRole, /**< The text to show as the room subtitle. */
+        AvatarImageRole, /**< The room avatar as an image. */
+        RoomIdRole, /**< The room matrix ID. */
+        IsSpaceRole, /**< Whether the room is a space. */
+        IsChildSpaceRole, /**< Whether this space is a child of a different space. */
+        ReplacementIdRole, /**< The room id of the room replacing this one, if any. */
+        IsDirectChat, /**< Whether this room is a direct chat. */
+        DelegateTypeRole,
+        IconRole,
+        AttentionRole, /**< Whether there are any notifications. */
+        FavouriteRole, /**< Whether the room is favourited. */
+        IsCategoryRole, /**< Whether the item in the model is a category */
+    };
+    Q_ENUM(EventRoles)
+    explicit RoomTreeModel(QObject *parent = nullptr);
+
+    void setConnection(NeoChatConnection *connection);
+    NeoChatConnection *connection() const;
+
+    /**
+     * @brief Get the given role value at the given index.
+     *
+     * @sa QAbstractItemModel::data
+     */
+    [[nodiscard]] QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
+
+    /**
+     * @brief Returns a mapping from Role enum values to role names.
+     *
+     * @sa EventRoles, QAbstractItemModel::roleNames()
+     */
+    [[nodiscard]] QHash<int, QByteArray> roleNames() const override;
+
+    QModelIndex parent(const QModelIndex &index) const override;
+    QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const override;
+
+    int columnCount(const QModelIndex &parent = QModelIndex()) const override;
+    int rowCount(const QModelIndex &parent = QModelIndex()) const override;
+
+    TreeItem *getItem(const QModelIndex &index) const;
+
+    Q_INVOKABLE QModelIndex indexForRoom(NeoChatRoom *room) const;
+
+Q_SIGNALS:
+    void connectionChanged();
+
+private:
+    QPointer<NeoChatConnection> m_connection = nullptr;
+
+    void initializeCategories();
+    void connectRoomSignals(NeoChatRoom *room);
+
+    void newRoom(Quotient::Room *room);
+    void leftRoom(Quotient::Room *room);
+    void moveRoom(Quotient::Room *room);
+
+    void refreshRoomRoles(NeoChatRoom *room, const QList<int> &roles = {});
+
+    std::unique_ptr<TreeItem> m_rootItem;
+
+    friend RoomTreeModelTest;
+};

src/models/searchmodel.cpp

@@ -3,8 +3,9 @@
 
 #include "searchmodel.h"
 
+#include "enums/delegatetype.h"
 #include "eventhandler.h"
-#include "messageeventmodel.h"
+#include "models/messagecontentmodel.h"
 #include "neochatroom.h"
 
 #include <QGuiApplication>
@@ -36,7 +37,7 @@ void SearchModel::setSearchText(const QString &searchText)
 
 void SearchModel::search()
 {
-    Q_ASSERT(m_connection);
+    Q_ASSERT(m_room);
     setSearching(true);
     if (m_job) {
         m_job->abandon();
@@ -62,7 +63,7 @@ void SearchModel::search()
 
     };
 
-    auto job = m_connection->callApi<SearchJob>(SearchJob::Categories{criteria});
+    auto job = m_room->connection()->callApi<SearchJob>(SearchJob::Categories{criteria});
     m_job = job;
     connect(job, &BaseJob::finished, this, [this, job] {
         beginResetModel();
@@ -74,29 +75,14 @@ void SearchModel::search()
     });
 }
 
-Connection *SearchModel::connection() const
-{
-    return m_connection;
-}
-
-void SearchModel::setConnection(Connection *connection)
-{
-    m_connection = connection;
-    Q_EMIT connectionChanged();
-}
-
 QVariant SearchModel::data(const QModelIndex &index, int role) const
 {
     auto row = index.row();
     const auto &event = *m_result->results[row].result;
 
-    EventHandler eventHandler;
-    eventHandler.setRoom(m_room);
-    eventHandler.setEvent(&event);
+    EventHandler eventHandler(m_room, &event);
 
     switch (role) {
-    case DisplayRole:
-        return eventHandler.getRichBody();
     case ShowAuthorRole:
         return true;
     case AuthorRole:
@@ -116,26 +102,27 @@ QVariant SearchModel::data(const QModelIndex &index, int role) const
         return false;
     case ShowReadMarkersRole:
         return false;
-    case IsReplyRole:
-        return eventHandler.hasReply();
-    case ReplyIdRole:
-        return eventHandler.hasReply();
-    case ReplyAuthorRole:
-        return eventHandler.getReplyAuthor();
-    case ReplyDelegateTypeRole:
-        return eventHandler.getReplyDelegateType();
-    case ReplyDisplayRole:
-        return eventHandler.getReplyRichBody();
-    case ReplyMediaInfoRole:
-        return eventHandler.getReplyMediaInfo();
     case IsPendingRole:
         return false;
-    case ShowLinkPreviewRole:
-        return false;
     case HighlightRole:
         return eventHandler.isHighlighted();
     case EventIdRole:
         return eventHandler.getId();
+    case IsThreadedRole:
+        return eventHandler.isThreaded();
+    case ThreadRootRole:
+        return eventHandler.threadRoot();
+    case ContentModelRole: {
+        if (!event.isStateEvent()) {
+            return QVariant::fromValue<MessageContentModel *>(new MessageContentModel(&event, m_room));
+        }
+        if (event.isStateEvent()) {
+            if (event.matrixType() == QStringLiteral("org.matrix.msc3672.beacon_info")) {
+                return QVariant::fromValue<MessageContentModel *>(new MessageContentModel(&event, m_room));
+            }
+        }
+        return {};
+    }
     }
     return DelegateType::Message;
 }
@@ -153,7 +140,6 @@ QHash<int, QByteArray> SearchModel::roleNames() const
 {
     return {
         {DelegateTypeRole, "delegateType"},
-        {DisplayRole, "display"},
         {AuthorRole, "author"},
         {ShowSectionRole, "showSection"},
         {SectionRole, "section"},
@@ -164,23 +150,15 @@ QHash<int, QByteArray> SearchModel::roleNames() const
         {ExcessReadMarkersRole, "excessReadMarkers"},
         {HighlightRole, "isHighlighted"},
         {ReadMarkersString, "readMarkersString"},
-        {PlainTextRole, "plainText"},
         {VerifiedRole, "verified"},
-        {ProgressInfoRole, "progressInfo"},
         {ShowReactionsRole, "showReactions"},
-        {IsReplyRole, "isReply"},
-        {ReplyAuthorRole, "replyAuthor"},
-        {ReplyIdRole, "replyId"},
-        {ReplyDelegateTypeRole, "replyDelegateType"},
-        {ReplyDisplayRole, "replyDisplay"},
-        {ReplyMediaInfoRole, "replyMediaInfo"},
         {ReactionRole, "reaction"},
         {ReadMarkersRole, "readMarkers"},
         {IsPendingRole, "isPending"},
         {ShowReadMarkersRole, "showReadMarkers"},
-        {MimeTypeRole, "mimeType"},
-        {ShowLinkPreviewRole, "showLinkPreview"},
-        {LinkPreviewRole, "linkPreview"},
+        {IsThreadedRole, "isThreaded"},
+        {ThreadRootRole, "threadRoot"},
+        {ContentModelRole, "contentModel"},
     };
 }
 
@@ -196,19 +174,6 @@ void SearchModel::setRoom(NeoChatRoom *room)
     }
     m_room = room;
     Q_EMIT roomChanged();
-
-    connect(m_room, &NeoChatRoom::replyLoaded, this, [this](const auto &eventId, const auto &replyId) {
-        Q_UNUSED(replyId);
-        const auto &results = m_result->results;
-        auto it = std::find_if(results.begin(), results.end(), [eventId](const auto &event) {
-            return event.result->id() == eventId;
-        });
-        if (it == results.end()) {
-            return;
-        }
-        auto row = it - results.begin();
-        Q_EMIT dataChanged(index(row, 0), index(row, 0), {ReplyDelegateTypeRole, ReplyDisplayRole, ReplyMediaInfoRole, ReplyAuthorRole});
-    });
 }
 
 bool SearchModel::searching() const

src/models/searchmodel.h

@@ -31,11 +31,6 @@ class SearchModel : public QAbstractListModel
      */
     Q_PROPERTY(QString searchText READ searchText WRITE setSearchText NOTIFY searchTextChanged)
 
-    /**
-     * @brief The current connection that the model is using to search for messages.
-     */
-    Q_PROPERTY(Quotient::Connection *connection READ connection WRITE setConnection NOTIFY connectionChanged)
-
     /**
      * @brief The current room that the search is being done from.
      */
@@ -56,8 +51,7 @@ public:
      * since the same delegates are used.
      */
     enum Roles {
-        DisplayRole = Qt::DisplayRole,
-        DelegateTypeRole,
+        DelegateTypeRole = Qt::DisplayRole + 1,
         ShowAuthorRole,
         AuthorRole,
         ShowSectionRole,
@@ -68,23 +62,15 @@ public:
         ExcessReadMarkersRole,
         HighlightRole,
         ReadMarkersString,
-        PlainTextRole,
         VerifiedRole,
-        ProgressInfoRole,
         ShowReactionsRole,
-        IsReplyRole,
-        ReplyAuthorRole,
-        ReplyIdRole,
-        ReplyDelegateTypeRole,
-        ReplyDisplayRole,
-        ReplyMediaInfoRole,
         ReactionRole,
         ReadMarkersRole,
         IsPendingRole,
         ShowReadMarkersRole,
-        MimeTypeRole,
-        ShowLinkPreviewRole,
-        LinkPreviewRole,
+        IsThreadedRole,
+        ThreadRootRole,
+        ContentModelRole,
     };
     Q_ENUM(Roles)
     explicit SearchModel(QObject *parent = nullptr);
@@ -92,9 +78,6 @@ public:
     QString searchText() const;
     void setSearchText(const QString &searchText);
 
-    Quotient::Connection *connection() const;
-    void setConnection(Quotient::Connection *connection);
-
     NeoChatRoom *room() const;
     void setRoom(NeoChatRoom *room);
 
@@ -128,7 +111,6 @@ public:
 
 Q_SIGNALS:
     void searchTextChanged();
-    void connectionChanged();
     void roomChanged();
     void searchingChanged();
 
@@ -139,7 +121,6 @@ private:
     void setSearching(bool searching);
 
     QString m_searchText;
-    Quotient::Connection *m_connection = nullptr;
     NeoChatRoom *m_room = nullptr;
     Quotient::Omittable<Quotient::SearchJob::ResultRoomEvents> m_result = Quotient::none;
     Quotient::SearchJob *m_job = nullptr;

src/models/sortfilterroomlistmodel.cpp

@@ -3,9 +3,7 @@
 
 #include "sortfilterroomlistmodel.h"
 
-#include "neochatconnection.h"
 #include "roomlistmodel.h"
-#include "spacehierarchycache.h"
 
 SortFilterRoomListModel::SortFilterRoomListModel(QObject *parent)
     : QSortFilterProxyModel(parent)
@@ -21,53 +19,6 @@ SortFilterRoomListModel::SortFilterRoomListModel(QObject *parent)
     });
 }
 
-void SortFilterRoomListModel::setRoomSortOrder(SortFilterRoomListModel::RoomSortOrder sortOrder)
-{
-    m_sortOrder = sortOrder;
-    Q_EMIT roomSortOrderChanged();
-    if (sortOrder == SortFilterRoomListModel::Alphabetical) {
-        setSortRole(RoomListModel::DisplayNameRole);
-    } else if (sortOrder == SortFilterRoomListModel::LastActivity) {
-        setSortRole(RoomListModel::LastActiveTimeRole);
-    }
-    invalidate();
-}
-
-SortFilterRoomListModel::RoomSortOrder SortFilterRoomListModel::roomSortOrder() const
-{
-    return m_sortOrder;
-}
-
-bool SortFilterRoomListModel::lessThan(const QModelIndex &source_left, const QModelIndex &source_right) const
-{
-    if (m_sortOrder == SortFilterRoomListModel::LastActivity) {
-        // display favorite rooms always on top
-        const auto categoryLeft = static_cast<NeoChatRoomType::Types>(sourceModel()->data(source_left, RoomListModel::CategoryRole).toInt());
-        const auto categoryRight = static_cast<NeoChatRoomType::Types>(sourceModel()->data(source_right, RoomListModel::CategoryRole).toInt());
-
-        if (categoryLeft == NeoChatRoomType::Types::Favorite && categoryRight == NeoChatRoomType::Types::Favorite) {
-            return sourceModel()->data(source_left, RoomListModel::LastActiveTimeRole).toDateTime()
-                > sourceModel()->data(source_right, RoomListModel::LastActiveTimeRole).toDateTime();
-        }
-        if (categoryLeft == NeoChatRoomType::Types::Favorite) {
-            return true;
-        } else if (categoryRight == NeoChatRoomType::Types::Favorite) {
-            return false;
-        }
-
-        return sourceModel()->data(source_left, RoomListModel::LastActiveTimeRole).toDateTime()
-            > sourceModel()->data(source_right, RoomListModel::LastActiveTimeRole).toDateTime();
-    }
-    if (m_sortOrder != SortFilterRoomListModel::Categories) {
-        return QSortFilterProxyModel::lessThan(source_left, source_right);
-    }
-    if (sourceModel()->data(source_left, RoomListModel::CategoryRole) != sourceModel()->data(source_right, RoomListModel::CategoryRole)) {
-        return sourceModel()->data(source_left, RoomListModel::CategoryRole).toInt() < sourceModel()->data(source_right, RoomListModel::CategoryRole).toInt();
-    }
-    return sourceModel()->data(source_left, RoomListModel::LastActiveTimeRole).toDateTime()
-        > sourceModel()->data(source_right, RoomListModel::LastActiveTimeRole).toDateTime();
-}
-
 void SortFilterRoomListModel::setFilterText(const QString &text)
 {
     m_filterText = text;
@@ -81,39 +32,15 @@ QString SortFilterRoomListModel::filterText() const
 
 bool SortFilterRoomListModel::filterAcceptsRow(int source_row, const QModelIndex &source_parent) const
 {
-    Q_UNUSED(source_parent);
+    QModelIndex index = sourceModel()->index(source_row, 0, source_parent);
 
-    if (sourceModel()->data(sourceModel()->index(source_row, 0), RoomListModel::JoinStateRole).toString() == QStringLiteral("upgraded")
-        && dynamic_cast<RoomListModel *>(sourceModel())
-               ->connection()
-               ->room(sourceModel()->data(sourceModel()->index(source_row, 0), RoomListModel::ReplacementIdRole).toString())) {
+    if (sourceModel()->data(index, RoomListModel::JoinStateRole).toString() == QStringLiteral("upgraded")
+        && dynamic_cast<RoomListModel *>(sourceModel())->connection()->room(sourceModel()->data(index, RoomListModel::ReplacementIdRole).toString())) {
         return false;
     }
 
-    bool acceptRoom =
-        sourceModel()->data(sourceModel()->index(source_row, 0), RoomListModel::DisplayNameRole).toString().contains(m_filterText, Qt::CaseInsensitive)
-        && sourceModel()->data(sourceModel()->index(source_row, 0), RoomListModel::IsSpaceRole).toBool() == false;
-
-    if (m_activeSpaceId.isEmpty()) {
-        return acceptRoom;
-    } else {
-        const auto &rooms = SpaceHierarchyCache::instance().getRoomListForSpace(m_activeSpaceId, false);
-        return std::find(rooms.begin(), rooms.end(), sourceModel()->data(sourceModel()->index(source_row, 0), RoomListModel::RoomIdRole).toString())
-            != rooms.end()
-            && acceptRoom;
-    }
-}
-
-QString SortFilterRoomListModel::activeSpaceId() const
-{
-    return m_activeSpaceId;
-}
-
-void SortFilterRoomListModel::setActiveSpaceId(const QString &spaceId)
-{
-    m_activeSpaceId = spaceId;
-    Q_EMIT activeSpaceIdChanged();
-    invalidate();
+    return sourceModel()->data(index, RoomListModel::DisplayNameRole).toString().contains(m_filterText, Qt::CaseInsensitive)
+        && sourceModel()->data(index, RoomListModel::IsSpaceRole).toBool() == false;
 }
 
 #include "moc_sortfilterroomlistmodel.cpp"

src/models/sortfilterroomlistmodel.h

@@ -30,50 +30,18 @@ class SortFilterRoomListModel : public QSortFilterProxyModel
     Q_OBJECT
     QML_ELEMENT
 
-    /**
-     * @brief The order by which the rooms will be sorted.
-     *
-     * @sa RoomSortOrder
-     */
-    Q_PROPERTY(RoomSortOrder roomSortOrder READ roomSortOrder WRITE setRoomSortOrder NOTIFY roomSortOrderChanged)
-
     /**
      * @brief The text to use to filter room names.
      */
     Q_PROPERTY(QString filterText READ filterText READ filterText WRITE setFilterText NOTIFY filterTextChanged)
 
-    /**
-     * @brief Set the ID of the space to show rooms for.
-     */
-    Q_PROPERTY(QString activeSpaceId READ activeSpaceId WRITE setActiveSpaceId NOTIFY activeSpaceIdChanged)
-
 public:
-    enum RoomSortOrder {
-        Alphabetical,
-        LastActivity,
-        Categories,
-    };
-    Q_ENUM(RoomSortOrder)
-
     explicit SortFilterRoomListModel(QObject *parent = nullptr);
 
-    void setRoomSortOrder(RoomSortOrder sortOrder);
-    [[nodiscard]] RoomSortOrder roomSortOrder() const;
-
     void setFilterText(const QString &text);
     [[nodiscard]] QString filterText() const;
 
-    QString activeSpaceId() const;
-    void setActiveSpaceId(const QString &spaceId);
-
 protected:
-    /**
-     * @brief Returns true if the value of source_left is less than source_right.
-     *
-     * @sa QSortFilterProxyModel::lessThan
-     */
-    [[nodiscard]] bool lessThan(const QModelIndex &source_left, const QModelIndex &source_right) const override;
-
     /**
      * @brief Whether a row should be shown out or not.
      *
@@ -82,12 +50,8 @@ protected:
     [[nodiscard]] bool filterAcceptsRow(int source_row, const QModelIndex &source_parent) const override;
 
 Q_SIGNALS:
-    void roomSortOrderChanged();
     void filterTextChanged();
-    void activeSpaceIdChanged();
 
 private:
-    RoomSortOrder m_sortOrder = Categories;
     QString m_filterText;
-    QString m_activeSpaceId;
 };

src/models/sortfilterroomtreemodel.cpp

@@ -0,0 +1,202 @@
+// SPDX-FileCopyrightText: 2020 Tobias Fella <tobias.fella@kde.org>
+// SPDX-FileCopyrightText: 2024 James Graham <james.h.graham@protonmail.com>
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "sortfilterroomtreemodel.h"
+
+#include "neochatconfig.h"
+#include "neochatconnection.h"
+#include "neochatroomtype.h"
+#include "roomtreemodel.h"
+#include "spacehierarchycache.h"
+
+SortFilterRoomTreeModel::SortFilterRoomTreeModel(QObject *parent)
+    : QSortFilterProxyModel(parent)
+{
+    setRoomSortOrder(static_cast<RoomSortOrder>(NeoChatConfig::sortOrder()));
+    connect(NeoChatConfig::self(), &NeoChatConfig::SortOrderChanged, this, [this]() {
+        setRoomSortOrder(static_cast<RoomSortOrder>(NeoChatConfig::sortOrder()));
+        invalidateFilter();
+    });
+
+    setRecursiveFilteringEnabled(true);
+    sort(0);
+    invalidateFilter();
+    connect(this, &SortFilterRoomTreeModel::filterTextChanged, this, &SortFilterRoomTreeModel::invalidateFilter);
+    connect(this, &SortFilterRoomTreeModel::sourceModelChanged, this, [this]() {
+        sourceModel()->disconnect(this);
+        connect(sourceModel(), &QAbstractItemModel::rowsInserted, this, &SortFilterRoomTreeModel::invalidateFilter);
+        connect(sourceModel(), &QAbstractItemModel::rowsRemoved, this, &SortFilterRoomTreeModel::invalidateFilter);
+    });
+
+    connect(NeoChatConfig::self(), &NeoChatConfig::CollapsedChanged, this, &SortFilterRoomTreeModel::invalidateFilter);
+}
+
+void SortFilterRoomTreeModel::setRoomSortOrder(SortFilterRoomTreeModel::RoomSortOrder sortOrder)
+{
+    m_sortOrder = sortOrder;
+    if (sortOrder == SortFilterRoomTreeModel::Alphabetical) {
+        setSortRole(RoomTreeModel::DisplayNameRole);
+    } else if (sortOrder == SortFilterRoomTreeModel::Activity) {
+        setSortRole(RoomTreeModel::LastActiveTimeRole);
+    }
+    invalidate();
+}
+
+static const QVector<RoomTreeModel::EventRoles> alphabeticalSortPriorities{
+    // Does exactly what it says on the tin.
+    RoomTreeModel::DisplayNameRole,
+};
+
+static const QVector<RoomTreeModel::EventRoles> activitySortPriorities{
+    // Anything useful at the top, quiet rooms at the bottom
+    RoomTreeModel::AttentionRole,
+    // Organize by highlights, notifications, unread favorites, all other unread, in that order
+    RoomTreeModel::HasHighlightNotificationsRole,
+    RoomTreeModel::ContextNotificationCountRole,
+    RoomTreeModel::FavouriteRole,
+    // Finally sort by last activity time
+    RoomTreeModel::LastActiveTimeRole,
+};
+
+bool SortFilterRoomTreeModel::roleCmp(const QVariant &sortLeft, const QVariant &sortRight) const
+{
+    switch (sortLeft.typeId()) {
+    case QMetaType::Bool:
+        return (sortLeft == sortRight) ? false : sortLeft.toBool();
+    case QMetaType::QString:
+        return sortLeft.toString() < sortRight.toString();
+    case QMetaType::Int:
+        return sortLeft.toInt() > sortRight.toInt();
+    case QMetaType::QDateTime:
+        return sortLeft.toDateTime() > sortRight.toDateTime();
+    default:
+        return false;
+    }
+}
+
+bool SortFilterRoomTreeModel::prioritiesCmp(const QVector<RoomTreeModel::EventRoles> &priorities,
+                                            const QModelIndex &source_left,
+                                            const QModelIndex &source_right) const
+{
+    for (RoomTreeModel::EventRoles sortRole : priorities) {
+        const auto sortLeft = sourceModel()->data(source_left, sortRole);
+        const auto sortRight = sourceModel()->data(source_right, sortRole);
+        if (sortLeft != sortRight) {
+            return roleCmp(sortLeft, sortRight);
+        }
+    }
+    return QSortFilterProxyModel::lessThan(source_left, source_right);
+}
+
+bool SortFilterRoomTreeModel::lessThan(const QModelIndex &source_left, const QModelIndex &source_right) const
+{
+    // Don't sort the top level categories.
+    if (!source_left.parent().isValid() || !source_right.parent().isValid()) {
+        return false;
+    }
+
+    switch (m_sortOrder) {
+    case SortFilterRoomTreeModel::Alphabetical:
+        return prioritiesCmp(alphabeticalSortPriorities, source_left, source_right);
+    case SortFilterRoomTreeModel::Activity:
+        return prioritiesCmp(activitySortPriorities, source_left, source_right);
+    }
+
+    return QSortFilterProxyModel::lessThan(source_left, source_right);
+}
+
+void SortFilterRoomTreeModel::setFilterText(const QString &text)
+{
+    m_filterText = text;
+    Q_EMIT filterTextChanged();
+}
+
+QString SortFilterRoomTreeModel::filterText() const
+{
+    return m_filterText;
+}
+
+bool SortFilterRoomTreeModel::filterAcceptsRow(int source_row, const QModelIndex &source_parent) const
+{
+    // root node
+    if (!source_parent.isValid()) {
+        return true;
+    }
+
+    const QModelIndex index = sourceModel()->index(source_row, 0, source_parent);
+    if (!index.isValid()) {
+        qWarning() << source_row << source_parent << sourceModel()->rowCount(source_parent);
+        Q_ASSERT(false);
+        return true;
+    }
+
+    if (sourceModel()->data(index, RoomTreeModel::IsCategoryRole).toBool()) {
+        if (sourceModel()->data(index, RoomTreeModel::CategoryRole).toInt() == NeoChatRoomType::Search && NeoChatConfig::collapsed()) {
+            return true;
+        }
+        if (sourceModel()->data(index, RoomTreeModel::CategoryRole).toInt() == NeoChatRoomType::AddDirect && m_mode == DirectChats) {
+            return true;
+        }
+        return false;
+    }
+
+    bool acceptRoom = sourceModel()->data(index, RoomTreeModel::DisplayNameRole).toString().contains(m_filterText, Qt::CaseInsensitive)
+        && sourceModel()->data(index, RoomTreeModel::IsSpaceRole).toBool() == false;
+
+    bool isDirectChat = sourceModel()->data(index, RoomTreeModel::IsDirectChat).toBool();
+    // In `show direct chats` mode we only care about whether or not it's a direct chat or if the filter string matches.'
+    if (m_mode == DirectChats) {
+        return isDirectChat && acceptRoom;
+    }
+
+    // When not in `show direct chats` mode, filter them out.
+    if (isDirectChat && m_mode == Rooms) {
+        return false;
+    }
+
+    if (sourceModel()->data(index, RoomTreeModel::JoinStateRole).toString() == QStringLiteral("upgraded")
+        && dynamic_cast<RoomTreeModel *>(sourceModel())->connection()->room(sourceModel()->data(index, RoomTreeModel::ReplacementIdRole).toString())) {
+        return false;
+    }
+
+    if (m_activeSpaceId.isEmpty()) {
+        if (!SpaceHierarchyCache::instance().isChild(sourceModel()->data(index, RoomTreeModel::RoomIdRole).toString())) {
+            return acceptRoom;
+        }
+        return false;
+    } else {
+        const auto &rooms = SpaceHierarchyCache::instance().getRoomListForSpace(m_activeSpaceId, false);
+        return std::find(rooms.begin(), rooms.end(), sourceModel()->data(index, RoomTreeModel::RoomIdRole).toString()) != rooms.end() && acceptRoom;
+    }
+}
+
+QString SortFilterRoomTreeModel::activeSpaceId() const
+{
+    return m_activeSpaceId;
+}
+
+void SortFilterRoomTreeModel::setActiveSpaceId(const QString &spaceId)
+{
+    m_activeSpaceId = spaceId;
+    Q_EMIT activeSpaceIdChanged();
+    invalidate();
+}
+
+SortFilterRoomTreeModel::Mode SortFilterRoomTreeModel::mode() const
+{
+    return m_mode;
+}
+
+void SortFilterRoomTreeModel::setMode(SortFilterRoomTreeModel::Mode mode)
+{
+    if (m_mode == mode) {
+        return;
+    }
+
+    m_mode = mode;
+    Q_EMIT modeChanged();
+    invalidate();
+}
+
+#include "moc_sortfilterroomtreemodel.cpp"

src/models/sortfilterroomtreemodel.h

@@ -0,0 +1,106 @@
+// SPDX-FileCopyrightText: 2020 Tobias Fella <tobias.fella@kde.org>
+// SPDX-FileCopyrightText: 2024 James Graham <james.h.graham@protonmail.com>
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include <QQmlEngine>
+#include <QSortFilterProxyModel>
+
+#include "models/roomtreemodel.h"
+
+/**
+ * @class SortFilterRoomTreeModel
+ *
+ * This model sorts and filters the room list.
+ *
+ * There are numerous room sort orders available:
+ *  - Categories - sort rooms by their NeoChatRoomType and then by last activty within
+ *                 each category.
+ *  - LastActivity - sort rooms by the last active time in the room.
+ *  - Alphabetical - sort the rooms alphabetically by room name.
+ *
+ * The model can be given a filter string that will only show rooms who's name includes
+ * the text.
+ *
+ * The model can also be given an active space ID and will only show rooms within
+ * that space.
+ *
+ * All space rooms and upgraded rooms will also be filtered out.
+ */
+class SortFilterRoomTreeModel : public QSortFilterProxyModel
+{
+    Q_OBJECT
+    QML_ELEMENT
+
+    /**
+     * @brief The text to use to filter room names.
+     */
+    Q_PROPERTY(QString filterText READ filterText READ filterText WRITE setFilterText NOTIFY filterTextChanged)
+
+    /**
+     * @brief Set the ID of the space to show rooms for.
+     */
+    Q_PROPERTY(QString activeSpaceId READ activeSpaceId WRITE setActiveSpaceId NOTIFY activeSpaceIdChanged)
+
+    /**
+     * @brief Whether only direct chats should be shown.
+     */
+    Q_PROPERTY(Mode mode READ mode WRITE setMode NOTIFY modeChanged)
+
+public:
+    enum RoomSortOrder {
+        Alphabetical,
+        Activity,
+    };
+    Q_ENUM(RoomSortOrder)
+
+    enum Mode {
+        Rooms,
+        DirectChats,
+        All,
+    };
+    Q_ENUM(Mode)
+
+    explicit SortFilterRoomTreeModel(QObject *parent = nullptr);
+
+    void setRoomSortOrder(RoomSortOrder sortOrder);
+
+    void setFilterText(const QString &text);
+    [[nodiscard]] QString filterText() const;
+
+    QString activeSpaceId() const;
+    void setActiveSpaceId(const QString &spaceId);
+
+    Mode mode() const;
+    void setMode(Mode mode);
+
+protected:
+    /**
+     * @brief Returns true if the value of source_left is less than source_right.
+     *
+     * @sa QSortFilterProxyModel::lessThan
+     */
+    [[nodiscard]] bool lessThan(const QModelIndex &source_left, const QModelIndex &source_right) const override;
+
+    /**
+     * @brief Whether a row should be shown out or not.
+     *
+     * @sa QSortFilterProxyModel::filterAcceptsRow
+     */
+    [[nodiscard]] bool filterAcceptsRow(int source_row, const QModelIndex &source_parent) const override;
+
+Q_SIGNALS:
+    void filterTextChanged();
+    void activeSpaceIdChanged();
+    void modeChanged();
+
+private:
+    RoomSortOrder m_sortOrder = Activity;
+    Mode m_mode = All;
+    QString m_filterText;
+    QString m_activeSpaceId;
+
+    bool roleCmp(const QVariant &left, const QVariant &right) const;
+    bool prioritiesCmp(const QVector<RoomTreeModel::EventRoles> &priorities, const QModelIndex &left, const QModelIndex &right) const;
+};