GIT_SILENT Update Appstream for new release

We're adding the "join" action so that rooms are joined.
libQuotient doesn't like it when we the action is join and the uri is for a user.

BUG: 483744

.craft.ini

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

.flatpak-manifest.json

@@ -2,7 +2,7 @@
     "id": "org.kde.neochat",
     "branch": "master",
     "runtime": "org.kde.Platform",
-    "runtime-version": "6.7",
+    "runtime-version": "6.6",
     "sdk": "org.kde.Sdk",
     "command": "neochat",
     "tags": [
@@ -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", "commit": "34d311219e8b7209746a98b3a29b91ded05ff936" } ]
+            "sources": [ { "type": "git", "url": "https://invent.kde.org/libraries/kirigami-addons.git" } ]
         },
         {
             "name": "kquickimageeditor",

.kde-ci.yml

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

.reuse/dep5

@@ -49,7 +49,3 @@ License: CC0-1.0
 Files: appiumtests/data/*
 Copyright: 2023 Tobias Fella <tobias.fella@kde.org>
 License: CC0-1.0
-
-Files: src/purpose/purposeplugin.json
-Copyright: 2023 Tobias Fella <tobias.fella@kde.org>
-License: BSD-2-Clause

CMakeLists.txt

@@ -8,13 +8,13 @@ cmake_minimum_required(VERSION 3.16)
 
 # KDE Applications version, managed by release script.
 set(RELEASE_SERVICE_VERSION_MAJOR "24")
-set(RELEASE_SERVICE_VERSION_MINOR "04")
-set(RELEASE_SERVICE_VERSION_MICRO "70")
+set(RELEASE_SERVICE_VERSION_MINOR "02")
+set(RELEASE_SERVICE_VERSION_MICRO "2")
 set(RELEASE_SERVICE_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE_VERSION_MINOR}.${RELEASE_SERVICE_VERSION_MICRO}")
 
 project(NeoChat VERSION ${RELEASE_SERVICE_VERSION})
 
-set(KF_MIN_VERSION "6.0")
+set(KF_MIN_VERSION "5.240.0")
 set(QT_MIN_VERSION "6.5")
 
 find_package(ECM ${KF_MIN_VERSION} REQUIRED NO_MODULE)
@@ -24,7 +24,7 @@ set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake)
 set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
-set(KDE_COMPILERSETTINGS_LEVEL 6.0)
+set(KDE_COMPILERSETTINGS_LEVEL 5.105)
 
 include(FeatureSummary)
 include(ECMSetupVersion)
@@ -58,9 +58,6 @@ 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
@@ -72,10 +69,6 @@ set_package_properties(KF6Kirigami PROPERTIES
 )
 find_package(KF6KirigamiAddons 0.7.2 REQUIRED)
 
-if (UNIX AND NOT APPLE AND NOT ANDROID AND NOT NEOCHAT_FLATPAK AND NOT NEOCHAT_APPIMAGE)
-    find_package(KF6 ${KF_MIN_VERSION} REQUIRED COMPONENTS Purpose)
-endif ()
-
 if(ANDROID)
     find_package(OpenSSL)
     set_package_properties(OpenSSL PROPERTIES
@@ -85,7 +78,6 @@ if(ANDROID)
 else()
     find_package(Qt6 ${QT_MIN_VERSION} COMPONENTS Widgets)
     find_package(KF6 ${KF_MIN_VERSION} REQUIRED COMPONENTS QQC2DesktopStyle KIO WindowSystem StatusNotifierItem)
-    find_package(KF6SyntaxHighlighting ${KF_MIN_VERSION} REQUIRED)
     set_package_properties(KF6QQC2DesktopStyle PROPERTIES
         TYPE RUNTIME
     )

autotests/eventhandlertest.cpp

@@ -12,6 +12,7 @@
 #include <Quotient/quotient_common.h>
 #include <Quotient/syncdata.h>
 
+#include "enums/delegatetype.h"
 #include "linkpreviewer.h"
 #include "models/reactionmodel.h"
 #include "neochatroom.h"
@@ -28,14 +29,19 @@ class EventHandlerTest : public QObject
 private:
     Connection *connection = nullptr;
     TestUtils::TestRoom *room = nullptr;
-
-    EventHandler emptyHandler = EventHandler(nullptr, nullptr);
+    EventHandler eventHandler;
+    EventHandler emptyHandler;
+    EventHandler noEventHandler;
 
 private Q_SLOTS:
     void initTestCase();
 
+    void nullSetEvent();
     void eventId();
     void nullEventId();
+    void delegateType_data();
+    void delegateType();
+    void nullDelegateType();
     void author();
     void nullAuthor();
     void authorDisplayName();
@@ -64,6 +70,8 @@ private Q_SLOTS:
     void nullHasReply();
     void replyId();
     void nullReplyId();
+    void replyDelegateType();
+    void nullReplyDelegateType();
     void replyAuthor();
     void nullReplyAuthor();
     void replyBody();
@@ -76,32 +84,72 @@ 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 eventHandler(room, room->messageEvents().at(0).get());
+    eventHandler.setEvent(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 eventHandler(room, event);
+    eventHandler.setEvent(event);
 
     auto eventHandlerAuthor = eventHandler.getAuthor();
 
@@ -119,14 +167,15 @@ 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()
 {
-    EventHandler eventHandler(room, room->messageEvents().at(1).get());
+    auto event = room->messageEvents().at(1).get();
+    eventHandler.setEvent(event);
+
     QCOMPARE(eventHandler.getAuthorDisplayName(), QStringLiteral("before"));
 }
 
@@ -135,14 +184,15 @@ 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()
 {
-    EventHandler eventHandler(room, room->messageEvents().at(11).get());
+    auto event = room->messageEvents().at(11).get();
+    eventHandler.setEvent(event);
+
     QCOMPARE(eventHandler.singleLineAuthorDisplayname(), QStringLiteral("Look at me I put newlines in my display name"));
 }
 
@@ -151,14 +201,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()
 {
-    EventHandler eventHandler(room, room->messageEvents().at(0).get());
+    auto event = room->messageEvents().at(0).get();
+    eventHandler.setEvent(event);
 
     QCOMPARE(eventHandler.getTime(), QDateTime::fromMSecsSinceEpoch(1432735824654, Qt::UTC));
     QCOMPARE(eventHandler.getTime(true, QDateTime::fromMSecsSinceEpoch(1234, Qt::UTC)), QDateTime::fromMSecsSinceEpoch(1234, Qt::UTC));
@@ -166,18 +216,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 eventHandler(room, room->messageEvents().at(0).get());
+    eventHandler.setEvent(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()
 {
-    EventHandler eventHandler(room, room->messageEvents().at(0).get());
+    auto event = room->messageEvents().at(0).get();
+    eventHandler.setEvent(event);
 
     KFormat format;
 
@@ -197,22 +247,25 @@ 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 eventHandler(room, room->messageEvents().at(0).get());
+    eventHandler.setEvent(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()
 {
-    EventHandler eventHandlerHighlight(room, room->messageEvents().at(2).get());
-    QCOMPARE(eventHandlerHighlight.isHighlighted(), true);
+    auto event = room->messageEvents().at(2).get();
+    eventHandler.setEvent(event);
 
-    EventHandler eventHandlerNoHighlight(room, room->messageEvents().at(0).get());
-    QCOMPARE(eventHandlerNoHighlight.isHighlighted(), false);
+    QCOMPARE(eventHandler.isHighlighted(), true);
+
+    event = room->messageEvents().at(0).get();
+    eventHandler.setEvent(event);
+
+    QCOMPARE(eventHandler.isHighlighted(), false);
 }
 
 void EventHandlerTest::nullHighlighted()
@@ -220,18 +273,21 @@ 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()
 {
-    EventHandler eventHandlerHidden(room, room->messageEvents().at(3).get());
-    QCOMPARE(eventHandlerHidden.isHidden(), true);
+    auto event = room->messageEvents().at(3).get();
+    eventHandler.setEvent(event);
 
-    EventHandler eventHandlerNoHidden(room, room->messageEvents().at(0).get());
-    QCOMPARE(eventHandlerNoHidden.isHidden(), false);
+    QCOMPARE(eventHandler.isHidden(), true);
+
+    event = room->messageEvents().at(0).get();
+    eventHandler.setEvent(event);
+
+    QCOMPARE(eventHandler.isHidden(), false);
 }
 
 void EventHandlerTest::nullHidden()
@@ -239,14 +295,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()
 {
-    EventHandler eventHandler(room, room->messageEvents().at(0).get());
+    auto event = room->messageEvents().at(0).get();
+    eventHandler.setEvent(event);
 
     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>"));
@@ -256,8 +312,6 @@ 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());
 
@@ -282,37 +336,39 @@ void EventHandlerTest::genericBody()
     QFETCH(int, eventNum);
     QFETCH(QString, output);
 
-    EventHandler eventHandler(room, room->messageEvents().at(eventNum).get());
+    eventHandler.setEvent(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::markdownBody()
 {
-    EventHandler eventHandler(room, room->messageEvents().at(0).get());
+    eventHandler.setEvent(room->messageEvents().at(0).get());
 
     QCOMPARE(eventHandler.getMarkdownBody(), QStringLiteral("This is an example\ntext message"));
 }
 
 void EventHandlerTest::subtitle()
 {
-    EventHandler eventHandler(room, room->messageEvents().at(0).get());
+    auto event = room->messageEvents().at(0).get();
+    eventHandler.setEvent(event);
+
     QCOMPARE(eventHandler.subtitleText(), QStringLiteral("after: This is an example text message"));
 
-    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"));
+    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"));
 }
 
 void EventHandlerTest::nullSubtitle()
 {
-    EventHandler noEventHandler(room, nullptr);
     QTest::ignoreMessage(QtWarningMsg, "subtitleText called with m_event set to nullptr.");
     QCOMPARE(noEventHandler.subtitleText(), QString());
 }
@@ -320,7 +376,7 @@ void EventHandlerTest::nullSubtitle()
 void EventHandlerTest::mediaInfo()
 {
     auto event = room->messageEvents().at(4).get();
-    EventHandler eventHandler(room, event);
+    eventHandler.setEvent(event);
 
     auto mediaInfo = eventHandler.getMediaInfo();
     auto thumbnailInfo = mediaInfo["tempInfo"_ls].toMap();
@@ -345,48 +401,76 @@ 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()
 {
-    EventHandler eventHandlerReply(room, room->messageEvents().at(5).get());
-    QCOMPARE(eventHandlerReply.hasReply(), true);
+    auto event = room->messageEvents().at(5).get();
+    eventHandler.setEvent(event);
 
-    EventHandler eventHandlerNoReply(room, room->messageEvents().at(0).get());
-    QCOMPARE(eventHandlerNoReply.hasReply(), false);
+    QCOMPARE(eventHandler.hasReply(), true);
+
+    event = room->messageEvents().at(0).get();
+    eventHandler.setEvent(event);
+
+    QCOMPARE(eventHandler.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()
 {
-    EventHandler eventHandlerReply(room, room->messageEvents().at(5).get());
-    QCOMPARE(eventHandlerReply.getReplyId(), QStringLiteral("$153456789:example.org"));
+    auto event = room->messageEvents().at(5).get();
+    eventHandler.setEvent(event);
 
-    EventHandler eventHandlerNoReply(room, room->messageEvents().at(0).get());
-    QCOMPARE(eventHandlerNoReply.getReplyId(), QStringLiteral(""));
+    QCOMPARE(eventHandler.getReplyId(), QStringLiteral("$153456789:example.org"));
+
+    event = room->messageEvents().at(0).get();
+    eventHandler.setEvent(event);
+
+    QCOMPARE(eventHandler.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 eventHandler(room, room->messageEvents().at(5).get());
+    eventHandler.setEvent(event);
 
     auto eventHandlerReplyAuthor = eventHandler.getReplyAuthor();
 
@@ -398,8 +482,10 @@ void EventHandlerTest::replyAuthor()
     QCOMPARE(eventHandlerReplyAuthor["color"_ls], Utils::getUserColor(replyAuthor->hueF()));
     QCOMPARE(eventHandlerReplyAuthor["object"_ls], QVariant::fromValue(replyAuthor));
 
-    EventHandler eventHandlerNoAuthor(room, room->messageEvents().at(0).get());
-    QCOMPARE(eventHandlerNoAuthor.getReplyAuthor(), room->getUser(nullptr));
+    event = room->messageEvents().at(0).get();
+    eventHandler.setEvent(event);
+
+    QCOMPARE(eventHandler.getReplyAuthor(), room->getUser(nullptr));
 }
 
 void EventHandlerTest::nullReplyAuthor()
@@ -407,14 +493,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()
 {
-    EventHandler eventHandler(room, room->messageEvents().at(5).get());
+    auto event = room->messageEvents().at(5).get();
+    eventHandler.setEvent(event);
 
     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>"));
@@ -424,8 +510,6 @@ 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());
 
@@ -437,7 +521,7 @@ void EventHandlerTest::replyMediaInfo()
 {
     auto event = room->messageEvents().at(6).get();
     auto replyEvent = room->messageEvents().at(4).get();
-    EventHandler eventHandler(room, event);
+    eventHandler.setEvent(event);
 
     auto mediaInfo = eventHandler.getReplyMediaInfo();
     auto thumbnailInfo = mediaInfo["tempInfo"_ls].toMap();
@@ -462,26 +546,31 @@ 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()
 {
-    EventHandler eventHandlerNoThread(room, room->messageEvents().at(0).get());
-    QCOMPARE(eventHandlerNoThread.isThreaded(), false);
-    QCOMPARE(eventHandlerNoThread.threadRoot(), QString());
+    auto event = room->messageEvents().at(0).get();
+    eventHandler.setEvent(event);
 
-    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"));
+    QCOMPARE(eventHandler.isThreaded(), false);
+    QCOMPARE(eventHandler.threadRoot(), QString());
 
-    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"));
+    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"));
 }
 
 void EventHandlerTest::nullThread()
@@ -489,14 +578,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()
 {
-    EventHandler eventHandler(room, room->messageEvents().at(7).get());
+    auto event = room->messageEvents().at(7).get();
+    eventHandler.setEvent(event);
 
     QCOMPARE(eventHandler.getLatitude(), QStringLiteral("51.7035").toFloat());
     QCOMPARE(eventHandler.getLongitude(), QStringLiteral("-1.14394").toFloat());
@@ -517,7 +606,9 @@ void EventHandlerTest::nullLocation()
 
 void EventHandlerTest::readMarkers()
 {
-    EventHandler eventHandler(room, room->messageEvents().at(0).get());
+    auto event = room->messageEvents().at(0).get();
+    eventHandler.setEvent(event);
+
     QCOMPARE(eventHandler.hasReadMarkers(), true);
 
     auto readMarkers = eventHandler.getReadMarkers();
@@ -528,16 +619,18 @@ void EventHandlerTest::readMarkers()
     QCOMPARE(eventHandler.getNumberExcessReadMarkers(), QString());
     QCOMPARE(eventHandler.getReadMarkersString(), QStringLiteral("1 user: @alice:matrix.org"));
 
-    EventHandler eventHandler2(room, room->messageEvents().at(2).get());
-    QCOMPARE(eventHandler2.hasReadMarkers(), true);
+    event = room->messageEvents().at(2).get();
+    eventHandler.setEvent(event);
 
-    readMarkers = eventHandler2.getReadMarkers();
+    QCOMPARE(eventHandler.hasReadMarkers(), true);
+
+    readMarkers = eventHandler.getReadMarkers();
 
     QCOMPARE(readMarkers.size(), 5);
 
-    QCOMPARE(eventHandler2.getNumberExcessReadMarkers(), QStringLiteral("+ 1"));
+    QCOMPARE(eventHandler.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(eventHandler2.getReadMarkersString().startsWith(QStringLiteral("6 users:")), true);
+    QCOMPARE(eventHandler.getReadMarkersString().startsWith(QStringLiteral("6 users:")), true);
 }
 
 void EventHandlerTest::nullReadMarkers()
@@ -554,8 +647,6 @@ 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);
 
@@ -569,5 +660,10 @@ void EventHandlerTest::nullReadMarkers()
     QCOMPARE(noEventHandler.getReadMarkersString(), QString());
 }
 
+void EventHandlerTest::cleanup()
+{
+    eventHandler.setEvent(nullptr);
+}
+
 QTEST_MAIN(EventHandlerTest)
 #include "eventhandlertest.moc"

autotests/messageeventmodeltest.cpp

@@ -103,6 +103,7 @@ 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/texthandlertest.cpp

@@ -10,9 +10,7 @@
 #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"
 
@@ -35,6 +33,7 @@ private Q_SLOTS:
     void stripDisallowedTags();
     void stripDisallowedAttributes();
     void emptyCodeTags();
+    void formatBlockQuote();
 
     void sendSimpleStringCase();
     void sendSingleParaMarkup();
@@ -60,13 +59,11 @@ 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()
@@ -142,6 +139,16 @@ 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.");
@@ -463,6 +470,22 @@ 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");
@@ -471,6 +494,9 @@ 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()
@@ -481,8 +507,7 @@ void TextHandlerTest::receiveRichEdited()
     TextHandler testTextHandler;
     testTextHandler.setData(testInputString);
 
-    const auto event = eventCast<const Quotient::RoomMessageEvent>(room->messageEvents().at(2).get());
-    QCOMPARE(testTextHandler.handleRecieveRichText(Qt::RichText, room, event, false, event->isReplaced()), testOutputString);
+    QCOMPARE(testTextHandler.handleRecieveRichText(Qt::RichText, room, room->messageEvents().at(2).get()), testOutputString);
 }
 
 void TextHandlerTest::receiveLineSeparator()
@@ -501,57 +526,5 @@ 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>"), {}}};
-    QTest::newRow("long start tag")
-        << QStringLiteral(
-               "Ah, you mean something like<br/><pre data-md=\"```\"><code class=\"language-qml\"># main.qml\nimport CustomQml\n...\nControls.TextField { id: "
-               "someField }\nCustomQml {\n    someTextProperty: someField.text\n}\n</code></pre>Sure you can, it's still local to the same file where you "
-               "defined the id")
-        << QList<MessageComponent>{
-               MessageComponent{MessageComponentType::Text, QStringLiteral("Ah, you mean something like"), {}},
-               MessageComponent{
-                   MessageComponentType::Code,
-                   QStringLiteral(
-                       "# main.qml\nimport CustomQml\n...\nControls.TextField { id: someField }\nCustomQml {\n    someTextProperty: someField.text\n}"),
-                   QVariantMap{{QStringLiteral("class"), QStringLiteral("qml")}}},
-               MessageComponent{MessageComponentType::Text, QStringLiteral("Sure you can, it's still local to the same file where you defined the id"), {}}};
-}
-
-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

@@ -32,7 +32,6 @@
   <name xml:lang="it">NeoChat</name>
   <name xml:lang="ka">NeoChat</name>
   <name xml:lang="ko">NeoChat</name>
-  <name xml:lang="lv">NeoChat</name>
   <name xml:lang="nl">NeoChat</name>
   <name xml:lang="nn">NeoChat</name>
   <name xml:lang="pa">ਨਿਓ-ਚੈਟ</name>
@@ -65,7 +64,6 @@
   <summary xml:lang="it">Conversa con i tuoi contatti su matrix</summary>
   <summary xml:lang="ka">ესაუბრეთ მეგობრებს Matrix-ზე</summary>
   <summary xml:lang="ko">Matrix를 사용하여 친구들과 대화하기</summary>
-  <summary xml:lang="lv">Tērzējiet ar saviem draugiem „Matrix“ tīklā</summary>
   <summary xml:lang="nl">Met uw vrienden chatten op matrix</summary>
   <summary xml:lang="nn">Prat med vennar på Matrix</summary>
   <summary xml:lang="pl">Rozmawiaj ze swoimi znajomymi w Matriksie</summary>
@@ -78,25 +76,33 @@
   <summary xml:lang="zh-CN">在 Matrix 上与朋友聊天</summary>
   <summary xml:lang="zh-TW">在 Matrix 上與您的朋友聊天</summary>
   <description>
-    <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="eo">NeoChat estas babilej-apo, kiu ebligas al vi plene profiti de la Matrix-reto. Ĝi provizas al vi sekuran manieron sendi tekstmesaĝojn, filmetojn kaj sondosierojn al via familio, kolegoj kaj amikoj.</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="fr">NeoChat est une application de discussions vous permettant de profiter pleinement du réseau Matrix. Elle vous offre un moyen sécurisé d’envoyer des messages de texte, des vidéos et des fichiers audio à votre famille, vos collègues et vos ami(e)s.</p>
-    <p xml:lang="hu">A NeoChat egy olyan csevegőalkalmazás, amellyel teljes mértékben kihasználhatja a Matrix hálózatot. Biztonságos módot biztosít szöveges üzenetek, videók és hangfájlok küldéséhez családtagjainak, kollégáinak és barátainak.</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="lv">„NeoChat“ ir tērzēšanas programma, kas ļauj pilnvērtīgi izmantot „Matrix“ tīklu. Tā sniedz drošu veidu teksta ziņu, video un audio sūtīšanai ģimenes locekļiem, kolēģiem un draugiem.</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 xml:lang="zh-TW">NeoChat 是一個讓您能夠完全利用 Matrix 網路的聊天應用程式。它讓您安全地傳送文字訊息、影片或音訊檔給家人、同事或朋友等等。</p>
+    <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="hu">A NeoChat egy kliens a Matrixhoz, az azonnali üzenetküldés decentralizált komunikációs protokolljához. Szöveges üzeneteket, videókat és hangfájlokat küldhet családjának, kollégáinak és barátainak. A KDE keretrendszert használja, a Kirigaminak köszönhetően konvergens élményt nyújt több platformon is.</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 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>
@@ -111,9 +117,8 @@
     <p xml:lang="hu">A NeoChat célja, hogy a Matrix specifikációnak megfelelő teljes funkcionalitású alkalmazás legyen. Mint ilyen, a jelenlegi stabil specifikáció támogatott a VoIP, a szálak és a végpontok közötti titkosítás egyes elemeinek kivételével. Van még néhány kisebb hiányosság annak köszönhetően, hogy a Matrix specifikáció folyamatosan fejlődik, de végső cél a teljes specifikáció megvalósítása.</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="lv">„NeoChat“ mērķis ir piedāvāt plašas iespējas atbilstoši „Matrix“ specifikācijai. Līdz ar to programma atbalsta visu pašreizējā stabilajā specifikācijā, izņemot VoIP, pavedienus un dažos aspektos galšifrēšanu. Pastāv citas atsevišķas sīkas neieviestas daļas, jo „Matrix“ specifikācija nepārtraukti attīstās, tomēr mērķis ir ar laiku nodrošināt atbalstu pilnai specifikācijai.</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>
     <p xml:lang="pl">NeoChat w zamyśle ma być pełnowartościową aplikacją wg wytycznych Matriksa. Z tego powodu, wszystko, co jest obecnie w stabilnych wytycznych z pominięciem VoIP, wątków i niektórych części szyfrowania Użytkownik-do-Użytkownika są obecnie obsługiwane. Pominięto też kilka mniejszych rzeczy ze względu na ciągły rozwój wytycznych Matriksa, lecz celem nadal jest zapewnienie obsługi wszystkich wytycznych.</p>
@@ -140,7 +145,6 @@
     <p xml:lang="it">A causa della natura dello sviluppo delle specifiche Matrix, NeoChat supporta anche numerose funzionalità instabili. Attualmente queste sono:</p>
     <p xml:lang="ka">Matrix-ის სპეციფიკაციის განვითარების ბუნების გამო NeoChat-ს ასევე აქვს უამრავი არასტაბილური ფუნქციაც. ახლა ისინია:</p>
     <p xml:lang="ko">Matrix 표준 개발의 특징으로 인하여 NeoChat은 일부 실험적인 기능을 지원합니다. 현재 지원하는 기능은 다음과 같습니다.</p>
-    <p xml:lang="lv">„Matrix“ specifikācijas veida dēļ „NeoChat“ attīstība atbalsta arī vairākas nestabilas iespējas, šobrīd šādas ir:</p>
     <p xml:lang="nl">Vanwege de aard van de ontwikkeling van de Matrix specificatie ondersteunt NeoChat ook talloze onstabiele mogelijkheden. Dit zijn nu:</p>
     <p xml:lang="nn">På grunn av måten Matrix-spesifikasjonen vert utvikla på, støttar NeoChat òg nokre uferdige funksjonar:</p>
     <p xml:lang="pl">Ze względu na sposób rozwoju Matriksa, NeoChat obsługuje także kilka niestabilnych możliwości. Obecnie są to:</p>
@@ -169,7 +173,6 @@
       <li xml:lang="it">Sondaggi - MSC3381</li>
       <li xml:lang="ka">Polls - MSC3381</li>
       <li xml:lang="ko">투표 - MSC3381</li>
-      <li xml:lang="lv">Aptaujas — MSC3381</li>
       <li xml:lang="nl">Polls - MSC3381</li>
       <li xml:lang="nn">Avstemmingar – MSC3381</li>
       <li xml:lang="pl">Ankiety - MSC3381</li>
@@ -197,7 +200,6 @@
       <li xml:lang="it">Pacchetti di adesivi - MSC2545</li>
       <li xml:lang="ka">სტიკერების პაკეტები - MSC2545</li>
       <li xml:lang="ko">스티커 팩 - MSC2545</li>
-      <li xml:lang="lv">Uzlīmju pakas — MSC2545</li>
       <li xml:lang="nl">Sticker Packs - MSC2545</li>
       <li xml:lang="nn">Klistremerke-pakkar – MSC2545</li>
       <li xml:lang="pl">Paczki naklejek - MSC2545</li>
@@ -225,7 +227,6 @@
       <li xml:lang="it">Località eventi - MSC3488</li>
       <li xml:lang="ka">მდებარეობის მოვლენები - MSC3488</li>
       <li xml:lang="ko">위치 이벤트 - MSC3488</li>
-      <li xml:lang="lv">Atrašanās vietas notikumi — MSC3488</li>
       <li xml:lang="nl">Locatie gebeurtenissen - MSC3488</li>
       <li xml:lang="nn">Posisjonshendingar – MSC3488</li>
       <li xml:lang="pl">Wydarzenia w miejscach - MSC3488</li>
@@ -241,21 +242,47 @@
   </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>
-  <keywords>
-    <keyword>Matrix</keyword>
-    <keyword>Kirigami</keyword>
-  </keywords>
-  <developer id="kde.org">
-    <name>The KDE Community</name>
-    <url>https://kde.org</url>
-  </developer>
+  <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>
   <metadata_license>CC0-1.0</metadata_license>
   <project_license>GPL-3.0</project_license>
   <custom>
@@ -270,64 +297,11 @@
   <launchable type="desktop-id">org.kde.neochat.desktop</launchable>
   <screenshots>
     <screenshot type="default">
-      <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="hu">A fő nézet a szobalistával, csevegéssel és szobainformációkkal</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="lv">Pamata skats ar istabu sarakstu, tērzēšanu un istabas informāciju</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>
+      <image>https://cdn.kde.org/screenshots/neochat/application-mobile.png</image>
     </screenshot>
     <screenshot type="default">
-      <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="eo">Malkovru novajn komunumojn per Matrix Spaces</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="fr">Découvrez de nouvelles communautés avec les espaces sous Matrix</caption>
-      <caption xml:lang="hu">Fedezzen fel új közösségeket a Matrix Terek segítségével</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="lv">Atklājiet jaunas kopienas ar „Matrix“ telpām</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>
-      <caption xml:lang="zh-TW">利用 Matrix 聊天空間發現新的社群</caption>
+      <image>https://cdn.kde.org/screenshots/neochat/application.png</image>
     </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>
@@ -345,7 +319,6 @@
       <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="lv">Pamata skats ar istabu sarakstu, tērzēšanu un istabas informāciju</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>
@@ -376,7 +349,6 @@
       <caption xml:lang="it">Schermata di accesso</caption>
       <caption xml:lang="ka">შესვლის ეკრანი</caption>
       <caption xml:lang="ko">로그인 화면</caption>
-      <caption xml:lang="lv">Ierakstīšanās logs</caption>
       <caption xml:lang="nl">Aanmeldscherm</caption>
       <caption xml:lang="nn">Innloggingsbilete</caption>
       <caption xml:lang="pl">Ekran logowania</caption>
@@ -394,6 +366,7 @@
     <content_attribute id="social-chat">intense</content_attribute>
   </content_rating>
   <releases>
+    <release version="24.02.2" date="2024-04-11"/>
     <release version="24.02.1" date="2024-03-21"/>
     <release version="24.02.0" date="2024-02-28">
       <url>https://kde.org/announcements/megarelease/6/#neochat</url>
@@ -560,8 +533,4 @@
       <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

@@ -26,7 +26,6 @@ Name[it]=NeoChat
 Name[ka]=NeoChat
 Name[ko]=NeoChat
 Name[lt]=NeoChat
-Name[lv]=NeoChat
 Name[nl]=NeoChat
 Name[nn]=NeoChat
 Name[pa]=ਨਿਓ-ਚੈਟ
@@ -66,8 +65,7 @@ GenericName[ie]=Cliente de Matrix
 GenericName[it]=Client Matrix
 GenericName[ka]=Matrix -ის კლიენტი
 GenericName[ko]=Matrix 클라이언트
-GenericName[lt]=Matrix kliento programa
-GenericName[lv]=„Matrix“ klients
+GenericName[lt]=Matrix kliento programą
 GenericName[nl]=Matrix-client
 GenericName[nn]=Matrix-klient
 GenericName[pa]=ਮੈਟਰਿਕਸ ਕਲਾਈਂਟ
@@ -107,7 +105,6 @@ Comment[it]=Client per il protocollo Matrix
 Comment[ka]=კლიენტი Matrix-ის პროტოკოლისთვის
 Comment[ko]=Matrix 프로토콜용 클라이언트
 Comment[lt]=Matrix protokolo kliento programa
-Comment[lv]=Klients „Matrix“ protokolam
 Comment[nl]=Client voor het Matrix-protocol
 Comment[nn]=Klient for Matrix-protokollen
 Comment[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

@@ -3,10 +3,6 @@
 # SPDX-FileCopyrightText: 2020-2021 Tobias Fella <tobias.fella@kde.org>
 # SPDX-License-Identifier: BSD-2-Clause
 
-if (NOT ANDROID AND NOT WIN32 AND NOT APPLE AND NOT NEOCHAT_FLATPAK AND NOT NEOCHAT_APPIMAGE)
-    add_subdirectory(purpose)
-endif()
-
 add_library(neochat STATIC
     controller.cpp
     controller.h
@@ -60,8 +56,6 @@ 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
@@ -126,7 +120,6 @@ add_library(neochat STATIC
     events/pollevent.cpp
     pollhandler.cpp
     utils.h
-    utils.cpp
     registration.cpp
     neochatconnection.cpp
     neochatconnection.h
@@ -151,37 +144,9 @@ 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
-    sharehandler.cpp
-    sharehandler.h
-    models/roomtreeitem.cpp
-    models/roomtreeitem.h
-)
-
-set_source_files_properties(qml/OsmLocationPlugin.qml PROPERTIES
-    QT_QML_SINGLETON_TYPE TRUE
 )
 
 qt_add_qml_module(neochat URI org.kde.neochat NO_PLUGIN
-    OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/src/org/kde/neochat
     QML_FILES
         qml/main.qml
         qml/AccountMenu.qml
@@ -195,12 +160,19 @@ qt_add_qml_module(neochat URI org.kde.neochat NO_PLUGIN
         qml/UserInfo.qml
         qml/UserInfoDesktop.qml
         qml/RoomPage.qml
-        qml/ExploreRoomsPage.qml
+        qml/RoomWindow.qml
+        qml/JoinRoomPage.qml
         qml/ManualRoomDialog.qml
         qml/ExplorerDelegate.qml
         qml/InviteUserPage.qml
+        qml/StartChatPage.qml
         qml/ImageEditorPage.qml
         qml/WelcomePage.qml
+        qml/General.qml
+        qml/RoomSecurity.qml
+        qml/PushNotification.qml
+        qml/Categories.qml
+        qml/Permissions.qml
         qml/NeochatMaximizeComponent.qml
         qml/FancyEffectsContainer.qml
         qml/TypingPane.qml
@@ -212,7 +184,31 @@ qt_add_qml_module(neochat URI org.kde.neochat NO_PLUGIN
         qml/CompletionMenu.qml
         qml/PieProgressBar.qml
         qml/QuickFormatBar.qml
+        qml/RoomData.qml
+        qml/ServerData.qml
         qml/EmojiPicker.qml
+        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
+        qml/AvatarFlow.qml
         qml/LoginStep.qml
         qml/Login.qml
         qml/Homeserver.qml
@@ -245,19 +241,41 @@ qt_add_qml_module(neochat URI org.kde.neochat NO_PLUGIN
         qml/FileDelegateContextMenu.qml
         qml/MessageSourceSheet.qml
         qml/ReportSheet.qml
+        qml/SettingsPage.qml
+        qml/ThemeRadioButton.qml
+        qml/ColorScheme.qml
+        qml/GeneralSettingsPage.qml
+        qml/EmoticonsPage.qml
+        qml/EmoticonEditorPage.qml
+        qml/EmoticonFormCard.qml
+        qml/GlobalNotificationsPage.qml
+        qml/NotificationRuleItem.qml
+        qml/AppearanceSettingsPage.qml
+        qml/AccountsPage.qml
+        qml/AccountEditorPage.qml
+        qml/DevicesPage.qml
+        qml/DeviceDelegate.qml
+        qml/DevicesCard.qml
+        qml/About.qml
+        qml/AboutKDE.qml
+        qml/SonnetConfigPage.qml
+        qml/NetworkProxyPage.qml
+        qml/DevtoolsPage.qml
         qml/ConfirmEncryptionDialog.qml
         qml/RemoveSheet.qml
         qml/BanSheet.qml
         qml/EmojiTonesPicker.qml
         qml/EmojiDelegate.qml
         qml/EmojiGrid.qml
-        qml/RoomSearchPage.qml
+        qml/SearchPage.qml
+        qml/LocationDelegate.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
@@ -268,50 +286,23 @@ 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
         qml/SelectParentDialog.qml
+        qml/Security.qml
         qml/QrCodeMaximizeComponent.qml
         qml/SelectSpacesDialog.qml
         qml/AttachDialog.qml
         qml/NotificationsView.qml
-        qml/SearchPage.qml
-        qml/ServerComboBox.qml
-        qml/UserSearchPage.qml
-        qml/ManualUserDialog.qml
-        qml/RecommendedSpaceDialog.qml
-        qml/RoomTreeSection.qml
-        qml/DelegateContextMenu.qml
-        qml/ShareDialog.qml
-        qml/UnlockSSSSDialog.qml
-        qml/QrScannerPage.qml
-        qml/JoinRoomDialog.qml
-        qml/ConfirmUrlDialog.qml
-        qml/AccountSwitchDialog.qml
-        qml/ConfirmLeaveDialog.qml
-        qml/CodeMaximizeComponent.qml
+        qml/LoadingDelegate.qml
+        qml/TimelineEndDelegate.qml
     RESOURCES
         qml/confetti.png
         qml/glowdot.png
 )
 
-add_subdirectory(settings)
-add_subdirectory(timeline)
-add_subdirectory(devtools)
-
-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()
@@ -325,15 +316,6 @@ 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"
@@ -390,7 +372,6 @@ if (NOT ANDROID AND NOT WIN32 AND NOT APPLE)
 endif()
 
 target_include_directories(neochat PRIVATE ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/models ${CMAKE_CURRENT_SOURCE_DIR}/enums)
-target_link_libraries(neochat PRIVATE settingsplugin timelineplugin devtoolsplugin)
 target_link_libraries(neochat PUBLIC
     Qt::Core
     Qt::Quick
@@ -516,7 +497,7 @@ if(ANDROID)
     )
     ecm_add_android_apk(neochat-app ANDROID_DIR ${CMAKE_SOURCE_DIR}/android)
 else()
-    target_link_libraries(neochat PUBLIC Qt::Widgets KF6::KIOWidgets KF6::SyntaxHighlighting)
+    target_link_libraries(neochat PUBLIC Qt::Widgets KF6::KIOWidgets)
     install(FILES neochat.notifyrc DESTINATION ${KDE_INSTALL_KNOTIFYRCDIR})
 endif()
 

src/actionshandler.cpp

@@ -80,7 +80,6 @@ QString ActionsHandler::handleMentions(QString handledText, QList<Mention> *ment
 
 void ActionsHandler::handleMessage(const QString &text, QString handledText, ChatBarCache *chatBarCache)
 {
-    Q_ASSERT(m_room);
     if (NeoChatConfig::allowQuickEdit()) {
         QRegularExpression sed(QStringLiteral("^s/([^/]*)/([^/]*)(/g)?$"));
         auto match = sed.match(text);

src/actionshandler.h

@@ -58,7 +58,7 @@ public Q_SLOTS:
     void handleMessageEvent(ChatBarCache *chatBarCache);
 
 private:
-    QPointer<NeoChatRoom> m_room;
+    NeoChatRoom *m_room = nullptr;
     void checkEffects(const QString &text);
 
     QString handleMentions(QString handledText, QList<Mention> *mentions);

src/chatbarcache.cpp

@@ -44,14 +44,14 @@ void ChatBarCache::setReplyId(const QString &replyId)
     if (m_relationType == Reply && m_relationId == replyId) {
         return;
     }
-    const auto oldEventId = std::exchange(m_relationId, replyId);
+    m_relationId = replyId;
     if (m_relationId.isEmpty()) {
         m_relationType = None;
     } else {
         m_relationType = Reply;
     }
     m_attachmentPath = QString();
-    Q_EMIT relationIdChanged(oldEventId, m_relationId);
+    Q_EMIT relationIdChanged();
     Q_EMIT attachmentPathChanged();
 }
 
@@ -73,14 +73,14 @@ void ChatBarCache::setEditId(const QString &editId)
     if (m_relationType == Edit && m_relationId == editId) {
         return;
     }
-    const auto oldEventId = std::exchange(m_relationId, editId);
+    m_relationId = editId;
     if (m_relationId.isEmpty()) {
         m_relationType = None;
     } else {
         m_relationType = Edit;
     }
     m_attachmentPath = QString();
-    Q_EMIT relationIdChanged(oldEventId, m_relationId);
+    Q_EMIT relationIdChanged();
     Q_EMIT attachmentPathChanged();
 }
 
@@ -115,9 +115,10 @@ 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 eventhandler(room, &**event);
+        eventhandler.setEvent(&**event);
         return eventhandler.getMarkdownBody();
     }
     return {};
@@ -154,9 +155,9 @@ void ChatBarCache::setAttachmentPath(const QString &attachmentPath)
     }
     m_attachmentPath = attachmentPath;
     m_relationType = None;
-    const auto oldEventId = std::exchange(m_relationId, QString());
+    m_relationId = QString();
     Q_EMIT attachmentPathChanged();
-    Q_EMIT relationIdChanged(oldEventId, m_relationId);
+    Q_EMIT relationIdChanged();
 }
 
 QList<Mention> *ChatBarCache::mentions()

src/chatbarcache.h

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

src/config-neochat.h.in

@@ -1,8 +0,0 @@
-/*
-   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,13 +23,12 @@
 #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)
@@ -38,14 +37,6 @@
 #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;
@@ -55,7 +46,7 @@ Controller::Controller(QObject *parent)
 {
     Connection::setRoomType<NeoChatRoom>();
 
-    ProxyController::instance().setApplicationProxy();
+    setApplicationProxy();
 
 #ifndef Q_OS_ANDROID
     setQuitOnLastWindowClosed();
@@ -111,9 +102,7 @@ Controller::Controller(QObject *parent)
                 NotificationsManager::instance().handleNotifications(connection);
             });
             connectSingleShot(connection, &NeoChatConnection::syncDone, this, [this, connection] {
-                if (!m_endpoint.isEmpty()) {
-                    connection->setupPushNotifications(m_endpoint);
-                }
+                connection->setupPushNotifications(m_endpoint);
             });
         }
         oldAccountCount = m_accountRegistry.size();
@@ -129,9 +118,7 @@ Controller::Controller(QObject *parent)
         }
     });
 
-    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"));
+    connector->registerClient(i18n("Receiving push notifications"));
 
     m_endpoint = connector->endpoint();
 #endif
@@ -156,18 +143,8 @@ void Controller::addConnection(NeoChatConnection *c)
         c->saveState();
     });
     connect(c, &NeoChatConnection::loggedOut, this, [this, c] {
-        if (accounts().count() > 1) {
-            // Only set the connection if the the account being logged out is currently active
-            if (c == activeConnection()) {
-                setActiveConnection(dynamic_cast<NeoChatConnection *>(accounts().accounts()[0]));
-            }
-        } else {
-            setActiveConnection(nullptr);
-        }
-
         dropConnection(c);
     });
-    connect(c, &NeoChatConnection::badgeNotificationCountChanged, this, &Controller::updateBadgeNotificationCount);
 
     c->sync();
 
@@ -310,15 +287,26 @@ void Controller::setActiveConnection(NeoChatConnection *connection)
     if (connection == m_connection) {
         return;
     }
-
-    m_connection = connection;
-
     if (m_connection != nullptr) {
-        m_connection->refreshBadgeNotificationCount();
-        updateBadgeNotificationCount(m_connection, m_connection->badgeNotificationCount());
+        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();
+}
 
-    Q_EMIT activeConnectionChanged(m_connection);
+void Controller::forceRefreshTextDocument(QQuickTextDocument *textDocument, QQuickItem *item)
+{
+    // HACK: Workaround bug QTBUG 93281
+    connect(textDocument->textDocument(), SIGNAL(imagesLoaded()), item, SLOT(updateWholeDocument()));
 }
 
 void Controller::listenForNotifications()
@@ -342,34 +330,34 @@ void Controller::listenForNotifications()
 #endif
 }
 
-void Controller::updateBadgeNotificationCount(NeoChatConnection *connection, int count)
+void Controller::setApplicationProxy()
 {
-    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;
+    NeoChatConfig *cfg = NeoChatConfig::self();
+    QNetworkProxy proxy;
 
-        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)
+    // 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;
     }
+
+    QNetworkProxy::setApplicationProxy(proxy);
 }
 
 bool Controller::isFlatpak() const
@@ -386,14 +374,6 @@ AccountRegistry &Controller::accounts()
     return m_accountRegistry;
 }
 
-QString Controller::loadFileContent(const QString &path) const
-{
-    QUrl url(path);
-    QFile file(url.isLocalFile() ? url.toLocalFile() : url.toString());
-    file.open(QFile::ReadOnly);
-    return QString::fromLatin1(file.readAll());
-}
-
 #include "moc_controller.cpp"
 
 void Controller::setTestMode(bool test)
@@ -410,12 +390,3 @@ void Controller::removeConnection(const QString &userId)
         SettingsGroup("Accounts"_ls).remove(userId);
     }
 }
-
-bool Controller::ssssSupported() const
-{
-#if __has_include("Quotient/e2ee/sssshandler.h")
-    return true;
-#else
-    return false;
-#endif
-}

src/controller.h

@@ -56,8 +56,6 @@ class Controller : public QObject
 
     Q_PROPERTY(QStringList accountsLoading MEMBER m_accountsLoading NOTIFY accountsLoadingChanged)
 
-    Q_PROPERTY(bool ssssSupported READ ssssSupported CONSTANT)
-
 public:
     static Controller &instance();
     static Controller *create(QQmlEngine *engine, QJSEngine *)
@@ -86,24 +84,34 @@ 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.
      */
     static void listenForNotifications();
 
-    Q_INVOKABLE QString loadFileContent(const QString &path) const;
-
     Quotient::AccountRegistry &accounts();
 
     static void setTestMode(bool testMode);
 
     Q_INVOKABLE void removeConnection(const QString &userId);
 
-    bool ssssSupported() const;
-
 private:
     explicit Controller(QObject *parent = nullptr);
 
@@ -123,12 +131,11 @@ private:
 private Q_SLOTS:
     void invokeLogin();
     void setQuitOnLastWindowClosed();
-    void updateBadgeNotificationCount(NeoChatConnection *connection, int count);
 
 Q_SIGNALS:
     void errorOccured(const QString &error, const QString &detail);
     void connectionAdded(NeoChatConnection *connection);
     void connectionDropped(NeoChatConnection *connection);
-    void activeConnectionChanged(NeoChatConnection *connection);
+    void activeConnectionChanged();
     void accountsLoadingChanged();
 };

src/devtools/AccountData.qml

@@ -1,35 +0,0 @@
-// SPDX-FileCopyrightText: 2024 Tobias Fella <tobias.fella@kde.org>
-// SPDX-License-Identifier: LGPL-2.0-or-later
-
-import QtQuick
-import QtQuick.Controls as QQC2
-import QtQuick.Layouts
-
-import org.kde.kirigami as Kirigami
-import org.kde.kirigamiaddons.formcard as FormCard
-
-import org.kde.neochat
-
-ColumnLayout {
-    id: root
-
-    required property NeoChatConnection connection
-
-    FormCard.FormHeader {
-        title: i18nc("@title:group", "Account Data")
-    }
-    FormCard.FormCard {
-        Repeater {
-            model: root.connection.accountDataEventTypes
-            delegate: FormCard.FormButtonDelegate {
-                text: modelData
-                onClicked: applicationWindow().pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'MessageSourceSheet.qml'), {
-                    sourceText: root.connection.accountDataJsonString(modelData)
-                }, {
-                    title: i18nc("@title:window", "Event Source"),
-                    width: Kirigami.Units.gridUnit * 25
-                })
-            }
-        }
-    }
-}

src/devtools/CMakeLists.txt

@@ -1,15 +0,0 @@
-# SPDX-FileCopyrightText: 2024 James Graham <james.h.graham@protonmail.com>
-# SPDX-License-Identifier: BSD-2-Clause
-
-qt_add_library(devtools STATIC)
-qt_add_qml_module(devtools
-    URI org.kde.neochat.devtools
-    OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/src/org/kde/neochat/devtools
-    QML_FILES
-        DevtoolsPage.qml
-        AccountData.qml
-        FeatureFlagPage.qml
-        RoomData.qml
-        ServerData.qml
-        StateKeys.qml
-)

src/devtools/FeatureFlagPage.qml

@@ -1,32 +0,0 @@
-// 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
-
-import QtQuick
-import QtQuick.Layouts
-
-import org.kde.kirigami as Kirigami
-import org.kde.kirigamiaddons.formcard as FormCard
-
-import org.kde.neochat.config
-
-FormCard.FormCardPage {
-    id: root
-
-    FormCard.FormCard {
-        Layout.topMargin: Kirigami.Units.largeSpacing
-
-        FormCard.FormCheckDelegate {
-            id: roomAccountDataVisibleCheck
-            text: i18nc("@option:check Enable the matrix 'threads' feature", "Threads")
-            checked: Config.threads
-
-            onToggled: Config.threads = checked
-        }
-        FormCard.FormCheckDelegate {
-            text: i18nc("@option:check Enable the matrix 'secret backup' feature", "Secret Backup")
-            checked: Config.secretBackup
-
-            onToggled: Config.secretBackup = checked
-        }
-    }
-}

src/devtools/RoomData.qml

@@ -1,99 +0,0 @@
-// SPDX-FileCopyrightText: 2022 James Graham <james.h.graham@protonmail.com>
-// SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
-
-import QtQuick
-import QtQuick.Layouts
-
-import org.kde.kirigami as Kirigami
-import org.kde.kirigamiaddons.formcard as FormCard
-import org.kde.kitemmodels
-
-import org.kde.neochat
-
-ColumnLayout {
-    id: root
-
-    required property NeoChatRoom room
-    required property NeoChatConnection connection
-
-    FormCard.FormHeader {
-        title: i18nc("@title", "Choose Room")
-    }
-    FormCard.FormCard {
-        FormCard.FormComboBoxDelegate {
-            id: roomComboBox
-            text: i18n("Room")
-            textRole: "escapedDisplayName"
-            valueRole: "roomId"
-            displayText: RoomManager.roomListModel.data(RoomManager.roomListModel.index(currentIndex, 0), RoomListModel.DisplayNameRole)
-            model: RoomManager.roomListModel
-            currentIndex: 0
-            Component.onCompleted: currentIndex = RoomManager.roomListModel.rowForRoom(root.room)
-            onCurrentValueChanged: root.room = RoomManager.roomListModel.roomByAliasOrId(roomComboBox.currentValue)
-        }
-        FormCard.FormTextDelegate {
-            text: i18n("Room Id: %1", root.room.id)
-        }
-    }
-    FormCard.FormHeader {
-        title: i18n("Room Account Data")
-        visible: roomAccountData.count > 0
-    }
-    FormCard.FormCard {
-        visible: roomAccountData.count > 0
-        Repeater {
-            id: roomAccountData
-            model: root.room.accountDataEventTypes
-            delegate: FormCard.FormButtonDelegate {
-                text: modelData
-                onClicked: applicationWindow().pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'MessageSourceSheet.qml'), {
-                    sourceText: root.room.roomAcountDataJson(text)
-                }, {
-                    title: i18n("Event Source"),
-                    width: Kirigami.Units.gridUnit * 25
-                })
-            }
-        }
-    }
-    FormCard.FormHeader {
-        id: stateEventListHeader
-        title: i18n("Room State")
-        visible: roomState.count > 0
-    }
-    FormCard.FormCard {
-        visible: roomState.count > 0
-        Repeater {
-            id: roomState
-            model: StateModel {
-                id: stateModel
-                room: root.room
-            }
-
-            delegate: FormCard.FormButtonDelegate {
-                text: model.type
-                description: i18ncp("'Event' being some JSON data, not something physically happening.", "%1 event of this type", "%1 events of this type", model.eventCount)
-                onClicked: {
-                    if (model.eventCount === 1) {
-                        onClicked: applicationWindow().pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'MessageSourceSheet.qml'), {
-                            sourceText: stateModel.stateEventJson(stateModel.index(model.index, 0))
-                        }, {
-                            title: i18n("Event Source"),
-                            width: Kirigami.Units.gridUnit * 25
-                        })
-                    } else {
-                        pageStack.pushDialogLayer(stateKeysComponent, {
-                            room: root.room,
-                            eventType: model.type
-                        }, {
-                            title: i18nc("'Event' being some JSON data, not something physically happening.", "Event Information")
-                        });
-                    }
-                }
-            }
-        }
-        Component {
-            id: stateKeysComponent
-            StateKeys {}
-        }
-    }
-}

src/devtools/StateKeys.qml

@@ -1,43 +0,0 @@
-// SPDX-FileCopyrightText: 2024 Tobias Fella <tobias.fella@kde.org>
-// SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
-
-import QtQuick
-import QtQuick.Layouts
-
-import org.kde.kirigami as Kirigami
-import org.kde.kirigamiaddons.formcard as FormCard
-import org.kde.kitemmodels
-
-import org.kde.neochat
-
-FormCard.FormCardPage {
-    id: root
-
-    required property NeoChatRoom room
-    required property string eventType
-
-    title: root.eventType
-
-    FormCard.FormHeader {
-        title: i18nc("The name of one instance of a state of configuration. Unless you really know what you're doing, best leave this untranslated.", "State Keys")
-    }
-    FormCard.FormCard {
-        Repeater {
-            model: StateKeysModel {
-                id: stateKeysModel
-                room: root.room
-                eventType: root.eventType
-            }
-
-            delegate: FormCard.FormButtonDelegate {
-                text: model.stateKey
-                onClicked: applicationWindow().pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'MessageSourceSheet.qml'), {
-                    sourceText: stateKeysModel.stateEventJson(stateKeysModel.index(model.index, 0))
-                }, {
-                    title: i18nc("@title:window", "Event Source"),
-                    width: Kirigami.Units.gridUnit * 25
-                })
-            }
-        }
-    }
-}

src/enums/delegatetype.h

@@ -6,13 +6,6 @@
 #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
  *
@@ -33,34 +26,23 @@ 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

@@ -1,130 +0,0 @@
-// 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. */
-        Itinerary, /**< A preview for a file that can integrate with KDE itinerary. */
-        Pdf, /**< A preview for a PDF 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. */
-        Verification, /**< A user verification session start 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

@@ -1,98 +0,0 @@
-// 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 (this should always be last). */
-    };
-    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;
-        }
-        if (room->isFavourite()) {
-            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,19 +14,15 @@
 #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"
@@ -35,10 +31,34 @@
 
 using namespace Quotient;
 
-EventHandler::EventHandler(const NeoChatRoom *room, const RoomEvent *event)
-    : m_room(room)
-    , m_event(event)
+const NeoChatRoom *EventHandler::getRoom() const
 {
+    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
@@ -51,14 +71,62 @@ QString EventHandler::getId() const
     return !m_event->id().isEmpty() ? m_event->id() : m_event->transactionId();
 }
 
-MessageComponentType::Type EventHandler::messageComponentType() const
+DelegateType::Type EventHandler::getDelegateTypeForEvent(const Quotient::RoomEvent *event) const
 {
-    if (m_event == nullptr) {
-        qCWarning(EventHandling) << "messageComponentType called with m_event set to nullptr.";
-        return MessageComponentType::Other;
+    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 MessageComponentType::typeForEvent(*m_event);
+    return DelegateType::Other;
+}
+
+DelegateType::Type EventHandler::getDelegateType() const
+{
+    if (m_event == nullptr) {
+        qCWarning(EventHandling) << "getDelegateType called with m_event set to nullptr.";
+        return DelegateType::Other;
+    }
+
+    return getDelegateTypeForEvent(m_event);
 }
 
 QVariantMap EventHandler::getAuthor(bool isPending) const
@@ -232,15 +300,6 @@ 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()) {
@@ -323,7 +382,8 @@ QString EventHandler::getBody(const Quotient::RoomEvent *event, Qt::TextFormat f
             }
 
             if (prettyPrint) {
-                subjectName = QStringLiteral("<a href=\"https://matrix.to/#/%1\">%2</a>").arg(e.userId(), subjectName);
+                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);
             }
 
             // The below code assumes senderName output in AuthorRole
@@ -434,22 +494,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());
         },
@@ -491,7 +551,7 @@ QString EventHandler::getMessageBody(const RoomMessageEvent &event, Qt::TextForm
     }
 
     if (format == Qt::RichText) {
-        return textHandler.handleRecieveRichText(inputFormat, m_room, &event, stripNewlines, event.isReplaced());
+        return textHandler.handleRecieveRichText(inputFormat, m_room, &event, stripNewlines);
     } else {
         return textHandler.handleRecievePlainText(inputFormat, stripNewlines);
     }
@@ -603,22 +663,19 @@ QString EventHandler::getGenericBody() const
         [](const RoomPowerLevelsEvent &) {
             return i18nc("'power level' means permission level", "changed the power levels 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");
+        [](const StateEvent &e) {
+            if (e.matrixType() == QLatin1String("m.room.server_acl")) {
+                return i18n("changed the server access control lists for this room");
             }
-            if (e.contentJson().isEmpty()) {
-                return i18n("removed 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");
             }
-            return i18n("configured a widget");
-        },
-        [](const StateEvent &) {
             return i18n("updated the state");
         },
         [](const PollStartEvent &e) {
@@ -656,7 +713,6 @@ QVariantMap EventHandler::getMediaInfoForEvent(const Quotient::RoomEvent *event)
 
     // Get the file info for the event.
     const EventContent::FileInfo *fileInfo;
-    bool isSticker = false;
     if (event->is<RoomMessageEvent>()) {
         auto roomMessageEvent = eventCast<const RoomMessageEvent>(event);
         if (!roomMessageEvent->hasFileContent()) {
@@ -666,15 +722,14 @@ QVariantMap EventHandler::getMediaInfoForEvent(const Quotient::RoomEvent *event)
     } else if (event->is<StickerEvent>()) {
         auto stickerEvent = eventCast<const StickerEvent>(event);
         fileInfo = &stickerEvent->image();
-        isSticker = true;
     } else {
         return {};
     }
 
-    return getMediaInfoFromFileInfo(fileInfo, eventId, false, isSticker);
+    return getMediaInfoFromFileInfo(fileInfo, eventId);
 }
 
-QVariantMap EventHandler::getMediaInfoFromFileInfo(const EventContent::FileInfo *fileInfo, const QString &eventId, bool isThumbnail, bool isSticker) const
+QVariantMap EventHandler::getMediaInfoFromFileInfo(const EventContent::FileInfo *fileInfo, const QString &eventId, bool isThumbnail) const
 {
     QVariantMap mediaInfo;
 
@@ -701,8 +756,6 @@ QVariantMap EventHandler::getMediaInfoFromFileInfo(const EventContent::FileInfo
     // Add media size if available.
     mediaInfo["size"_ls] = fileInfo->payloadSize;
 
-    mediaInfo["isSticker"_ls] = isSticker;
-
     // Add parameter depending on media type.
     if (mimeType.name().contains(QStringLiteral("image"))) {
         if (auto castInfo = static_cast<const EventContent::ImageContent *>(fileInfo)) {
@@ -779,22 +832,22 @@ QString EventHandler::getReplyId() const
     return m_event->contentJson()["m.relates_to"_ls].toObject()["m.in_reply_to"_ls].toObject()["event_id"_ls].toString();
 }
 
-MessageComponentType::Type EventHandler::replyMessageComponentType() const
+DelegateType::Type EventHandler::getReplyDelegateType() const
 {
     if (m_room == nullptr) {
-        qCWarning(EventHandling) << "replyMessageComponentType called with m_room set to nullptr.";
-        return MessageComponentType::Other;
+        qCWarning(EventHandling) << "getReplyDelegateType called with m_room set to nullptr.";
+        return DelegateType::Other;
     }
     if (m_event == nullptr) {
-        qCWarning(EventHandling) << "replyMessageComponentType called with m_event set to nullptr.";
-        return MessageComponentType::Other;
+        qCWarning(EventHandling) << "getReplyDelegateType called with m_event set to nullptr.";
+        return DelegateType::Other;
     }
 
     auto replyEvent = m_room->getReplyForEvent(*m_event);
     if (replyEvent == nullptr) {
-        return MessageComponentType::Other;
+        return DelegateType::Other;
     }
-    return MessageComponentType::typeForEvent(*replyEvent);
+    return getDelegateTypeForEvent(replyEvent);
 }
 
 QVariantMap EventHandler::getReplyAuthor() const

src/eventhandler.h

@@ -11,7 +11,7 @@
 #include <Quotient/events/roomevent.h>
 #include <Quotient/events/roommessageevent.h>
 
-#include "enums/messagecomponenttype.h"
+#include "enums/delegatetype.h"
 
 class LinkPreviewer;
 class NeoChatRoom;
@@ -31,12 +31,30 @@ class ReactionModel;
  *       information. This is to minimize warnings from QML especially during startup
  *       and room changes.
  */
-class EventHandler
+class EventHandler : public QObject
 {
-    Q_GADGET
+    Q_OBJECT
 
 public:
-    EventHandler(const NeoChatRoom *room, const Quotient::RoomEvent *event);
+    /**
+     * @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);
 
     /**
      * @brief Return the Matrix ID of the event.
@@ -44,9 +62,13 @@ public:
     QString getId() const;
 
     /**
-     * @brief The MessageComponentType to use to visualise the main event content.
+     * @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.
      */
-    MessageComponentType::Type messageComponentType() const;
+    DelegateType::Type getDelegateType() const;
 
     /**
      * @brief Get the author of the event in context of the room.
@@ -137,14 +159,6 @@ 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.
      *
@@ -229,7 +243,6 @@ public:
      *  - width - The width in pixels of the audio media.
      *  - height - The height in pixels of the audio media.
      *  - tempInfo - mediaInfo (with the same properties as this except no tempInfo) for a temporary image while the file downloads.
-     *  - isSticker - Whether the image is a sticker or not
      */
     QVariantMap getMediaInfo() const;
 
@@ -244,9 +257,13 @@ public:
     QString getReplyId() const;
 
     /**
-     * @brief The MessageComponentType to use to visualise the reply content.
+     * @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.
      */
-    MessageComponentType::Type replyMessageComponentType() const;
+    DelegateType::Type getReplyDelegateType() const;
 
     /**
      * @brief Get the author of the event replied to in context of the room.
@@ -321,7 +338,6 @@ public:
      *  - width - The width in pixels of the audio media.
      *  - height - The height in pixels of the audio media.
      *  - tempInfo - mediaInfo (with the same properties as this except no tempInfo) for a temporary image while the file downloads.
-     *  - isSticker - Whether the image is a sticker or not
      */
     QVariantMap getReplyMediaInfo() const;
 
@@ -403,10 +419,11 @@ 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;
 
     QVariantMap getMediaInfoForEvent(const Quotient::RoomEvent *event) const;
-    QVariantMap
-    getMediaInfoFromFileInfo(const Quotient::EventContent::FileInfo *fileInfo, const QString &eventId, bool isThumbnail = false, bool isSticker = false) const;
+    QVariantMap getMediaInfoFromFileInfo(const Quotient::EventContent::FileInfo *fileInfo, const QString &eventId, bool isThumbnail = false) const;
 };

src/events/locationbeaconevent.h

@@ -1,14 +0,0 @@
-// 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

@@ -1,14 +0,0 @@
-// 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

@@ -1,14 +0,0 @@
-// 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/filetype.cpp

@@ -41,12 +41,6 @@ FileType::~FileType() noexcept
 {
 }
 
-FileType &FileType::instance()
-{
-    static FileType _instance;
-    return _instance;
-}
-
 QMimeType FileType::mimeTypeForName(const QString &nameOrAlias) const
 {
     Q_D(const FileType);
@@ -119,10 +113,4 @@ QStringList FileType::supportedAnimatedImageFormats() const
     return d->supportedAnimatedImageFormats;
 }
 
-bool FileType::fileHasImage(const QUrl &file) const
-{
-    const auto mimeType = mimeTypeForFile(file.toString());
-    return mimeType.isValid() && supportedImageFormats().contains(mimeType.preferredSuffix());
-}
-
 #include "moc_filetype.cpp"

src/filetype.h

@@ -41,13 +41,8 @@ class FileType : public QObject
     Q_PROPERTY(QStringList supportedAnimatedImageFormats READ supportedAnimatedImageFormats CONSTANT FINAL)
 
 public:
+    explicit FileType(QObject *parent = nullptr);
     ~FileType();
-    static FileType &instance();
-    static FileType *create(QQmlEngine *engine, QJSEngine *)
-    {
-        engine->setObjectOwnership(&instance(), QQmlEngine::CppOwnership);
-        return &instance();
-    }
 
     /**
      * @brief Returns a MIME type for nameOrAlias or an invalid one if none found.
@@ -125,11 +120,7 @@ public:
     QStringList supportedImageFormats() const;
     QStringList supportedAnimatedImageFormats() const;
 
-    bool fileHasImage(const QUrl &file) const;
-
 private:
-    explicit FileType(QObject *parent = nullptr);
-
     const QScopedPointer<FileTypePrivate> d_ptr;
     Q_DECLARE_PRIVATE(FileType)
     Q_DISABLE_COPY(FileType)

src/linkpreviewer.cpp

@@ -13,8 +13,8 @@
 
 using namespace Quotient;
 
-LinkPreviewer::LinkPreviewer(const NeoChatRoom *room, const Quotient::RoomMessageEvent *event, QObject *parent)
-    : QObject(parent)
+LinkPreviewer::LinkPreviewer(const NeoChatRoom *room, const Quotient::RoomMessageEvent *event)
+    : QObject(nullptr)
     , 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, QObject *parent = nullptr);
+    explicit LinkPreviewer(const NeoChatRoom *room = nullptr, const Quotient::RoomMessageEvent *event = nullptr);
 
     [[nodiscard]] QUrl url() const;
     [[nodiscard]] bool loaded() const;

src/main.cpp

@@ -11,7 +11,6 @@
 #include <QQmlNetworkAccessManagerFactory>
 #include <QQuickStyle>
 #include <QQuickWindow>
-#include <QtQml/QQmlExtensionPlugin>
 
 #ifdef Q_OS_ANDROID
 #include <QGuiApplication>
@@ -35,11 +34,6 @@
 
 #include "neochat-version.h"
 
-#include <Quotient/accountregistry.h>
-#if __has_include("Quotient/e2ee/sssshandler.h")
-#include <Quotient/e2ee/sssshandler.h>
-#endif
-#include <Quotient/keyverificationsession.h>
 #include <Quotient/networkaccessmanager.h>
 
 #include "blurhashimageprovider.h"
@@ -50,7 +44,6 @@
 #include "neochatconfig.h"
 #include "roommanager.h"
 #include "windowcontroller.h"
-#include "sharehandler.h"
 
 #ifdef HAVE_RUNNER
 #include "runner.h"
@@ -151,7 +144,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 libQuotient"), QStringLiteral("Kitsune-Ral@users.sf.net"));
+    about.addCredit(i18n("Alexey Rusakov"), i18n("Maintainer of Quotient"), QStringLiteral("Kitsune-Ral@users.sf.net"));
     about.setTranslator(i18nc("NAME OF TRANSLATORS", "Your names"), i18nc("EMAIL OF TRANSLATORS", "Your emails"));
     about.setOrganizationDomain("kde.org");
 
@@ -198,9 +191,6 @@ int main(int argc, char *argv[])
     parser.addOption(dbusActivatedOption);
 #endif
 
-    QCommandLineOption shareOption(QStringLiteral("share"), i18n("Share a URL to Matrix"), QStringLiteral("text"));
-    parser.addOption(shareOption);
-
     about.setupCommandLine(&parser);
     parser.process(app);
     about.processCommandLine(&parser);
@@ -228,49 +218,36 @@ int main(int argc, char *argv[])
     KDBusService service(KDBusService::Unique);
 #endif
 
-    Q_IMPORT_QML_PLUGIN(org_kde_neochat_settingsPlugin)
-    Q_IMPORT_QML_PLUGIN(org_kde_neochat_timelinePlugin)
-    Q_IMPORT_QML_PLUGIN(org_kde_neochat_devtoolsPlugin)
-
     qml_register_types_org_kde_neochat();
     qmlRegisterSingletonInstance("org.kde.neochat.config", 1, 0, "Config", NeoChatConfig::self());
     qmlRegisterSingletonInstance("org.kde.neochat.accounts", 1, 0, "AccountRegistry", &Controller::instance().accounts());
 
     qmlRegisterUncreatableType<KeyVerificationSession>("com.github.quotient_im.libquotient", 1, 0, "KeyVerificationSession", {});
-#if __has_include("Quotient/e2ee/sssshandler.h")
-    qmlRegisterType<SSSSHandler>("com.github.quotient_im.libquotient", 1, 0, "SSSSHandler");
-#endif
 
     QQmlApplicationEngine engine;
 
 #ifdef HAVE_KDBUSADDONS
     service.connect(&service,
-        &KDBusService::activateRequested,
-        &RoomManager::instance(),
-        [&engine](const QStringList &arguments, const QString &workingDirectory) {
-            Q_UNUSED(workingDirectory);
+                    &KDBusService::activateRequested,
+                    &RoomManager::instance(),
+                    [&engine](const QStringList &arguments, const QString &workingDirectory) {
+                        Q_UNUSED(workingDirectory);
 
-            QWindow *window = windowFromEngine(&engine);
-            KWindowSystem::updateStartupId(window);
+                        QWindow *window = windowFromEngine(&engine);
+                        KWindowSystem::updateStartupId(window);
 
-            WindowController::instance().showAndRaiseWindow(QString());
+                        WindowController::instance().showAndRaiseWindow(QString());
 
-            // Open matrix uri
-            if (arguments.isEmpty()) {
-                return;
-            }
-
-            auto args = arguments;
-            args.removeFirst();
-            if (args.length() == 2 && args[0] == "--share"_ls) {
-                ShareHandler::instance().setText(args[1]);
-                return;
-            }
-
-            for (const auto &arg : args) {
-                RoomManager::instance().resolveResource(arg);
-            }
-        });
+                        // Open matrix uri
+                        if (arguments.isEmpty()) {
+                            return;
+                        }
+                        auto args = arguments;
+                        args.removeFirst();
+                        for (const auto &arg : args) {
+                            RoomManager::instance().resolveResource(arg);
+                        }
+                    });
 #endif
 
     engine.rootContext()->setContextObject(new KLocalizedContext(&engine));
@@ -283,19 +260,15 @@ int main(int argc, char *argv[])
         });
     }
 
-    if (parser.isSet("share"_ls)) {
-        ShareHandler::instance().setText(parser.value(shareOption));
-    }
-
     engine.addImageProvider(QLatin1String("mxc"), MatrixImageProvider::create(&engine, &engine));
     engine.addImageProvider(QLatin1String("blurhash"), new BlurhashImageProvider);
 
-    engine.load(QUrl(QStringLiteral("qrc:/qt/qml/org/kde/neochat/qml/main.qml")));
+    engine.load(QUrl(QStringLiteral("qrc:/org/kde/neochat/qml/main.qml")));
     if (engine.rootObjects().isEmpty()) {
         return -1;
     }
 
-    if (!parser.positionalArguments().isEmpty() && !parser.isSet("share"_ls)) {
+    if (!parser.positionalArguments().isEmpty()) {
         RoomManager::instance().setUrlArgument(parser.positionalArguments()[0]);
     }
 

src/mediamanager.cpp

@@ -1,9 +0,0 @@
-// 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

@@ -1,42 +0,0 @@
-// 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().resolveResource(targetRoom->id());
+                RoomManager::instance().enterRoom(dynamic_cast<NeoChatRoom *>(targetRoom));
                 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().resolveResource(targetRoom->id());
+                RoomManager::instance().enterRoom(dynamic_cast<NeoChatRoom *>(targetRoom));
                 return QString();
             }
             Q_EMIT room->showMessage(NeoChatRoom::Info, i18nc("Knocking room <roomname>.", "Knocking room %1.", text));

src/models/completionmodel.cpp

@@ -91,9 +91,7 @@ QVariant CompletionModel::data(const QModelIndex &index, int role) const
             if (mediaId.isEmpty()) {
                 return QVariant();
             }
-            if (m_room) {
-                return m_room->connection()->makeMediaUrl(QUrl(QStringLiteral("mxc://%1").arg(mediaId)));
-            }
+            return m_room->connection()->makeMediaUrl(QUrl(QStringLiteral("mxc://%1").arg(mediaId)));
         }
     }
     if (m_autoCompletionType == Emoji) {

src/models/completionmodel.h

@@ -118,7 +118,7 @@ private:
     QString m_text;
     QString m_fullText;
     CompletionProxyModel *m_filterModel;
-    QPointer<NeoChatRoom> m_room;
+    NeoChatRoom *m_room = nullptr;
     AutoCompletionType m_autoCompletionType = None;
 
     void updateCompletion();

src/models/customemojimodel.cpp

@@ -161,7 +161,7 @@ QVariant CustomEmojiModel::data(const QModelIndex &idx, int role) const
     case Roles::ImageURL:
         return QUrl(QStringLiteral("image://mxc/") + data.url.mid(6));
     case Roles::MxcUrl:
-        return m_connection->makeMediaUrl(QUrl(data.url));
+        return data.url.mid(6);
     default:
         return {};
     }

src/models/devicesmodel.cpp

@@ -19,15 +19,6 @@ using namespace Quotient;
 DevicesModel::DevicesModel(QObject *parent)
     : QAbstractListModel(parent)
 {
-    connect(m_connection, &Connection::sessionVerified, this, [this](const QString &, const QString &deviceId) {
-        const auto it = std::find_if(m_devices.begin(), m_devices.end(), [deviceId](const Quotient::Device &device) {
-            return device.deviceId == deviceId;
-        });
-        if (it != m_devices.end()) {
-            const auto index = this->index(it - m_devices.begin());
-            Q_EMIT dataChanged(index, index, {Type});
-        }
-    });
 }
 
 void DevicesModel::fetchDevices()

src/models/imagepacksmodel.cpp

@@ -64,13 +64,11 @@ void ImagePacksModel::setRoom(NeoChatRoom *room)
     }
     m_room = room;
 
-    if (m_room) {
-        connect(m_room->connection(), &Connection::accountDataChanged, this, [this](const QString &type) {
-            if (type == "im.ponies.user_emotes"_ls) {
-                reloadImages();
-            }
-        });
-    }
+    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();
@@ -78,9 +76,6 @@ void ImagePacksModel::setRoom(NeoChatRoom *room)
 
 void ImagePacksModel::reloadImages()
 {
-    if (!m_room) {
-        return;
-    }
     beginResetModel();
     m_events.clear();
 

src/models/itinerarymodel.cpp

@@ -1,210 +0,0 @@
-// SPDX-FileCopyrightText: 2024 Tobias Fella <tobias.fella@kde.org>
-// SPDX-License-Identifier: LGPL-2.0-or-later
-
-#include "itinerarymodel.h"
-
-#include <QJsonDocument>
-#include <QProcess>
-
-#include "config-neochat.h"
-
-#ifndef Q_OS_ANDROID
-#include <KIO/ApplicationLauncherJob>
-#endif
-
-ItineraryModel::ItineraryModel(QObject *parent)
-    : QAbstractListModel(parent)
-{
-}
-
-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")) {
-            auto trainName = QStringLiteral("%1 %2").arg(data[QStringLiteral("reservationFor")][QStringLiteral("trainName")].toString(),
-                                                         data[QStringLiteral("reservationFor")][QStringLiteral("trainNumber")].toString());
-            if (trainName.trimmed().isEmpty()) {
-                return QStringLiteral("%1 to %2")
-                    .arg(data[QStringLiteral("reservationFor")][QStringLiteral("departureStation")][QStringLiteral("name")].toString(),
-                         data[QStringLiteral("reservationFor")][QStringLiteral("arrivalStation")][QStringLiteral("name")].toString());
-                ;
-            }
-            return trainName;
-        }
-        if (data[QStringLiteral("@type")] == QStringLiteral("LodgingReservation")) {
-            return data[QStringLiteral("reservationFor")][QStringLiteral("name")];
-        }
-        if (data[QStringLiteral("@type")] == QStringLiteral("FoodEstablishmentReservation")) {
-            return data[QStringLiteral("reservationFor")][QStringLiteral("name")];
-        }
-        if (data[QStringLiteral("@type")] == QStringLiteral("FlightReservation")) {
-            return QStringLiteral("%1 %2 %3 → %4")
-                .arg(data[QStringLiteral("reservationFor")][QStringLiteral("airline")][QStringLiteral("iataCode")].toString(),
-                     data[QStringLiteral("reservationFor")][QStringLiteral("flightNumber")].toString(),
-                     data[QStringLiteral("reservationFor")][QStringLiteral("departureAirport")][QStringLiteral("iataCode")].toString(),
-                     data[QStringLiteral("reservationFor")][QStringLiteral("arrivalAirport")][QStringLiteral("iataCode")].toString());
-        }
-    }
-    if (role == TypeRole) {
-        return data[QStringLiteral("@type")];
-    }
-    if (role == DepartureLocationRole) {
-        if (data[QStringLiteral("@type")] == QStringLiteral("TrainReservation")) {
-            return data[QStringLiteral("reservationFor")][QStringLiteral("departureStation")][QStringLiteral("name")];
-        }
-        if (data[QStringLiteral("@type")] == QStringLiteral("FlightReservation")) {
-            return data[QStringLiteral("reservationFor")][QStringLiteral("departureAirport")][QStringLiteral("iataCode")];
-        }
-    }
-    if (role == DepartureAddressRole) {
-        if (data[QStringLiteral("@type")] == QStringLiteral("TrainReservation")) {
-            return data[QStringLiteral("reservationFor")][QStringLiteral("departureStation")][QStringLiteral("address")][QStringLiteral("addressCountry")]
-                .toString();
-        }
-        if (data[QStringLiteral("@type")] == QStringLiteral("FlightReservation")) {
-            return data[QStringLiteral("reservationFor")][QStringLiteral("departureAirport")][QStringLiteral("address")][QStringLiteral("addressCountry")]
-                .toString();
-        }
-    }
-    if (role == ArrivalLocationRole) {
-        if (data[QStringLiteral("@type")] == QStringLiteral("TrainReservation")) {
-            return data[QStringLiteral("reservationFor")][QStringLiteral("arrivalStation")][QStringLiteral("name")];
-        }
-        if (data[QStringLiteral("@type")] == QStringLiteral("FlightReservation")) {
-            return data[QStringLiteral("reservationFor")][QStringLiteral("arrivalAirport")][QStringLiteral("iataCode")];
-        }
-    }
-    if (role == ArrivalAddressRole) {
-        if (data[QStringLiteral("@type")] == QStringLiteral("TrainReservation")) {
-            return data[QStringLiteral("reservationFor")][QStringLiteral("arrivalStation")][QStringLiteral("address")][QStringLiteral("addressCountry")]
-                .toString();
-        }
-        if (data[QStringLiteral("@type")] == QStringLiteral("FlightReservation")) {
-            return data[QStringLiteral("reservationFor")][QStringLiteral("arrivalAirport")][QStringLiteral("address")][QStringLiteral("addressCountry")]
-                .toString();
-        }
-    }
-    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) {
-        QDateTime dateTime;
-        if (data[QStringLiteral("@type")] == QStringLiteral("LodgingReservation")) {
-            dateTime = data[QStringLiteral("checkinTime")][QStringLiteral("@value")].toVariant().toDateTime();
-        }
-        if (data[QStringLiteral("@type")] == QStringLiteral("FoodEstablishmentReservation")) {
-            dateTime = data[QStringLiteral("startTime")][QStringLiteral("@value")].toVariant().toDateTime();
-        }
-        if (data[QStringLiteral("@type")] == QStringLiteral("FlightReservation")) {
-            dateTime = data[QStringLiteral("reservationFor")][QStringLiteral("boardingTime")][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"},
-        {DepartureLocationRole, "departureLocation"},
-        {DepartureAddressRole, "departureAddress"},
-        {ArrivalLocationRole, "arrivalLocation"},
-        {ArrivalAddressRole, "arrivalAddress"},
-        {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)
-{
-    m_path = path;
-    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();
-
-        Q_EMIT loaded();
-    });
-    connect(process, &QProcess::errorOccurred, this, [this]() {
-        Q_EMIT loadErrorOccurred();
-    });
-}
-
-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

@@ -1,57 +0,0 @@
-// SPDX-FileCopyrightText: 2024 Tobias Fella <tobias.fella@kde.org>
-// SPDX-License-Identifier: LGPL-2.0-or-later
-
-#pragma once
-
-#include <QAbstractListModel>
-#include <QJsonArray>
-#include <QPointer>
-#include <QQmlEngine>
-#include <QString>
-
-class ItineraryModel : public QAbstractListModel
-{
-    Q_OBJECT
-    QML_ELEMENT
-    QML_UNCREATABLE("")
-
-public:
-    enum Roles {
-        NameRole = Qt::DisplayRole,
-        TypeRole,
-        DepartureLocationRole,
-        ArrivalLocationRole,
-        DepartureTimeRole,
-        DepartureAddressRole,
-        ArrivalTimeRole,
-        ArrivalAddressRole,
-        AddressRole,
-        StartTimeRole,
-        EndTimeRole,
-        DeparturePlatformRole,
-        ArrivalPlatformRole,
-        CoachRole,
-        SeatRole,
-    };
-    Q_ENUM(Roles)
-    explicit ItineraryModel(QObject *parent = nullptr);
-
-    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 loaded();
-    void loadErrorOccurred();
-
-private:
-    QJsonArray m_data;
-    QString m_path;
-    void loadData();
-};

src/models/linemodel.cpp

@@ -1,64 +0,0 @@
-// 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

@@ -1,80 +0,0 @@
-// 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::MediaInfoRole).toMap()[QLatin1String("mimeType")].toString().contains(QLatin1String("image"))
-        || index.data(MessageEventModel::MediaInfoRole).toMap()[QLatin1String("mimeType")].toString().contains(QLatin1String("video"))) {
+    if (index.data(MessageEventModel::DelegateTypeRole).toInt() == DelegateType::Image
+        || index.data(MessageEventModel::DelegateTypeRole).toInt() == DelegateType::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::MediaInfoRole).toMap()[QLatin1String("mimeType")].toString().contains(QLatin1String("image"))) {
+        if (mapToSource(index).data(MessageEventModel::DelegateTypeRole).toInt() == DelegateType::Image) {
             return mapToSource(index).data(MessageEventModel::MediaInfoRole).toMap()[QStringLiteral("source")].toUrl();
-        } else if (mapToSource(index).data(MessageEventModel::MediaInfoRole).toMap()[QLatin1String("mimeType")].toString().contains(QLatin1String("video"))) {
+        } else if (mapToSource(index).data(MessageEventModel::DelegateTypeRole).toInt() == DelegateType::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::MediaInfoRole).toMap()[QLatin1String("mimeType")].toString().contains(QLatin1String("image"))) {
+        if (mapToSource(index).data(MessageEventModel::DelegateTypeRole).toInt() == DelegateType::Image) {
             return MediaType::Image;
         } else {
             return MediaType::Video;

src/models/messagecontentmodel.cpp

@@ -1,356 +0,0 @@
-// 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 <QImageReader>
-
-#include <Quotient/events/redactionevent.h>
-#include <Quotient/events/roommessageevent.h>
-#include <Quotient/events/stickerevent.h>
-#include <Quotient/room.h>
-
-#include <KLocalizedString>
-
-#ifndef Q_OS_ANDROID
-#include <KSyntaxHighlighting/Definition>
-#include <KSyntaxHighlighting/Repository>
-#endif
-
-#include "chatbarcache.h"
-#include "enums/messagecomponenttype.h"
-#include "eventhandler.h"
-#include "filetype.h"
-#include "itinerarymodel.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()) {
-                updateComponents();
-                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()) {
-                updateComponents();
-                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 == ItineraryModelRole) {
-        return QVariant::fromValue<ItineraryModel *>(m_itineraryModel);
-    }
-    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[ItineraryModelRole] = "itineraryModel";
-    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();
-
-    if (eventCast<const Quotient::RoomMessageEvent>(m_event)
-        && eventCast<const Quotient::RoomMessageEvent>(m_event)->rawMsgtype() == QStringLiteral("m.key.verification.request")) {
-        m_components += MessageComponent{MessageComponentType::Verification, QString(), {}};
-    } else {
-        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 (m_event->isRedacted()) {
-            m_components += MessageComponent{MessageComponentType::Text, 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 if (eventHandler.messageComponentType() == MessageComponentType::File) {
-                m_components += MessageComponent{MessageComponentType::File, QString(), {}};
-                if (m_emptyItinerary) {
-                    Quotient::FileTransferInfo fileTransferInfo;
-                    if (auto event = eventCast<const Quotient::RoomMessageEvent>(m_event)) {
-                        if (event->hasFileContent()) {
-                            fileTransferInfo = m_room->fileTransferInfo(event->id());
-                        }
-                    }
-                    if (auto event = eventCast<const Quotient::StickerEvent>(m_event)) {
-                        fileTransferInfo = m_room->fileTransferInfo(event->id());
-                    }
-
-#ifndef Q_OS_ANDROID
-                    KSyntaxHighlighting::Repository repository;
-                    const auto definitionForFile = repository.definitionForFileName(fileTransferInfo.localPath.toString());
-                    if (definitionForFile.isValid() || QFileInfo(fileTransferInfo.localPath.path()).suffix() == QStringLiteral("txt")) {
-                        QFile file(fileTransferInfo.localPath.path());
-                        file.open(QIODevice::ReadOnly);
-                        m_components += MessageComponent{MessageComponentType::Code,
-                                                         QString::fromStdString(file.readAll().toStdString()),
-                                                         {{QStringLiteral("class"), definitionForFile.name()}}};
-                    }
-#endif
-
-                    if (FileType::instance().fileHasImage(fileTransferInfo.localPath)) {
-                        QImageReader reader(fileTransferInfo.localPath.path());
-                        m_components += MessageComponent{MessageComponentType::Pdf, QString(), {{QStringLiteral("size"), reader.size()}}};
-                    }
-                } else {
-                    updateItineraryModel();
-                    if (m_itineraryModel != nullptr) {
-                        m_components += MessageComponent{MessageComponentType::Itinerary, QString(), {}};
-                    }
-                }
-            } 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();
-}
-
-void MessageContentModel::updateItineraryModel()
-{
-    if (m_room == nullptr || m_event == nullptr) {
-        return;
-    }
-
-    if (auto event = eventCast<const Quotient::RoomMessageEvent>(m_event)) {
-        if (event->hasFileContent()) {
-            auto filePath = m_room->fileTransferInfo(event->id()).localPath;
-            if (filePath.isEmpty() && m_itineraryModel != nullptr) {
-                delete m_itineraryModel;
-                m_itineraryModel = nullptr;
-            } else if (!filePath.isEmpty()) {
-                if (m_itineraryModel == nullptr) {
-                    m_itineraryModel = new ItineraryModel(this);
-                    connect(m_itineraryModel, &ItineraryModel::loaded, this, [this]() {
-                        if (m_itineraryModel->rowCount() == 0) {
-                            m_itineraryModel->deleteLater();
-                            m_itineraryModel = nullptr;
-                            m_emptyItinerary = true;
-                            updateComponents();
-                        }
-                    });
-                    connect(m_itineraryModel, &ItineraryModel::loadErrorOccurred, this, [this]() {
-                        m_itineraryModel->deleteLater();
-                        m_itineraryModel = nullptr;
-                        m_emptyItinerary = true;
-                        updateComponents();
-                    });
-                }
-                m_itineraryModel->setPath(filePath.toString());
-            }
-        }
-    }
-}

src/models/messagecontentmodel.h

@@ -1,101 +0,0 @@
-// 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 "itinerarymodel.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. */
-        ItineraryModelRole, /**< The itinerary model for a file. */
-        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:
-    QPointer<NeoChatRoom> m_room;
-    const Quotient::RoomEvent *m_event = nullptr;
-
-    QList<MessageComponent> m_components;
-    void updateComponents(bool isEditing = false);
-
-    LinkPreviewer *m_linkPreviewer = nullptr;
-    ItineraryModel *m_itineraryModel = nullptr;
-
-    void updateItineraryModel();
-    bool m_emptyItinerary = false;
-};

src/models/messageeventmodel.cpp

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
 #include "messageeventmodel.h"
-#include "messagecomponenttype.h"
+#include "linkpreviewer.h"
 #include "messageeventmodel_logging.h"
 
 #include "neochatconfig.h"
@@ -10,7 +10,6 @@
 #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>
 
@@ -23,9 +22,6 @@
 #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"
 
@@ -35,6 +31,7 @@ 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";
@@ -43,8 +40,18 @@ 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";
@@ -57,9 +64,10 @@ QHash<int, QByteArray> MessageEventModel::roleNames() const
     roles[IsRedactedRole] = "isRedacted";
     roles[GenericDisplayRole] = "genericDisplay";
     roles[IsPendingRole] = "isPending";
-    roles[ContentModelRole] = "contentModel";
-    roles[MediaInfoRole] = "mediaInfo";
-    roles[IsEditableRole] = "isEditable";
+    roles[LatitudeRole] = "latitude";
+    roles[LongitudeRole] = "longitude";
+    roles[AssetRole] = "asset";
+    roles[PollHandlerRole] = "pollHandler";
     return roles;
 }
 
@@ -88,6 +96,7 @@ void MessageEventModel::setRoom(NeoChatRoom *room)
     beginResetModel();
     if (m_currentRoom) {
         m_currentRoom->disconnect(this);
+        m_linkPreviewers.clear();
         m_reactionModels.clear();
     }
 
@@ -110,6 +119,14 @@ 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) {
@@ -178,7 +195,7 @@ void MessageEventModel::setRoom(NeoChatRoom *room)
             }
             if (biggest < m_currentRoom->maxTimelineIndex()) {
                 auto rowBelowInserted = m_currentRoom->maxTimelineIndex() - biggest + timelineBaseIndex() - 1;
-                refreshEventRoles(rowBelowInserted, {MessageFilterModel::ShowAuthorRole});
+                refreshEventRoles(rowBelowInserted, {ShowAuthorRole});
             }
             for (auto i = m_currentRoom->maxTimelineIndex() - biggest; i <= m_currentRoom->maxTimelineIndex() - lowest; ++i) {
                 refreshLastUserEvents(i);
@@ -208,7 +225,7 @@ void MessageEventModel::setRoom(NeoChatRoom *room)
             refreshRow(timelineBaseIndex()); // Refresh the looks
             refreshLastUserEvents(0);
             if (timelineBaseIndex() > 0) { // Refresh below, see #312
-                refreshEventRoles(timelineBaseIndex() - 1, {MessageFilterModel::ShowAuthorRole});
+                refreshEventRoles(timelineBaseIndex() - 1, {ShowAuthorRole});
             }
         });
         connect(m_currentRoom, &Room::pendingEventChanged, this, &MessageEventModel::refreshRow);
@@ -221,6 +238,7 @@ 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);
@@ -247,6 +265,10 @@ 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();
@@ -417,6 +439,8 @@ 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)) {
@@ -457,7 +481,9 @@ 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(m_currentRoom, &evt);
+    EventHandler eventHandler;
+    eventHandler.setRoom(m_currentRoom);
+    eventHandler.setEvent(&evt);
 
     if (role == Qt::DisplayRole) {
         if (evt.isRedacted()) {
@@ -468,24 +494,16 @@ 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 DelegateType::typeForEvent(evt);
+        return eventHandler.getDelegateType();
     }
 
     if (role == AuthorRole) {
@@ -543,6 +561,46 @@ 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();
     }
@@ -551,6 +609,25 @@ 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);
@@ -567,6 +644,18 @@ 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();
     }
@@ -616,12 +705,8 @@ QVariant MessageEventModel::data(const QModelIndex &idx, int role) const
         return row < static_cast<int>(m_currentRoom->pendingEvents().size());
     }
 
-    if (role == MediaInfoRole) {
-        return eventHandler.getMediaInfo();
-    }
-
-    if (role == IsEditableRole) {
-        return eventHandler.messageComponentType() == MessageComponentType::Text && evt.senderId() == m_currentRoom->localUser()->id();
+    if (role == PollHandlerRole) {
+        return QVariant::fromValue<PollHandler *>(m_currentRoom->poll(evt.id()));
     }
 
     return {};
@@ -629,10 +714,6 @@ QVariant MessageEventModel::data(const QModelIndex &idx, int role) const
 
 int MessageEventModel::eventIdToRow(const QString &eventID) const
 {
-    if (m_currentRoom == nullptr) {
-        return -1;
-    }
-
     const auto it = m_currentRoom->findInTimeline(eventID);
     if (it == m_currentRoom->historyEdge()) {
         // qWarning() << "Trying to find inexistent event:" << eventID;
@@ -645,6 +726,16 @@ 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)) {
@@ -672,7 +763,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, ReadMarkersRole});
+        Q_EMIT dataChanged(index(0, 0), index(rowCount() - 1, 0), {AuthorRole, ReplyAuthor, ReadMarkersRole});
     }
     return QObject::event(event);
 }

src/models/messageeventmodel.h

@@ -40,6 +40,7 @@ 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). */
@@ -49,13 +50,23 @@ 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. */
 
-        ContentModelRole, /**< The MessageContentModel 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. */
 
         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. */
@@ -69,7 +80,10 @@ 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. */
-        IsEditableRole, /**< Whether the event can be edited by the user. */
+        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. */
         LastRole, // Keep this last
     };
     Q_ENUM(EventRoles)
@@ -113,7 +127,7 @@ private Q_SLOTS:
     void refreshRow(int row);
 
 private:
-    QPointer<NeoChatRoom> m_currentRoom = nullptr;
+    NeoChatRoom *m_currentRoom = nullptr;
     QString lastReadEventId;
     QPersistentModelIndex m_lastReadEventIndex;
     int rowBelowInserted = -1;
@@ -121,6 +135,7 @@ 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,24 +80,8 @@ 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 QSortFilterProxyModel::data(index, role);
+    return sourceModel()->data(mapToSource(index), role);
 }
 
 QHash<int, QByteArray> MessageFilterModel::roleNames() const
@@ -107,7 +91,6 @@ QHash<int, QByteArray> MessageFilterModel::roleNames() const
     roles[StateEventsRole] = "stateEvents";
     roles[AuthorListRole] = "authorList";
     roles[ExcessAuthorsRole] = "excessAuthors";
-    roles[ShowAuthorRole] = "showAuthor";
     return roles;
 }
 
@@ -144,8 +127,9 @@ 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\">%3</a> ")
+                                                      : QStringLiteral("<a href=\"https://matrix.to/#/%1\" style=\"color: %2\">%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,7 +34,6 @@ 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,7 +122,9 @@ 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(dynamic_cast<NeoChatRoom *>(room), roomEvent);
+                EventHandler eventHandler;
+                eventHandler.setRoom(dynamic_cast<NeoChatRoom *>(room));
+                eventHandler.setEvent(roomEvent);
                 beginInsertRows({}, m_notifications.length(), m_notifications.length());
                 m_notifications += Notification{
                     .roomId = notification.roomId,

src/models/publicroomlistmodel.cpp

@@ -5,8 +5,6 @@
 
 #include <Quotient/connection.h>
 
-#include "publicroomlist_logging.h"
-
 using namespace Quotient;
 
 PublicRoomListModel::PublicRoomListModel(QObject *parent)
@@ -43,7 +41,7 @@ void PublicRoomListModel::setConnection(Connection *conn)
     if (job) {
         job->abandon();
         job = nullptr;
-        Q_EMIT searchingChanged();
+        Q_EMIT loadingChanged();
     }
 
     if (m_connection) {
@@ -52,6 +50,7 @@ void PublicRoomListModel::setConnection(Connection *conn)
 
     Q_EMIT connectionChanged();
     Q_EMIT serverChanged();
+    Q_EMIT hasMoreChanged();
 }
 
 QString PublicRoomListModel::server() const
@@ -72,13 +71,14 @@ void PublicRoomListModel::setServer(const QString &value)
     nextBatch = QString();
     attempted = false;
     rooms.clear();
+    Q_EMIT loadingChanged();
 
     endResetModel();
 
     if (job) {
         job->abandon();
         job = nullptr;
-        Q_EMIT searchingChanged();
+        Q_EMIT loadingChanged();
     }
 
     if (m_connection) {
@@ -86,30 +86,42 @@ void PublicRoomListModel::setServer(const QString &value)
     }
 
     Q_EMIT serverChanged();
+    Q_EMIT hasMoreChanged();
 }
 
-QString PublicRoomListModel::searchText() const
+QString PublicRoomListModel::keyword() const
 {
-    return m_searchText;
+    return m_keyword;
 }
 
-void PublicRoomListModel::setSearchText(const QString &value)
+void PublicRoomListModel::setKeyword(const QString &value)
 {
-    if (m_searchText == value) {
+    if (m_keyword == value) {
         return;
     }
 
-    m_searchText = value;
-    Q_EMIT searchTextChanged();
+    m_keyword = value;
+
+    beginResetModel();
 
     nextBatch = QString();
     attempted = false;
+    rooms.clear();
+
+    endResetModel();
 
     if (job) {
         job->abandon();
         job = nullptr;
-        Q_EMIT searchingChanged();
+        Q_EMIT loadingChanged();
     }
+
+    if (m_connection) {
+        next();
+    }
+
+    Q_EMIT keywordChanged();
+    Q_EMIT hasMoreChanged();
 }
 
 bool PublicRoomListModel::showOnlySpaces() const
@@ -124,39 +136,17 @@ void PublicRoomListModel::setShowOnlySpaces(bool showOnlySpaces)
     }
     m_showOnlySpaces = showOnlySpaces;
     Q_EMIT showOnlySpacesChanged();
-
-    nextBatch = QString();
-    attempted = false;
-
-    if (job) {
-        job->abandon();
-        job = nullptr;
-        Q_EMIT searchingChanged();
-    }
 }
 
-void PublicRoomListModel::search(int limit)
+void PublicRoomListModel::next(int count)
 {
-    if (limit < 1 || attempted) {
+    if (count < 1) {
         return;
     }
 
     if (job) {
-        qCDebug(PublicRoomList) << "Other job running, ignore";
-        return;
-    }
+        qDebug() << "PublicRoomListModel: Other jobs running, ignore";
 
-    next(limit);
-}
-
-void PublicRoomListModel::next(int limit)
-{
-    if (m_connection == nullptr || limit < 1) {
-        return;
-    }
-
-    if (job) {
-        qCDebug(PublicRoomList) << "Other job running, ignore";
         return;
     }
 
@@ -164,17 +154,11 @@ void PublicRoomListModel::next(int limit)
     if (m_showOnlySpaces) {
         roomTypes += QLatin1String("m.space");
     }
-    job = m_connection->callApi<QueryPublicRoomsJob>(m_server, limit, nextBatch, QueryPublicRoomsJob::Filter{m_searchText, roomTypes});
-    Q_EMIT searchingChanged();
+    job = m_connection->callApi<QueryPublicRoomsJob>(m_server, count, nextBatch, QueryPublicRoomsJob::Filter{m_keyword, roomTypes});
+    Q_EMIT loadingChanged();
 
     connect(job, &BaseJob::finished, this, [this] {
-        if (!attempted) {
-            beginResetModel();
-            rooms.clear();
-            endResetModel();
-
-            attempted = true;
-        }
+        attempted = true;
 
         if (job->status() == BaseJob::Success) {
             nextBatch = job->nextBatch();
@@ -182,10 +166,14 @@ void PublicRoomListModel::next(int limit)
             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 searchingChanged();
+        Q_EMIT loadingChanged();
     });
 }
 
@@ -196,7 +184,8 @@ QVariant PublicRoomListModel::data(const QModelIndex &index, int role) const
     }
 
     if (index.row() >= rooms.count()) {
-        qCDebug(PublicRoomList) << "something's wrong: index.row() >= rooms.count()";
+        qDebug() << "PublicRoomListModel, something's wrong: index.row() >= "
+                    "rooms.count()";
         return {};
     }
     auto room = rooms.at(index.row());
@@ -252,9 +241,6 @@ QVariant PublicRoomListModel::data(const QModelIndex &index, int role) const
 
         return m_connection->room(room.roomId, JoinState::Join) != nullptr;
     }
-    if (role == IsSpaceRole) {
-        return room.roomType == QLatin1String("m.space");
-    }
 
     return {};
 }
@@ -271,7 +257,6 @@ QHash<int, QByteArray> PublicRoomListModel::roleNames() const
     roles[AllowGuestsRole] = "allowGuests";
     roles[WorldReadableRole] = "worldReadable";
     roles[IsJoinedRole] = "isJoined";
-    roles[IsSpaceRole] = "isSpace";
     roles[AliasRole] = "alias";
 
     return roles;
@@ -286,19 +271,12 @@ int PublicRoomListModel::rowCount(const QModelIndex &parent) const
     return rooms.count();
 }
 
-bool PublicRoomListModel::canFetchMore(const QModelIndex &parent) const
+bool PublicRoomListModel::hasMore() const
 {
-    Q_UNUSED(parent)
-    return !nextBatch.isEmpty();
+    return !(attempted && nextBatch.isEmpty());
 }
 
-void PublicRoomListModel::fetchMore(const QModelIndex &parent)
-{
-    Q_UNUSED(parent)
-    next();
-}
-
-bool PublicRoomListModel::searching() const
+bool PublicRoomListModel::loading() 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 text to search the public room list for.
+     * @brief The filter keyword for the list of public rooms.
      */
-    Q_PROPERTY(QString searchText READ searchText WRITE setSearchText NOTIFY searchTextChanged)
+    Q_PROPERTY(QString keyword READ keyword WRITE setKeyword NOTIFY keywordChanged)
 
     /**
      * @brief Whether only space rooms should be shown.
@@ -51,9 +51,14 @@ class PublicRoomListModel : public QAbstractListModel
     Q_PROPERTY(bool showOnlySpaces READ showOnlySpaces WRITE setShowOnlySpaces NOTIFY showOnlySpacesChanged)
 
     /**
-     * @brief Whether the model is searching.
+     * @brief Whether the model has more items to load.
      */
-    Q_PROPERTY(bool searching READ searching NOTIFY searchingChanged)
+    Q_PROPERTY(bool hasMore READ hasMore NOTIFY hasMoreChanged)
+
+    /**
+     * @biref Whether the model is still loading.
+     */
+    Q_PROPERTY(bool loading READ loading NOTIFY loadingChanged)
 
 public:
     /**
@@ -69,7 +74,6 @@ public:
         AllowGuestsRole, /**< Whether the room allows guest users. */
         WorldReadableRole, /**< Whether the room events can be seen by non-members. */
         IsJoinedRole, /**< Whether the local user has joined the room. */
-        IsSpaceRole, /**< Whether the room is a space. */
     };
 
     explicit PublicRoomListModel(QObject *parent = nullptr);
@@ -101,38 +105,31 @@ public:
     [[nodiscard]] QString server() const;
     void setServer(const QString &value);
 
-    [[nodiscard]] QString searchText() const;
-    void setSearchText(const QString &searchText);
+    [[nodiscard]] QString keyword() const;
+    void setKeyword(const QString &value);
 
     [[nodiscard]] bool showOnlySpaces() const;
     void setShowOnlySpaces(bool showOnlySpaces);
 
-    [[nodiscard]] bool searching() const;
+    [[nodiscard]] bool hasMore() 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;
+    [[nodiscard]] bool loading() const;
 
     /**
      * @brief Load the next set of rooms.
      *
-     * @param limit the maximum number of rooms to load.
+     * @param count the maximum number of rooms to load.
      */
-    void next(int limit = 50);
-    bool canFetchMore(const QModelIndex &parent) const override;
-    void fetchMore(const QModelIndex &parent) override;
+    Q_INVOKABLE void next(int count = 50);
+
+private:
+    Quotient::Connection *m_connection = nullptr;
+    QString m_server;
+    QString m_keyword;
+    bool m_showOnlySpaces = false;
 
     bool attempted = false;
-    bool m_searching = false;
+    bool m_loading = false;
     QString nextBatch;
 
     QList<Quotient::PublicRoomsChunk> rooms;
@@ -142,7 +139,8 @@ private:
 Q_SIGNALS:
     void connectionChanged();
     void serverChanged();
-    void searchTextChanged();
+    void keywordChanged();
     void showOnlySpacesChanged();
-    void searchingChanged();
+    void hasMoreChanged();
+    void loadingChanged();
 };