GIT_SILENT Sync po/docbooks with svn

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

.craft.ini

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

.gitlab-ci.yml

@@ -10,8 +10,6 @@ include:
       - /gitlab-templates/windows-qt6.yml
 #      - /gitlab-templates/freebsd-qt6.yml
       - /gitlab-templates/flatpak.yml
-      - /gitlab-templates/snap-snapcraft-lxd.yml
       - /gitlab-templates/craft-android-qt6-apks.yml
       - /gitlab-templates/craft-appimage-qt6.yml
       - /gitlab-templates/craft-windows-x86-64-qt6.yml
-      - /gitlab-templates/craft-windows-appx-qt6.yml

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 "11")
-set(RELEASE_SERVICE_VERSION_MICRO "70")
+set(RELEASE_SERVICE_VERSION_MINOR "08")
+set(RELEASE_SERVICE_VERSION_MICRO "3")
 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.6")
+set(KF_MIN_VERSION "6.0")
 set(QT_MIN_VERSION "6.5")
 
 find_package(ECM ${KF_MIN_VERSION} REQUIRED NO_MODULE)
@@ -39,8 +39,6 @@ include(ECMCheckOutboundLicense)
 include(ECMQtDeclareLoggingCategory)
 include(ECMAddAndroidApk)
 include(ECMQmlModule)
-include(GenerateExportHeader)
-include(ECMGenerateHeaders)
 if (NOT ANDROID)
     include(KDEClangFormat)
 endif()
@@ -103,7 +101,7 @@ else()
     )
 endif()
 
-if (NOT ANDROID AND NOT WIN32 AND NOT APPLE AND NOT HAIKU)
+if (NOT ANDROID AND NOT WIN32 AND NOT APPLE)
     find_package(KF6DBusAddons ${KF_MIN_VERSION} REQUIRED)
 endif()
 

android/AndroidManifest.xml

@@ -55,6 +55,5 @@
 
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/> <!-- for Android >= 33 -->
 
 </manifest>

autotests/CMakeLists.txt

@@ -82,9 +82,3 @@ ecm_add_test(
     LINK_LIBRARIES neochat Qt::Test
     TEST_NAME linkpreviewertest
 )
-
-ecm_add_test(
-    messagecontentmodeltest.cpp
-    LINK_LIBRARIES neochat Qt::Test
-    TEST_NAME messagecontentmodeltest
-)

autotests/actionshandlertest.cpp

@@ -14,6 +14,7 @@ class ActionsHandlerTest : public QObject
 
 private:
     Quotient::Connection *connection = Quotient::Connection::makeMockConnection(QStringLiteral("@bob:kde.org"));
+    ActionsHandler *actionsHandler = new ActionsHandler(this);
 
 private Q_SLOTS:
     void nullObject();
@@ -22,19 +23,20 @@ private Q_SLOTS:
 void ActionsHandlerTest::nullObject()
 {
     QTest::ignoreMessage(QtWarningMsg, "ActionsHandler::handleMessageEvent - called with m_room and/or chatBarCache set to nullptr.");
-    ActionsHandler::handleMessageEvent(nullptr, nullptr);
+    actionsHandler->handleMessageEvent(nullptr);
 
     auto chatBarCache = new ChatBarCache(this);
     QTest::ignoreMessage(QtWarningMsg, "ActionsHandler::handleMessageEvent - called with m_room and/or chatBarCache set to nullptr.");
-    ActionsHandler::handleMessageEvent(nullptr, chatBarCache);
+    actionsHandler->handleMessageEvent(chatBarCache);
 
     auto room = new TestUtils::TestRoom(connection, QStringLiteral("#myroom:kde.org"));
+    actionsHandler->setRoom(room);
     QTest::ignoreMessage(QtWarningMsg, "ActionsHandler::handleMessageEvent - called with m_room and/or chatBarCache set to nullptr.");
-    ActionsHandler::handleMessageEvent(room, nullptr);
+    actionsHandler->handleMessageEvent(nullptr);
 
     // The final one should throw no warning so we make sure.
     QTest::failOnWarning("ActionsHandler::handleMessageEvent - called with m_room and/or chatBarCache set to nullptr.");
-    ActionsHandler::handleMessageEvent(room, chatBarCache);
+    actionsHandler->handleMessageEvent(chatBarCache);
 }
 
 QTEST_GUILESS_MAIN(ActionsHandlerTest)

autotests/chatbarcachetest.cpp

@@ -51,7 +51,7 @@ void ChatBarCacheTest::empty()
     QCOMPARE(chatBarCache->replyId(), QString());
     QCOMPARE(chatBarCache->isEditing(), false);
     QCOMPARE(chatBarCache->editId(), QString());
-    QCOMPARE(chatBarCache->relationAuthor(), room->member(QString()));
+    QCOMPARE(chatBarCache->relationUser(), room->member(QString()));
     QCOMPARE(chatBarCache->relationMessage(), QString());
     QCOMPARE(chatBarCache->attachmentPath(), QString());
 }
@@ -65,7 +65,7 @@ void ChatBarCacheTest::noRoom()
     // ChatBarCache has no parent.
 
     QTest::ignoreMessage(QtWarningMsg, "ChatBarCache created with no parent, a NeoChatRoom must be set as the parent on creation.");
-    QCOMPARE(chatBarCache->relationAuthor(), Quotient::RoomMember());
+    QCOMPARE(chatBarCache->relationUser(), Quotient::RoomMember());
 
     QTest::ignoreMessage(QtWarningMsg, "ChatBarCache created with no parent, a NeoChatRoom must be set as the parent on creation.");
     QCOMPARE(chatBarCache->relationMessage(), QString());
@@ -81,7 +81,7 @@ void ChatBarCacheTest::badParent()
     // ChatBarCache has no parent.
 
     QTest::ignoreMessage(QtWarningMsg, "ChatBarCache created with incorrect parent, a NeoChatRoom must be set as the parent on creation.");
-    QCOMPARE(chatBarCache->relationAuthor(), Quotient::RoomMember());
+    QCOMPARE(chatBarCache->relationUser(), Quotient::RoomMember());
 
     QTest::ignoreMessage(QtWarningMsg, "ChatBarCache created with incorrect parent, a NeoChatRoom must be set as the parent on creation.");
     QCOMPARE(chatBarCache->relationMessage(), QString());
@@ -99,7 +99,7 @@ void ChatBarCacheTest::reply()
     QCOMPARE(chatBarCache->replyId(), QLatin1String("$153456789:example.org"));
     QCOMPARE(chatBarCache->isEditing(), false);
     QCOMPARE(chatBarCache->editId(), QString());
-    QCOMPARE(chatBarCache->relationAuthor(), room->member(QLatin1String("@example:example.org")));
+    QCOMPARE(chatBarCache->relationUser(), room->member(QLatin1String("@example:example.org")));
     QCOMPARE(chatBarCache->relationMessage(), QLatin1String("This is an example\ntext message"));
     QCOMPARE(chatBarCache->attachmentPath(), QString());
 }
@@ -107,13 +107,8 @@ void ChatBarCacheTest::reply()
 void ChatBarCacheTest::edit()
 {
     QScopedPointer<ChatBarCache> chatBarCache(new ChatBarCache(room));
-
     chatBarCache->setText(QLatin1String("some text"));
     chatBarCache->setAttachmentPath(QLatin1String("some/path"));
-    connect(chatBarCache.get(), &ChatBarCache::relationIdChanged, this, [](const QString &oldEventId, const QString &newEventId) {
-        QCOMPARE(oldEventId, QString());
-        QCOMPARE(newEventId, QString(QLatin1String("$153456789:example.org")));
-    });
     chatBarCache->setEditId(QLatin1String("$153456789:example.org"));
 
     QCOMPARE(chatBarCache->text(), QLatin1String("some text"));
@@ -121,7 +116,7 @@ void ChatBarCacheTest::edit()
     QCOMPARE(chatBarCache->replyId(), QString());
     QCOMPARE(chatBarCache->isEditing(), true);
     QCOMPARE(chatBarCache->editId(), QLatin1String("$153456789:example.org"));
-    QCOMPARE(chatBarCache->relationAuthor(), room->member(QLatin1String("@example:example.org")));
+    QCOMPARE(chatBarCache->relationUser(), room->member(QLatin1String("@example:example.org")));
     QCOMPARE(chatBarCache->relationMessage(), QLatin1String("This is an example\ntext message"));
     QCOMPARE(chatBarCache->attachmentPath(), QString());
 }
@@ -138,7 +133,7 @@ void ChatBarCacheTest::attachment()
     QCOMPARE(chatBarCache->replyId(), QString());
     QCOMPARE(chatBarCache->isEditing(), false);
     QCOMPARE(chatBarCache->editId(), QString());
-    QCOMPARE(chatBarCache->relationAuthor(), room->member(QString()));
+    QCOMPARE(chatBarCache->relationUser(), room->member(QString()));
     QCOMPARE(chatBarCache->relationMessage(), QString());
     QCOMPARE(chatBarCache->attachmentPath(), QLatin1String("some/path"));
 }

autotests/eventhandlertest.cpp

@@ -29,6 +29,8 @@ private:
     Connection *connection = nullptr;
     TestUtils::TestRoom *room = nullptr;
 
+    EventHandler emptyHandler = EventHandler(nullptr, nullptr);
+
 private Q_SLOTS:
     void initTestCase();
 
@@ -41,6 +43,7 @@ private Q_SLOTS:
     void time();
     void nullTime();
     void timeString();
+    void nullTimeString();
     void highlighted();
     void nullHighlighted();
     void hidden();
@@ -62,6 +65,10 @@ private Q_SLOTS:
     void nullReplyId();
     void replyAuthor();
     void nullReplyAuthor();
+    void replyBody();
+    void nullReplyBody();
+    void replyMediaInfo();
+    void nullReplyMediaInfo();
     void thread();
     void nullThread();
     void location();
@@ -76,136 +83,157 @@ void EventHandlerTest::initTestCase()
 
 void EventHandlerTest::eventId()
 {
-    QCOMPARE(EventHandler::id(room->messageEvents().at(0).get()), QStringLiteral("$153456789:example.org"));
+    EventHandler eventHandler(room, room->messageEvents().at(0).get());
+    QCOMPARE(eventHandler.getId(), QStringLiteral("$153456789:example.org"));
 }
 
 void EventHandlerTest::nullEventId()
 {
-    QTest::ignoreMessage(QtWarningMsg, "id called with event set to nullptr.");
-    QCOMPARE(EventHandler::id(nullptr), QString());
+    EventHandler noEventHandler(room, nullptr);
+    QTest::ignoreMessage(QtWarningMsg, "getId called with m_event set to nullptr.");
+    QCOMPARE(noEventHandler.getId(), QString());
 }
 
 void EventHandlerTest::authorDisplayName()
 {
-    QCOMPARE(EventHandler::authorDisplayName(room, room->messageEvents().at(1).get()), QStringLiteral("before"));
+    EventHandler eventHandler(room, room->messageEvents().at(1).get());
+    QCOMPARE(eventHandler.getAuthorDisplayName(), QStringLiteral("before"));
 }
 
 void EventHandlerTest::nullAuthorDisplayName()
 {
-    QTest::ignoreMessage(QtWarningMsg, "authorDisplayName called with room set to nullptr.");
-    QCOMPARE(EventHandler::authorDisplayName(nullptr, nullptr), QString());
+    QTest::ignoreMessage(QtWarningMsg, "getAuthorDisplayName called with m_room set to nullptr.");
+    QCOMPARE(emptyHandler.getAuthorDisplayName(), QString());
 
-    QTest::ignoreMessage(QtWarningMsg, "authorDisplayName called with event set to nullptr.");
-    QCOMPARE(EventHandler::authorDisplayName(room, nullptr), QString());
+    EventHandler noEventHandler(room, nullptr);
+    QTest::ignoreMessage(QtWarningMsg, "getAuthorDisplayName called with m_event set to nullptr.");
+    QCOMPARE(noEventHandler.getAuthorDisplayName(), QString());
 }
 
 void EventHandlerTest::singleLineSidplayName()
 {
-    QCOMPARE(EventHandler::singleLineAuthorDisplayname(room, room->messageEvents().at(11).get()),
-             QStringLiteral("Look at me I put newlines in my display name"));
+    EventHandler eventHandler(room, room->messageEvents().at(11).get());
+    QCOMPARE(eventHandler.singleLineAuthorDisplayname(), QStringLiteral("Look at me I put newlines in my display name"));
 }
 
 void EventHandlerTest::nullSingleLineDisplayName()
 {
-    QTest::ignoreMessage(QtWarningMsg, "singleLineAuthorDisplayname called with room set to nullptr.");
-    QCOMPARE(EventHandler::singleLineAuthorDisplayname(nullptr, nullptr), QString());
+    QTest::ignoreMessage(QtWarningMsg, "getAuthorDisplayName called with m_room set to nullptr.");
+    QCOMPARE(emptyHandler.singleLineAuthorDisplayname(), QString());
 
-    QTest::ignoreMessage(QtWarningMsg, "singleLineAuthorDisplayname called with event set to nullptr.");
-    QCOMPARE(EventHandler::singleLineAuthorDisplayname(room, nullptr), QString());
+    EventHandler noEventHandler(room, nullptr);
+    QTest::ignoreMessage(QtWarningMsg, "getAuthorDisplayName called with m_event set to nullptr.");
+    QCOMPARE(noEventHandler.singleLineAuthorDisplayname(), QString());
 }
 
 void EventHandlerTest::time()
 {
-    const auto event = room->messageEvents().at(0).get();
+    EventHandler eventHandler(room, room->messageEvents().at(0).get());
 
-    QCOMPARE(EventHandler::time(event), QDateTime::fromMSecsSinceEpoch(1432735824654, Qt::UTC));
-    QCOMPARE(EventHandler::time(event, true, QDateTime::fromMSecsSinceEpoch(1234, Qt::UTC)), QDateTime::fromMSecsSinceEpoch(1234, Qt::UTC));
+    QCOMPARE(eventHandler.getTime(), QDateTime::fromMSecsSinceEpoch(1432735824654, Qt::UTC));
+    QCOMPARE(eventHandler.getTime(true, QDateTime::fromMSecsSinceEpoch(1234, Qt::UTC)), QDateTime::fromMSecsSinceEpoch(1234, Qt::UTC));
 }
 
 void EventHandlerTest::nullTime()
 {
-    QTest::ignoreMessage(QtWarningMsg, "time called with event set to nullptr.");
-    QCOMPARE(EventHandler::time(nullptr), QDateTime());
+    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());
     QTest::ignoreMessage(QtWarningMsg, "a value must be provided for lastUpdated for a pending event.");
-    QCOMPARE(EventHandler::time(room->messageEvents().at(0).get(), true), QDateTime());
+    QCOMPARE(eventHandler.getTime(true), QDateTime());
 }
 
 void EventHandlerTest::timeString()
 {
-    const auto event = room->messageEvents().at(0).get();
+    EventHandler eventHandler(room, room->messageEvents().at(0).get());
 
     KFormat format;
 
-    QCOMPARE(EventHandler::timeString(event, false),
+    QCOMPARE(eventHandler.getTimeString(false),
              QLocale().toString(QDateTime::fromMSecsSinceEpoch(1432735824654, Qt::UTC).toLocalTime().time(), QLocale::ShortFormat));
-    QCOMPARE(EventHandler::timeString(event, true),
+    QCOMPARE(eventHandler.getTimeString(true),
              format.formatRelativeDate(QDateTime::fromMSecsSinceEpoch(1432735824654, Qt::UTC).toLocalTime().date(), QLocale::ShortFormat));
-    QCOMPARE(EventHandler::timeString(event, false, QLocale::ShortFormat, true, QDateTime::fromMSecsSinceEpoch(1690699214545, Qt::UTC)),
+    QCOMPARE(eventHandler.getTimeString(false, QLocale::ShortFormat, true, QDateTime::fromMSecsSinceEpoch(1690699214545, Qt::UTC)),
              QLocale().toString(QDateTime::fromMSecsSinceEpoch(1690699214545, Qt::UTC).toLocalTime().time(), QLocale::ShortFormat));
-    QCOMPARE(EventHandler::timeString(event, true, QLocale::ShortFormat, true, QDateTime::fromMSecsSinceEpoch(1690699214545, Qt::UTC)),
+    QCOMPARE(eventHandler.getTimeString(true, QLocale::ShortFormat, true, QDateTime::fromMSecsSinceEpoch(1690699214545, Qt::UTC)),
              format.formatRelativeDate(QDateTime::fromMSecsSinceEpoch(1690699214545, Qt::UTC).toLocalTime().date(), QLocale::ShortFormat));
-    QCOMPARE(EventHandler::timeString(event, false, QLocale::LongFormat, true, QDateTime::fromMSecsSinceEpoch(1690699214545, Qt::UTC)),
+    QCOMPARE(eventHandler.getTimeString(false, QLocale::LongFormat, true, QDateTime::fromMSecsSinceEpoch(1690699214545, Qt::UTC)),
              QLocale().toString(QDateTime::fromMSecsSinceEpoch(1690699214545, Qt::UTC).toLocalTime().time(), QLocale::LongFormat));
-    QCOMPARE(EventHandler::timeString(event, true, QLocale::LongFormat, true, QDateTime::fromMSecsSinceEpoch(1690699214545, Qt::UTC)),
+    QCOMPARE(eventHandler.getTimeString(true, QLocale::LongFormat, true, QDateTime::fromMSecsSinceEpoch(1690699214545, Qt::UTC)),
              format.formatRelativeDate(QDateTime::fromMSecsSinceEpoch(1690699214545, Qt::UTC).toLocalTime().date(), QLocale::LongFormat));
-    QCOMPARE(EventHandler::timeString(event, QStringLiteral("hh:mm")),
-             QDateTime::fromMSecsSinceEpoch(1432735824654, Qt::UTC).toString(QStringLiteral("hh:mm")));
+    QCOMPARE(eventHandler.getTimeString(QStringLiteral("hh:mm")), QDateTime::fromMSecsSinceEpoch(1432735824654, Qt::UTC).toString(QStringLiteral("hh:mm")));
+}
+
+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());
+    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()
 {
-    QCOMPARE(EventHandler::isHighlighted(room, room->messageEvents().at(2).get()), true);
-    QCOMPARE(EventHandler::isHighlighted(room, room->messageEvents().at(0).get()), false);
+    EventHandler eventHandlerHighlight(room, room->messageEvents().at(2).get());
+    QCOMPARE(eventHandlerHighlight.isHighlighted(), true);
+
+    EventHandler eventHandlerNoHighlight(room, room->messageEvents().at(0).get());
+    QCOMPARE(eventHandlerNoHighlight.isHighlighted(), false);
 }
 
 void EventHandlerTest::nullHighlighted()
 {
-    QTest::ignoreMessage(QtWarningMsg, "isHighlighted called with room set to nullptr.");
-    QCOMPARE(EventHandler::isHighlighted(nullptr, nullptr), false);
+    QTest::ignoreMessage(QtWarningMsg, "isHighlighted called with m_room set to nullptr.");
+    QCOMPARE(emptyHandler.isHighlighted(), false);
 
-    QTest::ignoreMessage(QtWarningMsg, "isHighlighted called with event set to nullptr.");
-    QCOMPARE(EventHandler::isHighlighted(room, nullptr), false);
+    EventHandler noEventHandler(room, nullptr);
+    QTest::ignoreMessage(QtWarningMsg, "isHighlighted called with m_event set to nullptr.");
+    QCOMPARE(noEventHandler.isHighlighted(), false);
 }
 
 void EventHandlerTest::hidden()
 {
-    QCOMPARE(EventHandler::isHidden(room, room->messageEvents().at(3).get()), true);
-    QCOMPARE(EventHandler::isHidden(room, room->messageEvents().at(0).get()), false);
+    EventHandler eventHandlerHidden(room, room->messageEvents().at(3).get());
+    QCOMPARE(eventHandlerHidden.isHidden(), true);
+
+    EventHandler eventHandlerNoHidden(room, room->messageEvents().at(0).get());
+    QCOMPARE(eventHandlerNoHidden.isHidden(), false);
 }
 
 void EventHandlerTest::nullHidden()
 {
-    QTest::ignoreMessage(QtWarningMsg, "isHidden called with room set to nullptr.");
-    QCOMPARE(EventHandler::isHidden(nullptr, nullptr), false);
+    QTest::ignoreMessage(QtWarningMsg, "isHidden called with m_room set to nullptr.");
+    QCOMPARE(emptyHandler.isHidden(), false);
 
-    QTest::ignoreMessage(QtWarningMsg, "isHidden called with event set to nullptr.");
-    QCOMPARE(EventHandler::isHidden(room, nullptr), false);
+    EventHandler noEventHandler(room, nullptr);
+    QTest::ignoreMessage(QtWarningMsg, "isHidden called with m_event set to nullptr.");
+    QCOMPARE(noEventHandler.isHidden(), false);
 }
 
 void EventHandlerTest::body()
 {
-    const auto event = room->messageEvents().at(0).get();
+    EventHandler eventHandler(room, room->messageEvents().at(0).get());
 
-    QCOMPARE(EventHandler::richBody(room, event), QStringLiteral("<b>This is an example<br>text message</b>"));
-    QCOMPARE(EventHandler::richBody(room, event, true), QStringLiteral("<b>This is an example text message</b>"));
-    QCOMPARE(EventHandler::plainBody(room, event), QStringLiteral("This is an example\ntext message"));
-    QCOMPARE(EventHandler::plainBody(room, event, true), QStringLiteral("This is an example text message"));
+    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>"));
+    QCOMPARE(eventHandler.getPlainBody(), QStringLiteral("This is an example\ntext message"));
+    QCOMPARE(eventHandler.getPlainBody(true), QStringLiteral("This is an example text message"));
 }
 
 void EventHandlerTest::nullBody()
 {
-    QTest::ignoreMessage(QtWarningMsg, "richBody called with room set to nullptr.");
-    QCOMPARE(EventHandler::richBody(nullptr, nullptr), QString());
+    EventHandler noEventHandler(room, nullptr);
 
-    QTest::ignoreMessage(QtWarningMsg, "richBody called with event set to nullptr.");
-    QCOMPARE(EventHandler::richBody(room, nullptr), QString());
+    QTest::ignoreMessage(QtWarningMsg, "getRichBody called with m_event set to nullptr.");
+    QCOMPARE(noEventHandler.getRichBody(), QString());
 
-    QTest::ignoreMessage(QtWarningMsg, "plainBody called with room set to nullptr.");
-    QCOMPARE(EventHandler::plainBody(nullptr, nullptr), QString());
-
-    QTest::ignoreMessage(QtWarningMsg, "plainBody called with event set to nullptr.");
-    QCOMPARE(EventHandler::plainBody(room, nullptr), QString());
+    QTest::ignoreMessage(QtWarningMsg, "getPlainBody called with m_event set to nullptr.");
+    QCOMPARE(noEventHandler.getPlainBody(), QString());
 }
 
 void EventHandlerTest::genericBody_data()
@@ -213,13 +241,11 @@ void EventHandlerTest::genericBody_data()
     QTest::addColumn<int>("eventNum");
     QTest::addColumn<QString>("output");
 
-    QTest::newRow("message") << 0 << QStringLiteral("<a href=\"https://matrix.to/#/@example:example.org\">after</a> sent a message");
-    QTest::newRow("member") << 1
-                            << QStringLiteral(
-                                   "<a href=\"https://matrix.to/#/@example:example.org\">after</a> changed their display name and updated their avatar");
-    QTest::newRow("message 2") << 2 << QStringLiteral("<a href=\"https://matrix.to/#/@example:example.org\">after</a> sent a message");
+    QTest::newRow("message") << 0 << QStringLiteral("sent a message");
+    QTest::newRow("member") << 1 << QStringLiteral("changed their display name and updated their avatar");
+    QTest::newRow("message 2") << 2 << QStringLiteral("sent a message");
     QTest::newRow("reaction") << 3 << QStringLiteral("Unknown event");
-    QTest::newRow("video") << 4 << QStringLiteral("<a href=\"https://matrix.to/#/@example:example.org\">after</a> sent a message");
+    QTest::newRow("video") << 4 << QStringLiteral("sent a message");
 }
 
 void EventHandlerTest::genericBody()
@@ -227,48 +253,54 @@ void EventHandlerTest::genericBody()
     QFETCH(int, eventNum);
     QFETCH(QString, output);
 
-    QCOMPARE(EventHandler::genericBody(room, room->messageEvents().at(eventNum).get()), output);
+    EventHandler eventHandler(room, room->messageEvents().at(eventNum).get());
+
+    QCOMPARE(eventHandler.getGenericBody(), output);
 }
 
 void EventHandlerTest::nullGenericBody()
 {
-    QTest::ignoreMessage(QtWarningMsg, "genericBody called with room set to nullptr.");
-    QCOMPARE(EventHandler::genericBody(nullptr, nullptr), QString());
-
-    QTest::ignoreMessage(QtWarningMsg, "genericBody called with event set to nullptr.");
-    QCOMPARE(EventHandler::genericBody(room, nullptr), QString());
+    EventHandler noEventHandler(room, nullptr);
+    QTest::ignoreMessage(QtWarningMsg, "getGenericBody called with m_event set to nullptr.");
+    QCOMPARE(noEventHandler.getGenericBody(), QString());
 }
 
 void EventHandlerTest::markdownBody()
 {
-    QCOMPARE(EventHandler::markdownBody(room->messageEvents().at(0).get()), QStringLiteral("This is an example\ntext message"));
+    EventHandler eventHandler(room, room->messageEvents().at(0).get());
+
+    QCOMPARE(eventHandler.getMarkdownBody(), QStringLiteral("This is an example\ntext message"));
 }
 
 void EventHandlerTest::markdownBodyReply()
 {
-    QCOMPARE(EventHandler::markdownBody(room->messageEvents().at(5).get()), QStringLiteral("reply"));
+    EventHandler eventHandler(room, room->messageEvents().at(5).get());
+
+    QCOMPARE(eventHandler.getMarkdownBody(), QStringLiteral("reply"));
 }
 
 void EventHandlerTest::subtitle()
 {
-    QCOMPARE(EventHandler::subtitleText(room, room->messageEvents().at(0).get()), QStringLiteral("after: This is an example text message"));
-    QCOMPARE(EventHandler::subtitleText(room, room->messageEvents().at(2).get()),
-             QStringLiteral("after: This is a highlight @bob:kde.org and this is a link https://kde.org"));
+    EventHandler eventHandler(room, room->messageEvents().at(0).get());
+    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"));
 }
 
 void EventHandlerTest::nullSubtitle()
 {
-    QTest::ignoreMessage(QtWarningMsg, "subtitleText called with room set to nullptr.");
-    QCOMPARE(EventHandler::subtitleText(nullptr, nullptr), QString());
-
-    QTest::ignoreMessage(QtWarningMsg, "subtitleText called with event set to nullptr.");
-    QCOMPARE(EventHandler::subtitleText(room, nullptr), QString());
+    EventHandler noEventHandler(room, nullptr);
+    QTest::ignoreMessage(QtWarningMsg, "subtitleText called with m_event set to nullptr.");
+    QCOMPARE(noEventHandler.subtitleText(), QString());
 }
 
 void EventHandlerTest::mediaInfo()
 {
     auto event = room->messageEvents().at(4).get();
-    auto mediaInfo = EventHandler::mediaInfo(room, event);
+    EventHandler eventHandler(room, event);
+
+    auto mediaInfo = eventHandler.getMediaInfo();
     auto thumbnailInfo = mediaInfo["tempInfo"_ls].toMap();
 
     QCOMPARE(mediaInfo["source"_ls], room->makeMediaUrl(event->id(), QUrl("mxc://kde.org/1234567"_ls)));
@@ -288,42 +320,53 @@ void EventHandlerTest::mediaInfo()
 
 void EventHandlerTest::nullMediaInfo()
 {
-    QTest::ignoreMessage(QtWarningMsg, "mediaInfo called with room set to nullptr.");
-    QCOMPARE(EventHandler::mediaInfo(nullptr, nullptr), QVariantMap());
+    QTest::ignoreMessage(QtWarningMsg, "getMediaInfo called with m_room set to nullptr.");
+    QCOMPARE(emptyHandler.getMediaInfo(), QVariantMap());
 
-    QTest::ignoreMessage(QtWarningMsg, "mediaInfo called with event set to nullptr.");
-    QCOMPARE(EventHandler::mediaInfo(room, nullptr), QVariantMap());
+    EventHandler noEventHandler(room, nullptr);
+    QTest::ignoreMessage(QtWarningMsg, "getMediaInfo called with m_event set to nullptr.");
+    QCOMPARE(noEventHandler.getMediaInfo(), QVariantMap());
 }
 
 void EventHandlerTest::hasReply()
 {
-    QCOMPARE(EventHandler::hasReply(room->messageEvents().at(5).get()), true);
-    QCOMPARE(EventHandler::hasReply(room->messageEvents().at(0).get()), false);
+    EventHandler eventHandlerReply(room, room->messageEvents().at(5).get());
+    QCOMPARE(eventHandlerReply.hasReply(), true);
+
+    EventHandler eventHandlerNoReply(room, room->messageEvents().at(0).get());
+    QCOMPARE(eventHandlerNoReply.hasReply(), false);
 }
 
 void EventHandlerTest::nullHasReply()
 {
-    QTest::ignoreMessage(QtWarningMsg, "hasReply called with event set to nullptr.");
-    QCOMPARE(EventHandler::hasReply(nullptr), false);
+    EventHandler noEventHandler(room, nullptr);
+    QTest::ignoreMessage(QtWarningMsg, "hasReply called with m_event set to nullptr.");
+    QCOMPARE(noEventHandler.hasReply(), false);
 }
 
 void EventHandlerTest::replyId()
 {
-    QCOMPARE(EventHandler::replyId(room->messageEvents().at(5).get()), QStringLiteral("$153456789:example.org"));
-    QCOMPARE(EventHandler::replyId(room->messageEvents().at(0).get()), QStringLiteral(""));
+    EventHandler eventHandlerReply(room, room->messageEvents().at(5).get());
+    QCOMPARE(eventHandlerReply.getReplyId(), QStringLiteral("$153456789:example.org"));
+
+    EventHandler eventHandlerNoReply(room, room->messageEvents().at(0).get());
+    QCOMPARE(eventHandlerNoReply.getReplyId(), QStringLiteral(""));
 }
 
 void EventHandlerTest::nullReplyId()
 {
-    QTest::ignoreMessage(QtWarningMsg, "replyId called with event set to nullptr.");
-    QCOMPARE(EventHandler::replyId(nullptr), QString());
+    EventHandler noEventHandler(room, nullptr);
+    QTest::ignoreMessage(QtWarningMsg, "getReplyId called with m_event set to nullptr.");
+    QCOMPARE(noEventHandler.getReplyId(), QString());
 }
 
 void EventHandlerTest::replyAuthor()
 {
     auto replyEvent = room->messageEvents().at(0).get();
     auto replyAuthor = room->member(replyEvent->senderId());
-    auto eventHandlerReplyAuthor = EventHandler::replyAuthor(room, room->messageEvents().at(5).get());
+    EventHandler eventHandler(room, room->messageEvents().at(5).get());
+
+    auto eventHandlerReplyAuthor = eventHandler.getReplyAuthor();
 
     QCOMPARE(eventHandlerReplyAuthor.isLocalMember(), replyAuthor.id() == room->localMember().id());
     QCOMPARE(eventHandlerReplyAuthor.id(), replyAuthor.id());
@@ -332,58 +375,121 @@ void EventHandlerTest::replyAuthor()
     QCOMPARE(eventHandlerReplyAuthor.avatarMediaId(), replyAuthor.avatarMediaId());
     QCOMPARE(eventHandlerReplyAuthor.color(), replyAuthor.color());
 
-    QCOMPARE(EventHandler::replyAuthor(room, room->messageEvents().at(0).get()), RoomMember());
+    EventHandler eventHandlerNoAuthor(room, room->messageEvents().at(0).get());
+    QCOMPARE(eventHandlerNoAuthor.getReplyAuthor(), RoomMember());
 }
 
 void EventHandlerTest::nullReplyAuthor()
 {
-    QTest::ignoreMessage(QtWarningMsg, "replyAuthor called with room set to nullptr.");
-    QCOMPARE(EventHandler::replyAuthor(nullptr, nullptr), RoomMember());
+    QTest::ignoreMessage(QtWarningMsg, "getReplyAuthor called with m_room set to nullptr.");
+    QCOMPARE(emptyHandler.getReplyAuthor(), RoomMember());
 
-    QTest::ignoreMessage(QtWarningMsg, "replyAuthor called with event set to nullptr. Returning empty user.");
-    QCOMPARE(EventHandler::replyAuthor(room, nullptr), RoomMember());
+    EventHandler noEventHandler(room, nullptr);
+    QTest::ignoreMessage(QtWarningMsg, "getReplyAuthor called with m_event set to nullptr. Returning empty user.");
+    QCOMPARE(noEventHandler.getReplyAuthor(), RoomMember());
+}
+
+void EventHandlerTest::replyBody()
+{
+    EventHandler eventHandler(room, room->messageEvents().at(5).get());
+
+    QCOMPARE(eventHandler.getReplyRichBody(), QStringLiteral("<b>This is an example<br>text message</b>"));
+    QCOMPARE(eventHandler.getReplyRichBody(true), QStringLiteral("<b>This is an example text message</b>"));
+    QCOMPARE(eventHandler.getReplyPlainBody(), QStringLiteral("This is an example\ntext message"));
+    QCOMPARE(eventHandler.getReplyPlainBody(true), QStringLiteral("This is an example text message"));
+}
+
+void EventHandlerTest::nullReplyBody()
+{
+    EventHandler noEventHandler(room, nullptr);
+
+    QTest::ignoreMessage(QtWarningMsg, "getReplyRichBody called with m_event set to nullptr.");
+    QCOMPARE(noEventHandler.getReplyRichBody(), QString());
+
+    QTest::ignoreMessage(QtWarningMsg, "getReplyPlainBody called with m_event set to nullptr.");
+    QCOMPARE(noEventHandler.getReplyPlainBody(), QString());
+}
+
+void EventHandlerTest::replyMediaInfo()
+{
+    auto event = room->messageEvents().at(6).get();
+    auto replyEvent = room->messageEvents().at(4).get();
+    EventHandler eventHandler(room, event);
+
+    auto mediaInfo = eventHandler.getReplyMediaInfo();
+    auto thumbnailInfo = mediaInfo["tempInfo"_ls].toMap();
+
+    QCOMPARE(mediaInfo["source"_ls], room->makeMediaUrl(replyEvent->id(), QUrl("mxc://kde.org/1234567"_ls)));
+    QCOMPARE(mediaInfo["mimeType"_ls], QStringLiteral("video/mp4"));
+    QCOMPARE(mediaInfo["mimeIcon"_ls], QStringLiteral("video-mp4"));
+    QCOMPARE(mediaInfo["size"_ls], 62650636);
+    QCOMPARE(mediaInfo["duration"_ls], 10);
+    QCOMPARE(mediaInfo["width"_ls], 1920);
+    QCOMPARE(mediaInfo["height"_ls], 1080);
+    QCOMPARE(thumbnailInfo["source"_ls], room->makeMediaUrl(replyEvent->id(), QUrl("mxc://kde.org/2234567"_ls)));
+    QCOMPARE(thumbnailInfo["mimeType"_ls], QStringLiteral("image/jpeg"));
+    QCOMPARE(thumbnailInfo["mimeIcon"_ls], QStringLiteral("image-jpeg"));
+    QCOMPARE(thumbnailInfo["size"_ls], 382249);
+    QCOMPARE(thumbnailInfo["width"_ls], 800);
+    QCOMPARE(thumbnailInfo["height"_ls], 450);
+}
+
+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()
 {
-    QCOMPARE(EventHandler::isThreaded(room->messageEvents().at(0).get()), false);
-    QCOMPARE(EventHandler::threadRoot(room->messageEvents().at(0).get()), QString());
+    EventHandler eventHandlerNoThread(room, room->messageEvents().at(0).get());
+    QCOMPARE(eventHandlerNoThread.isThreaded(), false);
+    QCOMPARE(eventHandlerNoThread.threadRoot(), QString());
 
-    QCOMPARE(EventHandler::isThreaded(room->messageEvents().at(9).get()), true);
-    QCOMPARE(EventHandler::threadRoot(room->messageEvents().at(9).get()), QStringLiteral("$threadroot:example.org"));
-    QCOMPARE(EventHandler::replyId(room->messageEvents().at(9).get()), QStringLiteral("$threadroot:example.org"));
+    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(room->messageEvents().at(10).get()), true);
-    QCOMPARE(EventHandler::threadRoot(room->messageEvents().at(10).get()), QStringLiteral("$threadroot:example.org"));
-    QCOMPARE(EventHandler::replyId(room->messageEvents().at(10).get()), QStringLiteral("$threadmessage1:example.org"));
+    EventHandler eventHandlerThreadReply(room, room->messageEvents().at(10).get());
+    QCOMPARE(eventHandlerThreadReply.isThreaded(), true);
+    QCOMPARE(eventHandlerThreadReply.threadRoot(), QStringLiteral("$threadroot:example.org"));
+    QCOMPARE(eventHandlerThreadReply.getReplyId(), QStringLiteral("$threadmessage1:example.org"));
 }
 
 void EventHandlerTest::nullThread()
 {
-    QTest::ignoreMessage(QtWarningMsg, "isThreaded called with event set to nullptr.");
-    QCOMPARE(EventHandler::isThreaded(nullptr), false);
+    QTest::ignoreMessage(QtWarningMsg, "isThreaded called with m_event set to nullptr.");
+    QCOMPARE(emptyHandler.isThreaded(), false);
 
-    QTest::ignoreMessage(QtWarningMsg, "threadRoot called with event set to nullptr.");
-    QCOMPARE(EventHandler::threadRoot(nullptr), QString());
+    EventHandler noEventHandler(room, nullptr);
+    QTest::ignoreMessage(QtWarningMsg, "threadRoot called with m_event set to nullptr.");
+    QCOMPARE(noEventHandler.threadRoot(), QString());
 }
 
 void EventHandlerTest::location()
 {
-    QCOMPARE(EventHandler::latitude(room->messageEvents().at(7).get()), QStringLiteral("51.7035").toFloat());
-    QCOMPARE(EventHandler::longitude(room->messageEvents().at(7).get()), QStringLiteral("-1.14394").toFloat());
-    QCOMPARE(EventHandler::locationAssetType(room->messageEvents().at(7).get()), QStringLiteral("m.pin"));
+    EventHandler eventHandler(room, room->messageEvents().at(7).get());
+
+    QCOMPARE(eventHandler.getLatitude(), QStringLiteral("51.7035").toFloat());
+    QCOMPARE(eventHandler.getLongitude(), QStringLiteral("-1.14394").toFloat());
+    QCOMPARE(eventHandler.getLocationAssetType(), QStringLiteral("m.pin"));
 }
 
 void EventHandlerTest::nullLocation()
 {
-    QTest::ignoreMessage(QtWarningMsg, "latitude called with event set to nullptr.");
-    QCOMPARE(EventHandler::latitude(nullptr), -100.0);
+    QTest::ignoreMessage(QtWarningMsg, "getLatitude called with m_event set to nullptr.");
+    QCOMPARE(emptyHandler.getLatitude(), -100.0);
 
-    QTest::ignoreMessage(QtWarningMsg, "longitude called with event set to nullptr.");
-    QCOMPARE(EventHandler::longitude(nullptr), -200.0);
+    QTest::ignoreMessage(QtWarningMsg, "getLongitude called with m_event set to nullptr.");
+    QCOMPARE(emptyHandler.getLongitude(), -200.0);
 
-    QTest::ignoreMessage(QtWarningMsg, "locationAssetType called with event set to nullptr.");
-    QCOMPARE(EventHandler::locationAssetType(nullptr), QString());
+    QTest::ignoreMessage(QtWarningMsg, "getLocationAssetType called with m_event set to nullptr.");
+    QCOMPARE(emptyHandler.getLocationAssetType(), QString());
 }
 
 QTEST_MAIN(EventHandlerTest)

autotests/messagecontentmodeltest.cpp

@@ -1,61 +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 <QObject>
-#include <QSignalSpy>
-#include <QTest>
-
-#include <Quotient/connection.h>
-#include <Quotient/quotient_common.h>
-#include <Quotient/roommember.h>
-#include <Quotient/syncdata.h>
-
-#include "models/messagecontentmodel.h"
-
-#include "testutils.h"
-
-using namespace Quotient;
-using namespace Qt::Literals::StringLiterals;
-
-class MessageContentModelTest : public QObject
-{
-    Q_OBJECT
-
-private:
-    Connection *connection = nullptr;
-
-private Q_SLOTS:
-    void initTestCase();
-
-    void missingEvent();
-};
-
-void MessageContentModelTest::initTestCase()
-{
-    connection = Connection::makeMockConnection(QStringLiteral("@bob:kde.org"));
-}
-
-void MessageContentModelTest::missingEvent()
-{
-    auto room = new TestUtils::TestRoom(connection, QStringLiteral("#firstRoom:kde.org"));
-    auto model1 = MessageContentModel(room, "$153456789:example.org"_L1);
-
-    QCOMPARE(model1.rowCount(), 1);
-    QCOMPARE(model1.data(model1.index(0), MessageContentModel::ComponentTypeRole), MessageComponentType::Loading);
-    QCOMPARE(model1.data(model1.index(0), MessageContentModel::DisplayRole), "Loading"_L1);
-
-    auto model2 = MessageContentModel(room, "$153456789:example.org"_L1, true);
-
-    QCOMPARE(model2.rowCount(), 1);
-    QCOMPARE(model2.data(model2.index(0), MessageContentModel::ComponentTypeRole), MessageComponentType::Loading);
-    QCOMPARE(model2.data(model2.index(0), MessageContentModel::DisplayRole), "Loading reply"_L1);
-
-    room->syncNewEvents(QLatin1String("test-min-sync.json"));
-    QCOMPARE(model1.rowCount(), 2);
-    QCOMPARE(model1.data(model1.index(0), MessageContentModel::ComponentTypeRole), MessageComponentType::Author);
-    QCOMPARE(model1.data(model1.index(1), MessageContentModel::ComponentTypeRole), MessageComponentType::Text);
-    QCOMPARE(model1.data(model1.index(1), MessageContentModel::DisplayRole), u"<b>This is an example<br>text message</b>"_s);
-}
-
-QTEST_MAIN(MessageContentModelTest)
-#include "messagecontentmodeltest.moc"

autotests/texthandlertest.cpp

@@ -12,7 +12,9 @@
 
 #include "enums/messagecomponenttype.h"
 #include "models/customemojimodel.h"
+#include "models/messagecontentmodel.h"
 #include "neochatconnection.h"
+#include "utils.h"
 
 #include "testutils.h"
 
@@ -44,7 +46,6 @@ private Q_SLOTS:
     void sendCustomEmojiCode_data();
     void sendCustomEmojiCode();
 
-    void receiveSpacelessSelfClosingTag();
     void receiveStripReply();
     void receivePlainTextIn();
 
@@ -84,11 +85,11 @@ void TextHandlerTest::initTestCase()
 
 void TextHandlerTest::allowedAttributes()
 {
-    const QString testInputString1 = QStringLiteral("<span data-mx-spoiler><font color=#FFFFFF>Test</font><span>");
-    const QString testOutputString1 = QStringLiteral("<span data-mx-spoiler><font color=#FFFFFF>Test</font><span>");
+    const QString testInputString1 = QStringLiteral("<p><span data-mx-spoiler><font color=#FFFFFF>Test</font><span></p>");
+    const QString testOutputString1 = QStringLiteral("<p><span data-mx-spoiler><font color=#FFFFFF>Test</font><span></p>");
     // Handle urls where the href has either single (') or double (") quotes.
-    const QString testInputString2 = QStringLiteral("<a href=\"https://kde.org\">link</a><a href='https://kde.org'>link</a>");
-    const QString testOutputString2 = QStringLiteral("<a href=\"https://kde.org\">link</a><a href='https://kde.org'>link</a>");
+    const QString testInputString2 = QStringLiteral("<p><a href=\"https://kde.org\">link</a><a href='https://kde.org'>link</a></p>");
+    const QString testOutputString2 = QStringLiteral("<p><a href=\"https://kde.org\">link</a><a href='https://kde.org'>link</a></p>");
 
     TextHandler testTextHandler;
     testTextHandler.setData(testInputString1);
@@ -116,7 +117,7 @@ void TextHandlerTest::stripDisallowedTags()
 void TextHandlerTest::stripDisallowedAttributes()
 {
     const QString testInputString = QStringLiteral("<p style=\"font-size:50px;\" color=#FFFFFF>Test</p>");
-    const QString testOutputString = QStringLiteral("Test");
+    const QString testOutputString = QStringLiteral("<p>Test</p>");
 
     TextHandler testTextHandler;
     testTextHandler.setData(testInputString);
@@ -143,8 +144,8 @@ void TextHandlerTest::emptyCodeTags()
 
 void TextHandlerTest::sendSimpleStringCase()
 {
-    const QString testInputString = QStringLiteral("This data should just be left alone.");
-    const QString testOutputString = QStringLiteral("This data should just be left alone.");
+    const QString testInputString = QStringLiteral("This data should just be put in a paragraph.");
+    const QString testOutputString = QStringLiteral("<p>This data should just be put in a paragraph.</p>");
 
     TextHandler testTextHandler;
     testTextHandler.setData(testInputString);
@@ -157,8 +158,8 @@ void TextHandlerTest::sendSingleParaMarkup()
     const QString testInputString = QStringLiteral(
         "Text para with **bold**, *italic*, [link](https://kde.org), ![image](mxc://kde.org/aebd3ffd40503e1ef0525bf8f0d60282fec6183e), `inline code`.");
     const QString testOutputString = QStringLiteral(
-        "Text para with <strong>bold</strong>, <em>italic</em>, <a href=\"https://kde.org\">link</a>, <img "
-        "src=\"mxc://kde.org/aebd3ffd40503e1ef0525bf8f0d60282fec6183e\" alt=\"image\">, <code>inline code</code>.");
+        "<p>Text para with <strong>bold</strong>, <em>italic</em>, <a href=\"https://kde.org\">link</a>, <img "
+        "src=\"mxc://kde.org/aebd3ffd40503e1ef0525bf8f0d60282fec6183e\" alt=\"image\">, <code>inline code</code>.</p>");
 
     TextHandler testTextHandler;
     testTextHandler.setData(testInputString);
@@ -184,7 +185,7 @@ void TextHandlerTest::sendMultipleSectionMarkup()
 void TextHandlerTest::sendBadLinks()
 {
     const QString testInputString = QStringLiteral("[link](kde.org), ![image](https://kde.org/aebd3ffd40503e1ef0525bf8f0d60282fec6183e)");
-    const QString testOutputString = QStringLiteral("<a>link</a>, <img alt=\"image\">");
+    const QString testOutputString = QStringLiteral("<p><a>link</a>, <img alt=\"image\"></p>");
 
     TextHandler testTextHandler;
     testTextHandler.setData(testInputString);
@@ -221,8 +222,8 @@ void TextHandlerTest::sendCodeClass()
 void TextHandlerTest::sendCustomEmoji()
 {
     const QString testInputString = QStringLiteral(":test:");
-    const QString testOutputString =
-        QStringLiteral("<img data-mx-emoticon=\"\" src=\"mxc://example.org/test\" alt=\":test:\" title=\":test:\" height=\"32\" vertical-align=\"middle\" />");
+    const QString testOutputString = QStringLiteral(
+        "<p><img data-mx-emoticon=\"\" src=\"mxc://example.org/test\" alt=\":test:\" title=\":test:\" height=\"32\" vertical-align=\"middle\" /></p>");
 
     TextHandler testTextHandler;
     testTextHandler.setData(testInputString);
@@ -235,7 +236,7 @@ void TextHandlerTest::sendCustomEmojiCode_data()
     QTest::addColumn<QString>("testInputString");
     QTest::addColumn<QString>("testOutputString");
 
-    QTest::newRow("inline") << QStringLiteral("`:test:`") << QStringLiteral("<code>:test:</code>");
+    QTest::newRow("inline") << QStringLiteral("`:test:`") << QStringLiteral("<p><code>:test:</code></p>");
     QTest::newRow("block") << QStringLiteral("```\n:test:\n```") << QStringLiteral("<pre><code>:test:\n</code></pre>");
 }
 
@@ -251,19 +252,6 @@ void TextHandlerTest::sendCustomEmojiCode()
     QCOMPARE(testTextHandler.handleSendText(), testOutputString);
 }
 
-void TextHandlerTest::receiveSpacelessSelfClosingTag()
-{
-    const QString testInputString = QStringLiteral("Test...<br/>...ing");
-    const QString testRichOutputString = QStringLiteral("Test...<br/>...ing");
-    const QString testPlainOutputString = QStringLiteral("Test...\n...ing");
-
-    TextHandler testTextHandler;
-    testTextHandler.setData(testInputString);
-
-    QCOMPARE(testTextHandler.handleRecieveRichText(), testRichOutputString);
-    QCOMPARE(testTextHandler.handleRecievePlainText(Qt::RichText), testPlainOutputString);
-}
-
 void TextHandlerTest::receiveStripReply()
 {
     const QString testInputString = QStringLiteral(
@@ -286,7 +274,6 @@ void TextHandlerTest::receiveRichInPlainOut_data()
     QTest::newRow("ampersand") << QStringLiteral("a &amp; b") << QStringLiteral("a & b");
     QTest::newRow("quote") << QStringLiteral("&quot;a and b&quot;") << QStringLiteral("\"a and b\"");
     QTest::newRow("new line") << QStringLiteral("new<br>line") << QStringLiteral("new\nline");
-    QTest::newRow("unescape") << QStringLiteral("can&#x27;t") << QStringLiteral("can't");
 }
 
 void TextHandlerTest::receiveRichInPlainOut()
@@ -373,7 +360,7 @@ void TextHandlerTest::receivePlainStripMarkup()
 void TextHandlerTest::receiveRichUserPill()
 {
     const QString testInputString = QStringLiteral("<p><a href=\"https://matrix.to/#/@alice:example.org\">@alice:example.org</a></p>");
-    const QString testOutputString = QStringLiteral("<b><a href=\"https://matrix.to/#/@alice:example.org\">@alice:example.org</a></b>");
+    const QString testOutputString = QStringLiteral("<p><b><a href=\"https://matrix.to/#/@alice:example.org\">@alice:example.org</a></b></p>");
 
     TextHandler testTextHandler;
     testTextHandler.setData(testInputString);
@@ -384,7 +371,7 @@ void TextHandlerTest::receiveRichUserPill()
 void TextHandlerTest::receiveRichStrikethrough()
 {
     const QString testInputString = QStringLiteral("<p><del>Test</del></p>");
-    const QString testOutputString = QStringLiteral("<s>Test</s>");
+    const QString testOutputString = QStringLiteral("<p><s>Test</s></p>");
 
     TextHandler testTextHandler;
     testTextHandler.setData(testInputString);
@@ -461,9 +448,6 @@ void TextHandlerTest::receiveRichPlainUrl()
     QString testOutputStringMxId = QStringLiteral(
         "<b><a href=\"https://matrix.to/#/@user:kde.org\">@user:kde.org</a></b> <b><a href=\"https://matrix.to/#/@user:kde.org\">Link already rich</a></b>");
 
-    QString testInputStringMxIdWithPrefix = QStringLiteral("a @user:kde.org b");
-    QString testOutputStringMxIdWithPrefix = QStringLiteral("a <b><a href=\"https://matrix.to/#/@user:kde.org\">@user:kde.org</a></b> b");
-
     TextHandler testTextHandler;
     testTextHandler.setData(testInputStringLink1);
 
@@ -477,9 +461,6 @@ void TextHandlerTest::receiveRichPlainUrl()
 
     testTextHandler.setData(testInputStringMxId);
     QCOMPARE(testTextHandler.handleRecieveRichText(Qt::RichText), testOutputStringMxId);
-
-    testTextHandler.setData(testInputStringMxIdWithPrefix);
-    QCOMPARE(testTextHandler.handleRecieveRichText(Qt::RichText), testOutputStringMxIdWithPrefix);
 }
 
 void TextHandlerTest::receiveRichEdited_data()
@@ -554,7 +535,7 @@ void TextHandlerTest::componentOutput_data()
                "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<br/>"), {}},
+               MessageComponent{MessageComponentType::Text, QStringLiteral("Ah, you mean something like"), {}},
                MessageComponent{
                    MessageComponentType::Code,
                    QStringLiteral(

autotests/windowcontrollertest.cpp

@@ -17,6 +17,7 @@ class WindowControllerTest : public QObject
 
 private Q_SLOTS:
     void nullWindow();
+    void geometry();
     void showAndRaise();
     void toggle();
 
@@ -29,10 +30,32 @@ void WindowControllerTest::nullWindow()
     auto &instance = WindowController::instance();
     QCOMPARE(instance.window(), nullptr);
 
+    instance.restoreGeometry();
+    instance.saveGeometry();
     instance.showAndRaiseWindow({});
     instance.toggleWindow();
 }
 
+void WindowControllerTest::geometry()
+{
+    auto &instance = WindowController::instance();
+
+    QWindow window;
+    window.setGeometry(0, 0, 200, 200);
+    instance.setWindow(&window);
+    QCOMPARE(instance.window(), &window);
+
+    instance.saveGeometry();
+    const auto stateConfig = KSharedConfig::openStateConfig();
+    KConfigGroup windowGroup = stateConfig->group(QStringLiteral("Window"));
+    QCOMPARE(KWindowConfig::hasSavedWindowSize(windowGroup), true);
+
+    window.setGeometry(0, 0, 400, 400);
+    QCOMPARE(window.geometry(), QRect(0, 0, 400, 400));
+    instance.restoreGeometry();
+    QCOMPARE(window.geometry(), QRect(0, 0, 200, 200));
+}
+
 void WindowControllerTest::showAndRaise()
 {
     auto &instance = WindowController::instance();

org.kde.neochat.appdata.xml

@@ -22,6 +22,7 @@
   <name xml:lang="eo">NeoChat</name>
   <name xml:lang="es">NeoChat</name>
   <name xml:lang="eu">NeoChat</name>
+  <name xml:lang="fa">نئوچت</name>
   <name xml:lang="fi">NeoChat</name>
   <name xml:lang="fr">NeoChat</name>
   <name xml:lang="gl">NeoChat</name>
@@ -56,7 +57,6 @@
   <summary xml:lang="ca-valencia">Xategeu amb els vostres amics a Matrix</summary>
   <summary xml:lang="cs">Mluvte se svými přáteli na Matrixu</summary>
   <summary xml:lang="de">Mit den Freunden auf Matrix unterhalten</summary>
-  <summary xml:lang="el">Συνομιλήστε με τους φίλους σας στο matrix</summary>
   <summary xml:lang="en-GB">Chat with your friends on matrix</summary>
   <summary xml:lang="eo">Babilu kun viaj amikoj sur matrix</summary>
   <summary xml:lang="es">Charle con sus amigos en matrix</summary>
@@ -74,6 +74,7 @@
   <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>
+  <summary xml:lang="ru">Общение с друзьями в Matrix</summary>
   <summary xml:lang="sl">Klepet z vašimi prijatelji na matrixu</summary>
   <summary xml:lang="sv">Chatta med dina vänner på Matrix</summary>
   <summary xml:lang="ta">மேட்ரிக்ஸு மூலம் உங்கள் நண்பர்களிடம் பேசலாம்</summary>
@@ -88,7 +89,6 @@
     <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="de">NeoChat ist eine Anwendung für Unterhaltungen mit allen Vorteilen des Matrix-Netzwerkes. Sie bietet eine sichere Möglichkeit zum Versenden von Nachrichten, Videos und Audiodateien and die Familienmitglieder.</p>
-    <p xml:lang="el">Το NeoChat είναι μια εφαρμογή συνομιλίας που σας επιτρέπει να εκμεταλλευτείτε πλήρως το δίκτυο Matrix. Σας παρέχει έναν ασφαλή τρόπο να στέλνετε μηνύματα κειμένου, βίντεο και αρχεία ήχου στην οικογένεια, τους συναδέλφους και τους φίλους σας.</p>
     <p xml:lang="en-GB">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="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>
@@ -105,6 +105,7 @@
     <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="nn">NeoChat er ein prateapp som lèt deg bruka all funksjonalitet i Matrix-nettverket. Du kan utveksla tekst, lyd og videoar med vennar, familie og kollegaar på ein trygg måte.</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="ru">NeoChat — приложение для общения, предоставляющее все преимущества сети Matrix. С его помощью можно безопасно отправлять текстовые сообщения, видеозаписи и звуковые файлы родственникам, коллегам и друзьям.</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="sv">NeoChat är ett chattprogram som låter dig dra full nytta av Matrix-nätverket. Det ger dig ett säkert sätt att skicka textmeddelanden, videor och ljudfiler till din familj, kollegor och vänner.</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>
@@ -116,7 +117,6 @@
     <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>
     <p xml:lang="ca-valencia">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'encriptació d'extrem a extrem. Hi ha algunes altres omissions més xicotetes a causa del fet que l'especificació de Matrix està evolucionant constantment, però l'objectiu seguix sent proporcionar suport eventual per a tota l'especificació.</p>
     <p xml:lang="de">NeoChat versucht eine vollumfängliche Anwendung für die Spezifikation von Matrix zu sein. Damit wird alles der aktuellen stabilen Spezifikation mit den erwähnenswerten Ausnahmen von VoIP, Diskussionsfäden und ein paar Teilen der Ende-zu-Ende-Verschlüsselung unterstützt. Zudem sind andere kleinere Auslassungen vorhanden, da sich die Matrixspezifikation ständig weiterentwickelt. Nichtsdestotrotz soll letztendlich die gesamte Spezifikation unterstützt werden.</p>
-    <p xml:lang="el">Το NeoChat στοχεύει να είναι μια πλήρως εξοπλισμένη εφαρμογή για τις προδιαγραφές Matrix. Ως εκ τούτου, υποστηρίζονται όλα τα στοιχεία της τρέχουσας σταθερής προδιαγραφής με τις αξιοσημείωτες εξαιρέσεις του VoIP, των νημάτων και ορισμένων πτυχών της κρυπτογράφησης στα άκρα. Υπάρχουν μερικές άλλες μικρότερες παραλείψεις που οφείλονται στο γεγονός ότι η προδιαγραφή Matrix εξελίσσεται συνεχώς, αλλά ο στόχος παραμένει να παρέχεται τελικά υποστήριξη για ολόκληρη την προδιαγραφή.</p>
     <p xml:lang="en-GB">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="eo">NeoChat celas esti plene kapabla aplikaĵo por la Matrix-specifo. Kiel tia, ĉio en la nuna stabila specifo kun la rimarkindaj esceptoj de VoIP, fadenoj kaj kelkaj aspektoj de Fin-al-Fina Ĉifrado estas subtenataj. Estas kelkaj aliaj pli malgrandaj preterlasoj pro la fakto, ke la Matrix-speco konstante evoluas, sed la celo restas provizi finfine subtenon por la tuta specifaĵo.</p>
     <p xml:lang="es">NeoChat pretende ser una aplicación con todas las funciones para la especificación de Matrix. Como tal, admite todo en la especificación estable actual, con las notables excepciones de VoIP, subprocesos y algunas funciones de cifrado de extremo a extremo. Existen algunas omisiones menos importantes debido al hecho de que la especificación de Matrix está en constante evolución, pero el objetivo sigue siendo brindar compatibilidad final con toda la especificación.</p>
@@ -147,7 +147,6 @@
     <p xml:lang="ca">A causa de la naturalesa del desenvolupament de l'especificació de Matrix, el NeoChat també implementa nombroses característiques inestables. Actualment són:</p>
     <p xml:lang="ca-valencia">A causa de la naturalea del desenvolupament de l'especificació de Matrix, NeoChat també implementa nombroses característiques inestables. Actualment són:</p>
     <p xml:lang="de">Durch die Weiterentwicklung der Matrix-Spezifikation unterstützt auch NeoChat einige als noch instabil gekennzeichnete Funktionen. Derzeit sind das:</p>
-    <p xml:lang="el">Λόγω της φύσης της ανάπτυξης των προδιαγραφών Matrix, το NeoChat υποστηρίζει επίσης πολλά ασταθή χαρακτηριστικά. Επί του παρόντος, αυτά είναι:</p>
     <p xml:lang="en-GB">Due to the nature of the Matrix specification development NeoChat also supports numerous unstable features. Currently these are:</p>
     <p xml:lang="eo">Pro la naturo de la Matrix-specifevoluo NeoChat ankaŭ subtenas multajn malstabilajn funkciojn. Nuntempe ĉi tiuj estas:</p>
     <p xml:lang="es">Debido a la naturaleza del desarrollo de la especificación de Matrix, NeoChat también permite numerosas funciones no estables, como:</p>
@@ -179,7 +178,6 @@
       <li xml:lang="ar">التصويت - MSC3381</li>
       <li xml:lang="ca">Enquestes - MSC3381</li>
       <li xml:lang="ca-valencia">Enquestes - MSC3381</li>
-      <li xml:lang="el">Δημοσκοπήσεις - MSC3381</li>
       <li xml:lang="en-GB">Polls - MSC3381</li>
       <li xml:lang="eo">Enketoj - MSC3381</li>
       <li xml:lang="es">Encuestas - MSC3381</li>
@@ -198,6 +196,7 @@
       <li xml:lang="nn">Avstemmingar – MSC3381</li>
       <li xml:lang="pl">Ankiety - MSC3381</li>
       <li xml:lang="pt">Inquéritos - MSC3381</li>
+      <li xml:lang="ru">Голосования — MSC3381</li>
       <li xml:lang="sl">Polls - MSC3381</li>
       <li xml:lang="sv">Polls - MSC3381</li>
       <li xml:lang="ta">வாக்கெடுப்புகள் - MSC3381</li>
@@ -209,7 +208,6 @@
       <li xml:lang="ar">حزم الملصقات - MSC2545</li>
       <li xml:lang="ca">Paquets d'adhesius - MSC2545</li>
       <li xml:lang="ca-valencia">Paquets d'adhesius - MSC2545</li>
-      <li xml:lang="el">Πακέτα αυτοκόλλητων - MSC2545</li>
       <li xml:lang="en-GB">Sticker Packs - MSC2545</li>
       <li xml:lang="eo">Glumark-Pakoj - MSC2545</li>
       <li xml:lang="es">Paquetes de pegatinas - MSC2545</li>
@@ -240,7 +238,6 @@
       <li xml:lang="ar">موقع الأحداث - MSC3488</li>
       <li xml:lang="ca">Esdeveniments d'ubicació - MSC3488</li>
       <li xml:lang="ca-valencia">Esdeveniments d'ubicació - MSC3488</li>
-      <li xml:lang="el">Τοποθεσία γεγονότα - MSC3488</li>
       <li xml:lang="en-GB">Location Events - MSC3488</li>
       <li xml:lang="eo">Lokaj Eventoj - MSC3488</li>
       <li xml:lang="es">Eventos de ubicación - MSC3488</li>
@@ -306,7 +303,6 @@
       <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="de">Hauptansicht mit Raumliste, Unterhaltung und Raum-Informationen</caption>
-      <caption xml:lang="el">Κύρια προβολή με λίστα δωματίων, συνομιλία και πληροφορίες δωματίων</caption>
       <caption xml:lang="en-GB">Main view with room list, chat, and room information</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>
@@ -341,7 +337,6 @@
       <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="de">Neue Gemeinschaften mit den Umgebungen von Matrix erkunden</caption>
-      <caption xml:lang="el">Ανακαλύψτε νέες κοινότητες με το Matrix Spaces</caption>
       <caption xml:lang="en-GB">Discover new communities with Matrix Spaces</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>
@@ -358,8 +353,10 @@
       <caption xml:lang="nl">Ontdek nieuwe gemeenschappen met Matrix-ruimten</caption>
       <caption xml:lang="nn">Oppdag nye fellesskap med Matrix Spaces</caption>
       <caption xml:lang="pl">Odkrywaj nowe społeczności w Przestrzeniach Matriksa</caption>
+      <caption xml:lang="ru">Поиск новых сообществ с помощью Matrix Spaces</caption>
       <caption xml:lang="sl">Odkrijte nove skupnosti z Matrix Spaces</caption>
       <caption xml:lang="sv">Upptäck nya gemenskaper med Matrix Spaces</caption>
+      <caption xml:lang="ta">மேட்ரிக்ஸு இடங்களின் மூலம் புதிய சமூகங்களைக் கண்டுபிடிக்கலாம்</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>
@@ -379,7 +376,6 @@
       <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="de">Hauptansicht mit Raumliste, Unterhaltung und Raum-Informationen</caption>
-      <caption xml:lang="el">Κύρια προβολή με λίστα δωματίων, συνομιλία και πληροφορίες δωματίων</caption>
       <caption xml:lang="en-GB">Main view with room list, chat, and room information</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>
@@ -415,7 +411,6 @@
       <caption xml:lang="ca-valencia">Pantalla d'inici de sessió</caption>
       <caption xml:lang="cs">Přihlašovací obrazovka</caption>
       <caption xml:lang="de">Anmeldebildschirm</caption>
-      <caption xml:lang="el">Οθόνη εισόδου</caption>
       <caption xml:lang="en-GB">Login screen</caption>
       <caption xml:lang="eo">Ensaluta ekrano</caption>
       <caption xml:lang="es">Pantalla de inicio de sesión</caption>
@@ -448,6 +443,7 @@
     <content_attribute id="social-chat">intense</content_attribute>
   </content_rating>
   <releases>
+    <release version="24.08.3" date="2024-11-07"/>
     <release version="24.08.2" date="2024-10-10"/>
     <release version="24.08.1" date="2024-09-12"/>
     <release version="24.08.0" date="2024-08-22"/>

org.kde.neochat.desktop

@@ -15,6 +15,7 @@ Name[en_GB]=NeoChat
 Name[eo]=NeoChat
 Name[es]=NeoChat
 Name[eu]=NeoChat
+Name[fa]=نئوچت
 Name[fi]=NeoChat
 Name[fr]=NeoChat
 Name[gl]=NeoChat

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

@@ -1,122 +0,0 @@
-<?xml version="1.0" ?>
-<!DOCTYPE refentry PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [
-<!ENTITY % Slovenian "INCLUDE">
-]>
-<!--
-SPDX-FileCopyrightText: 2022 Carl Schwan <carl@carlschwan.eu>
-SPDX-License-Identifier: CC-BY-SA-4.0
--->
-
-<refentry lang="&language;">
-<refentryinfo>
-<title
->Uporabniški priročnik za NeoChat</title>
-<author
-><firstname
->Carl</firstname
-><surname
->Schwan</surname
-> <contrib
->Stran z navodili za NeoChat.</contrib
-> <email
->carl@carlschwan.eu</email
-></author>
-<date
->01.11.2022</date>
-<releaseinfo
->22,09</releaseinfo>
-<productname
->NeoChat</productname>
-</refentryinfo>
-
-<refmeta>
-  <refentrytitle>
-    <command
->neochat</command>
-  </refentrytitle>
-  <manvolnum
->1</manvolnum>
-</refmeta>
-
-<refnamediv>
-  <refname
->neochat</refname>
-  <refpurpose
->Odjemalec za interakcijo s protokolom za matrično sporočanje</refpurpose>
-  </refnamediv>
-  <!-- body begins here -->
-  <refsynopsisdiv id='synopsis'>
-  <cmdsynopsis
-><command
->neochat</command
-> <arg choice="opt"
-><replaceable
->URI</replaceable
-></arg
-> </cmdsynopsis>
-</refsynopsisdiv>
-
-
-<refsect1 id="description">
-  <title
->Opis</title>
-  <para
-><command
->neochat</command
-> je aplikacija za klepet za matrični protokol, ki deluje na namizju in mobilni napravi. </para>
-</refsect1>
-
-<refsect1 id="options"
-><title
->Možnosti</title>
-<variablelist>
-  <varlistentry>
-  <term
-><option
->URI</option
-></term>
-  <listitem>
-    <para
->Uri matrike za uporabnika ali sobo. npr. matrix:u/user:example.org in matrix:r/root:example.org. Tako bo NeoChat poskušal odpreti dano sobo ali pogovor. </para>
-  </listitem>
-  </varlistentry>
-</variablelist>
-</refsect1>
-
-<refsect1 id="bug">
-  <title
->Poročanje o napakah</title>
-  <para
->Napake in zahteve po funkcijah lahko prijavite na <ulink url="https://bugs.kde.org/enter_bug.cgi?product=NeoChat&amp;component=General"
->https://bugs.kde.org/enter_bug.cgi? product=NeoChat&amp;component=General</ulink
-></para>
-</refsect1>
-
-<refsect1>
-  <title
->Poglej tudi</title>
-  <simplelist>
-    <member
->Seznam pogostih vprašanj o Matrix <ulink url="https://matrix.org/faq/"
->https://matrix.org/faq/</ulink
-> </member>
-    <member
->kf5options(7)</member>
-    <member
->qt5options(7)</member>
-  </simplelist>
-</refsect1>
-
-<refsect1 id="copyright"
-><title
->Avtorske pravice</title>
-<para
->Avtorske pravice &copy; 2020-2022 Tobias Fella </para>
-<para
->Avtorske pravice &copy; 2020-2022 Carl Schwan </para>
-<para
->Licenca: GNU General Public različica 3 ali novejša &lt;<ulink url="https://www.gnu.org/licenses/gpl-3.0.html"
->https://www.gnu.org/licenses/gpl-3.0 .html</ulink
->&gt;</para>
-</refsect1>
-</refentry>

po/tr/docs/neochat/CMakeLists.txt

@@ -0,0 +1,5 @@
+# SPDX-FileCopyrightText: 2022 Carl Schwan <carl@carlschwan.eu>
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+kdoctools_create_manpage(man-neochat.1.docbook 1 INSTALL_DESTINATION ${MAN_INSTALL_DIR})

snapcraft.yaml

@@ -130,8 +130,8 @@ parts:
       - kquickimageeditor
     parse-info:
       - usr/share/metainfo/org.kde.neochat.appdata.xml
-    source: https://invent.kde.org/network/neochat.git
-    source-tag: 'v24.08.1'
+    source: .
+    source-type: local
     plugin: cmake
     build-packages:
       - cmark

src/CMakeLists.txt

@@ -192,10 +192,6 @@ add_library(neochat STATIC
     models/readmarkermodel.h
     neochatroommember.cpp
     neochatroommember.h
-    models/threadmodel.cpp
-    models/threadmodel.h
-    enums/messagetype.h
-    messagecomponent.h
 )
 
 set_source_files_properties(qml/OsmLocationPlugin.qml PROPERTIES
@@ -240,10 +236,15 @@ ecm_add_qml_module(neochat URI org.kde.neochat GENERATE_PLUGIN_SOURCE
         qml/EmojiSas.qml
         qml/ConfirmDeactivateAccountDialog.qml
         qml/VerificationCanceled.qml
+        qml/GlobalMenu.qml
+        qml/EditMenu.qml
         qml/MessageDelegateContextMenu.qml
         qml/FileDelegateContextMenu.qml
         qml/MessageSourceSheet.qml
+        qml/ReportSheet.qml
         qml/ConfirmEncryptionDialog.qml
+        qml/RemoveSheet.qml
+        qml/BanSheet.qml
         qml/RoomSearchPage.qml
         qml/LocationChooser.qml
         qml/TimelineView.qml
@@ -287,8 +288,6 @@ ecm_add_qml_module(neochat URI org.kde.neochat GENERATE_PLUGIN_SOURCE
         qml/ConsentDialog.qml
         qml/AskDirectChatConfirmation.qml
         qml/HoverLinkIndicator.qml
-        qml/AvatarNotification.qml
-        qml/ReasonDialog.qml
     DEPENDENCIES
         QtCore
         QtQuick
@@ -306,12 +305,8 @@ add_subdirectory(devtools)
 add_subdirectory(login)
 add_subdirectory(chatbar)
 
-if(NOT ANDROID AND NOT WIN32)
-    qt_target_qml_sources(neochat QML_FILES
-        qml/ShareAction.qml
-        qml/GlobalMenu.qml
-        qml/EditMenu.qml
-    )
+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
@@ -389,7 +384,7 @@ if(NOT ANDROID)
     target_compile_definitions(neochat PUBLIC -DHAVE_ICU)
 endif()
 
-if (NOT ANDROID AND NOT WIN32 AND NOT APPLE AND NOT HAIKU)
+if (NOT ANDROID AND NOT WIN32 AND NOT APPLE)
     target_compile_definitions(neochat PUBLIC -DHAVE_RUNNER)
     target_compile_definitions(neochat PUBLIC -DHAVE_X11=1)
     target_sources(neochat PRIVATE runner.cpp)
@@ -430,7 +425,7 @@ if (TARGET KF6::Crash)
     target_link_libraries(neochat PUBLIC KF6::Crash)
 endif()
 
-kconfig_target_kcfg_file(neochat FILE neochatconfig.kcfg CLASS_NAME NeoChatConfig MUTATORS GENERATE_PROPERTIES DEFAULT_VALUE_GETTERS PARENT_IN_CONSTRUCTOR SINGLETON GENERATE_MOC QML_REGISTRATION)
+kconfig_add_kcfg_files(neochat GENERATE_MOC neochatconfig.kcfgc)
 
 if(NEOCHAT_FLATPAK)
     target_compile_definitions(neochat PUBLIC NEOCHAT_FLATPAK)
@@ -445,11 +440,8 @@ if(ANDROID)
     target_sources(neochat-app PRIVATE notifyrc.qrc)
     target_link_libraries(neochat PUBLIC Qt::Svg OpenSSL::SSL)
     kirigami_package_breeze_icons(ICONS
-        "arrow-down-symbolic"
-        "arrow-up-symbolic"
-        "arrow-up-double-symbolic"
-        "arrow-left-symbolic"
-        "arrow-right-symbolic"
+        "arrow-down"
+        "arrow-up"
         "checkmark"
         "help-about"
         "im-user"
@@ -458,7 +450,6 @@ if(ANDROID)
         "mail-attachment"
         "dialog-cancel"
         "preferences-desktop-emoticons"
-        "preferences-security"
         "document-open"
         "document-save"
         "document-send"

src/actionshandler.cpp

@@ -1,48 +1,70 @@
 // SPDX-FileCopyrightText: 2020 Carl Schwan <carlschwan@kde.org>
-// SPDX-FileCopyrightText: 2024 James Graham <james.h.graham@protonmail.com>
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 #include "actionshandler.h"
 
-#include "chatbarcache.h"
+#include <Quotient/csapi/joining.h>
+#include <Quotient/events/roommemberevent.h>
+
+#include <cmark.h>
+
+#include <KLocalizedString>
+#include <QStringBuilder>
+
 #include "models/actionsmodel.h"
 #include "neochatconfig.h"
 #include "texthandler.h"
 
 using namespace Quotient;
-using namespace Qt::StringLiterals;
 
-void ActionsHandler::handleMessageEvent(NeoChatRoom *room, ChatBarCache *chatBarCache)
+ActionsHandler::ActionsHandler(QObject *parent)
+    : QObject(parent)
 {
-    if (room == nullptr || chatBarCache == nullptr) {
+}
+
+NeoChatRoom *ActionsHandler::room() const
+{
+    return m_room;
+}
+
+void ActionsHandler::setRoom(NeoChatRoom *room)
+{
+    if (m_room == room) {
+        return;
+    }
+
+    m_room = room;
+    Q_EMIT roomChanged();
+}
+
+void ActionsHandler::handleMessageEvent(ChatBarCache *chatBarCache)
+{
+    if (!m_room || !chatBarCache) {
         qWarning() << "ActionsHandler::handleMessageEvent - called with m_room and/or chatBarCache set to nullptr.";
         return;
     }
 
+    checkEffects(chatBarCache->text());
     if (!chatBarCache->attachmentPath().isEmpty()) {
         QUrl url(chatBarCache->attachmentPath());
         auto path = url.isLocalFile() ? url.toLocalFile() : url.toString();
-        room->uploadFile(QUrl(path), chatBarCache->text().isEmpty() ? path.mid(path.lastIndexOf(u'/') + 1) : chatBarCache->text());
+        m_room->uploadFile(QUrl(path), chatBarCache->text().isEmpty() ? path.mid(path.lastIndexOf(u'/') + 1) : chatBarCache->text());
         chatBarCache->setAttachmentPath({});
         chatBarCache->setText({});
         return;
     }
 
-    const auto handledText = handleMentions(chatBarCache);
-    const auto result = handleQuickEdit(room, handledText);
-    if (!result) {
-        handleMessage(room, handledText, chatBarCache);
-    }
+    QString handledText = chatBarCache->text();
+    handledText = handleMentions(handledText, chatBarCache->mentions());
+    handleMessage(m_room->mainCache()->text(), handledText, chatBarCache);
 }
 
-QString ActionsHandler::handleMentions(ChatBarCache *chatBarCache)
+QString ActionsHandler::handleMentions(QString handledText, QList<Mention> *mentions)
 {
-    const auto mentions = chatBarCache->mentions();
     std::sort(mentions->begin(), mentions->end(), [](const auto &a, const auto &b) -> bool {
         return a.cursor.anchor() > b.cursor.anchor();
     });
 
-    auto handledText = chatBarCache->text();
     for (const auto &mention : *mentions) {
         if (mention.text.isEmpty() || mention.id.isEmpty()) {
             continue;
@@ -56,64 +78,56 @@ QString ActionsHandler::handleMentions(ChatBarCache *chatBarCache)
     return handledText;
 }
 
-bool ActionsHandler::handleQuickEdit(NeoChatRoom *room, const QString &handledText)
+void ActionsHandler::handleMessage(const QString &text, QString handledText, ChatBarCache *chatBarCache)
 {
-    if (room == nullptr) {
-        return false;
-    }
-
+    Q_ASSERT(m_room);
     if (NeoChatConfig::allowQuickEdit()) {
         QRegularExpression sed(QStringLiteral("^s/([^/]*)/([^/]*)(/g)?$"));
-        auto match = sed.match(handledText);
+        auto match = sed.match(text);
         if (match.hasMatch()) {
             const QString regex = match.captured(1);
             const QString replacement = match.captured(2).toHtmlEscaped();
             const QString flags = match.captured(3);
 
-            for (auto it = room->messageEvents().crbegin(); it != room->messageEvents().crend(); it++) {
+            for (auto it = m_room->messageEvents().crbegin(); it != m_room->messageEvents().crend(); it++) {
                 if (const auto event = eventCast<const RoomMessageEvent>(&**it)) {
-                    if (event->senderId() == room->localMember().id() && event->hasTextContent()) {
+#if Quotient_VERSION_MINOR > 8
+                    if (event->senderId() == m_room->localMember().id() && event->has<EventContent::TextContent>()) {
+#else
+                    if (event->senderId() == m_room->localMember().id() && event->hasTextContent()) {
+#endif
                         QString originalString;
                         if (event->content()) {
 #if Quotient_VERSION_MINOR > 8
-                            originalString = static_cast<const Quotient::EventContent::TextContent *>(event->content().get())->body;
+                            originalString = event->get<EventContent::TextContent>()->body;
 #else
                             originalString = static_cast<const Quotient::EventContent::TextContent *>(event->content())->body;
 #endif
                         } else {
                             originalString = event->plainBody();
                         }
-                        if (flags == "/g"_L1) {
-                            room->postHtmlMessage(handledText, originalString.replace(regex, replacement), event->msgtype(), {}, event->id());
+                        if (flags == "/g"_ls) {
+                            m_room->postHtmlMessage(handledText, originalString.replace(regex, replacement), event->msgtype(), {}, event->id());
                         } else {
-                            room->postHtmlMessage(handledText,
-                                                  originalString.replace(originalString.indexOf(regex), regex.size(), replacement),
-                                                  event->msgtype(),
-                                                  {},
-                                                  event->id());
+                            m_room->postHtmlMessage(handledText,
+                                                    originalString.replace(originalString.indexOf(regex), regex.size(), replacement),
+                                                    event->msgtype(),
+                                                    {},
+                                                    event->id());
                         }
-                        return true;
+                        return;
                     }
                 }
             }
         }
     }
-    return false;
-}
-
-void ActionsHandler::handleMessage(NeoChatRoom *room, QString handledText, ChatBarCache *chatBarCache)
-{
-    if (room == nullptr) {
-        return;
-    }
-
     auto messageType = RoomMessageEvent::MsgType::Text;
 
     if (handledText.startsWith(QLatin1Char('/'))) {
         for (const auto &action : ActionsModel::instance().allActions()) {
             if (handledText.indexOf(action.prefix) == 1
                 && (handledText.indexOf(" "_ls) == action.prefix.length() + 1 || handledText.length() == action.prefix.length() + 1)) {
-                handledText = action.handle(handledText.mid(action.prefix.length() + 1).trimmed(), room, chatBarCache);
+                handledText = action.handle(handledText.mid(action.prefix.length() + 1).trimmed(), m_room, chatBarCache);
                 if (action.messageType.has_value()) {
                     messageType = *action.messageType;
                 }
@@ -130,11 +144,35 @@ void ActionsHandler::handleMessage(NeoChatRoom *room, QString handledText, ChatB
     textHandler.setData(handledText);
     handledText = textHandler.handleSendText();
 
+    if (handledText.count("<p>"_ls) == 1 && handledText.count("</p>"_ls) == 1) {
+        handledText.remove("<p>"_ls);
+        handledText.remove("</p>"_ls);
+    }
+
     if (handledText.length() == 0) {
         return;
     }
 
-    room->postMessage(chatBarCache->text(), handledText, messageType, chatBarCache->replyId(), chatBarCache->editId(), chatBarCache->threadId());
+    m_room->postMessage(text, handledText, messageType, chatBarCache->replyId(), chatBarCache->editId(), chatBarCache->threadId());
+}
+
+void ActionsHandler::checkEffects(const QString &text)
+{
+    std::optional<QString> effect = std::nullopt;
+    if (text.contains(QStringLiteral("\u2744"))) {
+        effect = QLatin1String("snowflake");
+    } else if (text.contains(QStringLiteral("\u1F386"))) {
+        effect = QLatin1String("fireworks");
+    } else if (text.contains(QStringLiteral("\u2F387"))) {
+        effect = QLatin1String("fireworks");
+    } else if (text.contains(QStringLiteral("\u1F389"))) {
+        effect = QLatin1String("confetti");
+    } else if (text.contains(QStringLiteral("\u1F38A"))) {
+        effect = QLatin1String("confetti");
+    }
+    if (effect.has_value()) {
+        Q_EMIT showEffect(*effect);
+    }
 }
 
 #include "moc_actionshandler.cpp"

src/actionshandler.h

@@ -1,18 +1,22 @@
 // SPDX-FileCopyrightText: 2020 Carl Schwan <carlschwan@kde.org>
-// SPDX-FileCopyrightText: 2024 James Graham <james.h.graham@protonmail.com>
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 #pragma once
 
-#include <QString>
+#include <QObject>
+#include <QQmlEngine>
+
+#include <Quotient/events/roommessageevent.h>
+
+#include "chatbarcache.h"
+#include "neochatroom.h"
 
-class ChatBarCache;
 class NeoChatRoom;
 
 /**
  * @class ActionsHandler
  *
- * This class contains functions to handle chat messages ready for posting to a room.
+ * This class handles chat messages ready for posting to a room.
  *
  * Everything that needs to be done to prepare the message for posting in a room
  * including:
@@ -27,17 +31,36 @@ class NeoChatRoom;
  *
  * @sa ActionsModel, NeoChatRoom
  */
-class ActionsHandler
+class ActionsHandler : public QObject
 {
+    Q_OBJECT
+    QML_ELEMENT
+
+    /**
+     * @brief The room that messages will be sent to.
+     */
+    Q_PROPERTY(NeoChatRoom *room READ room WRITE setRoom NOTIFY roomChanged)
+
 public:
+    explicit ActionsHandler(QObject *parent = nullptr);
+
+    [[nodiscard]] NeoChatRoom *room() const;
+    void setRoom(NeoChatRoom *room);
+
+Q_SIGNALS:
+    void roomChanged();
+    void showEffect(const QString &effect);
+
+public Q_SLOTS:
     /**
      * @brief Pre-process text and send message event.
      */
-    static void handleMessageEvent(NeoChatRoom *room, ChatBarCache *chatBarCache);
+    void handleMessageEvent(ChatBarCache *chatBarCache);
 
 private:
-    static QString handleMentions(ChatBarCache *chatBarCache);
-    static bool handleQuickEdit(NeoChatRoom *room, const QString &handledText);
+    QPointer<NeoChatRoom> m_room;
+    void checkEffects(const QString &text);
 
-    static void handleMessage(NeoChatRoom *room, QString handledText, ChatBarCache *chatBarCache);
+    QString handleMentions(QString handledText, QList<Mention> *mentions);
+    void handleMessage(const QString &text, QString handledText, ChatBarCache *chatBarCache);
 };

src/chatbar/CMakeLists.txt

@@ -11,6 +11,7 @@ ecm_add_qml_module(chatbar GENERATE_PLUGIN_SOURCE
         CompletionMenu.qml
         EmojiDelegate.qml
         EmojiGrid.qml
+        ReplyPane.qml
         PieProgressBar.qml
         EmojiPicker.qml
         EmojiDialog.qml

src/chatbar/ChatBar.qml

@@ -53,6 +53,14 @@ QQC2.Control {
         }
     }
 
+    /**
+     * @brief The ActionsHandler object to use.
+     *
+     * This is expected to have the correct room set otherwise messages will be sent
+     * to the wrong room.
+     */
+    required property ActionsHandler actionsHandler
+
     /**
      * @brief The list of actions in the ChatBar.
      *
@@ -167,7 +175,6 @@ QQC2.Control {
 
             Layout.fillWidth: true
             Layout.margins: Kirigami.Units.largeSpacing
-            Layout.preferredHeight: active ? item.implicitHeight : 0
 
             active: visible
             visible: root.currentRoom.mainCache.replyId.length > 0 || root.currentRoom.mainCache.attachmentPath.length > 0
@@ -212,7 +219,7 @@ QQC2.Control {
                     }
 
                     onTextChanged: {
-                        if (!repeatTimer.running && NeoChatConfig.typingNotifications) {
+                        if (!repeatTimer.running && Config.typingNotifications) {
                             var textExists = text.length > 0;
                             root.currentRoom.sendTypingNotification(textExists);
                             textExists ? repeatTimer.start() : repeatTimer.stop();
@@ -346,40 +353,23 @@ QQC2.Control {
         startBreakpoint: Kirigami.Units.gridUnit * 46
         endBreakpoint: Kirigami.Units.gridUnit * 66
         startPercentWidth: 100
-        endPercentWidth: NeoChatConfig.compactLayout ? 100 : 85
-        maxWidth: NeoChatConfig.compactLayout ? -1 : Kirigami.Units.gridUnit * 60
+        endPercentWidth: Config.compactLayout ? 100 : 85
+        maxWidth: Config.compactLayout ? -1 : Kirigami.Units.gridUnit * 60
 
         parentWidth: root.width
     }
 
     Component {
         id: replyPane
-        Item {
-            implicitWidth: replyComponent.implicitWidth
-            implicitHeight: replyComponent.implicitHeight
-            ReplyComponent {
-                id: replyComponent
-                replyEventId: _private.chatBarCache.replyId
-                replyAuthor: _private.chatBarCache.relationAuthor
-                replyContentModel: _private.chatBarCache.relationEventContentModel
-                maxContentWidth: paneLoader.item.width
-            }
-            QQC2.Button {
-                id: cancelButton
+        ReplyPane {
+            userName: _private.chatBarCache.relationUser.displayName
+            userColor: _private.chatBarCache.relationUser.color
+            userAvatar: _private.chatBarCache.relationUser.avatarUrl
+            text: _private.chatBarCache.relationMessage
 
-                anchors.top: parent.top
-                anchors.right: parent.right
-
-                display: QQC2.AbstractButton.IconOnly
-                text: i18nc("@action:button", "Cancel reply")
-                icon.name: "dialog-close"
-                onClicked: {
-                    _private.chatBarCache.replyId = "";
-                    _private.chatBarCache.attachmentPath = "";
-                }
-                QQC2.ToolTip.text: text
-                QQC2.ToolTip.visible: hovered
-                QQC2.ToolTip.delay: Kirigami.Units.toolTipDelay
+            onCancel: {
+                _private.chatBarCache.replyId = "";
+                _private.chatBarCache.attachmentPath = "";
             }
         }
     }
@@ -401,11 +391,11 @@ QQC2.Control {
         onChatBarCacheChanged: documentHandler.chatBarCache = chatBarCache
 
         function postMessage() {
-            _private.chatBarCache.postMessage();
+            root.actionsHandler.handleMessageEvent(_private.chatBarCache);
             repeatTimer.stop();
             root.currentRoom.markAllMessagesAsRead();
             textField.clear();
-            _private.chatBarCache.clearRelations();
+            _private.chatBarCache.replyId = "";
             messageSent();
         }
 

src/chatbar/EmojiDelegate.qml

@@ -33,7 +33,7 @@ QQC2.ItemDelegate {
             Kirigami.Icon {
                 width: Kirigami.Units.gridUnit * 0.5
                 height: Kirigami.Units.gridUnit * 0.5
-                source: "arrow-down-symbolic"
+                source: "arrow-down"
                 anchors.bottom: parent.bottom
                 anchors.right: parent.right
                 visible: root.showTones

src/chatbar/ReplyPane.qml

@@ -0,0 +1,98 @@
+// SPDX-FileCopyrightText: 2020 Carl Schwan <carl@carlschwan.de>
+// SPDX-FileCopyrightText: 2020 Noah Davis <noahadvs@gmail.com>
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+import QtQuick
+import QtQuick.Layouts
+import QtQuick.Controls as QQC2
+
+import org.kde.kirigami as Kirigami
+import org.kde.kirigamiaddons.labs.components as KirigamiComponents
+
+import org.kde.neochat
+
+RowLayout {
+    id: root
+
+    property string userName
+    property color userColor
+    property url userAvatar: ""
+    property var text
+
+    signal cancel
+
+    Rectangle {
+        id: verticalBorder
+
+        Layout.fillHeight: true
+
+        implicitWidth: Kirigami.Units.smallSpacing
+        color: userColor
+    }
+    ColumnLayout {
+        RowLayout {
+            KirigamiComponents.Avatar {
+                id: replyAvatar
+
+                implicitWidth: Kirigami.Units.iconSizes.small
+                implicitHeight: Kirigami.Units.iconSizes.small
+
+                source: userAvatar
+                name: userName
+                color: userColor
+            }
+            QQC2.Label {
+                Layout.fillWidth: true
+                Layout.alignment: Qt.AlignLeft
+
+                color: userColor
+                text: userName
+                elide: Text.ElideRight
+            }
+        }
+        QQC2.TextArea {
+            id: textArea
+
+            Layout.fillWidth: true
+
+            leftPadding: 0
+            rightPadding: 0
+            topPadding: 0
+            bottomPadding: 0
+            text: "<style> a{color:" + Kirigami.Theme.linkColor + ";}.user-pill{}</style>" + replyTextMetrics.elidedText
+            selectByMouse: true
+            selectByKeyboard: true
+            readOnly: true
+            wrapMode: TextEdit.Wrap
+            textFormat: TextEdit.RichText
+            background: Item {}
+            HoverHandler {
+                cursorShape: textArea.hoveredLink ? Qt.PointingHandCursor : Qt.IBeamCursor
+            }
+
+            TextMetrics {
+                id: replyTextMetrics
+
+                text: root.text
+                font: textArea.font
+                elide: Qt.ElideRight
+                elideWidth: textArea.width * 2 - Kirigami.Units.smallSpacing * 2
+            }
+        }
+    }
+    QQC2.ToolButton {
+        id: cancelButton
+
+        Layout.alignment: Qt.AlignVCenter
+
+        display: QQC2.AbstractButton.IconOnly
+        text: i18nc("@action:button", "Cancel reply")
+        icon.name: "dialog-close"
+        onClicked: {
+            root.cancel();
+        }
+        QQC2.ToolTip.text: text
+        QQC2.ToolTip.visible: hovered
+        QQC2.ToolTip.delay: Kirigami.Units.toolTipDelay
+    }
+}

src/chatbarcache.cpp

@@ -5,7 +5,6 @@
 
 #include <Quotient/roommember.h>
 
-#include "actionshandler.h"
 #include "chatdocumenthandler.h"
 #include "eventhandler.h"
 #include "neochatroom.h"
@@ -54,7 +53,6 @@ void ChatBarCache::setReplyId(const QString &replyId)
         m_relationType = Reply;
     }
     m_attachmentPath = QString();
-    delete m_relationContentModel;
     Q_EMIT relationIdChanged(oldEventId, m_relationId);
     Q_EMIT attachmentPathChanged();
 }
@@ -84,12 +82,11 @@ void ChatBarCache::setEditId(const QString &editId)
         m_relationType = Edit;
     }
     m_attachmentPath = QString();
-    delete m_relationContentModel;
     Q_EMIT relationIdChanged(oldEventId, m_relationId);
     Q_EMIT attachmentPathChanged();
 }
 
-Quotient::RoomMember ChatBarCache::relationAuthor() const
+Quotient::RoomMember ChatBarCache::relationUser() const
 {
     if (parent() == nullptr) {
         qWarning() << "ChatBarCache created with no parent, a NeoChatRoom must be set as the parent on creation.";
@@ -122,33 +119,16 @@ QString ChatBarCache::relationMessage() const
     }
 
     if (auto event = room->findInTimeline(m_relationId); event != room->historyEdge()) {
-        return EventHandler::markdownBody(&**event);
+        EventHandler eventhandler(room, &**event);
+        if (isEditing()) {
+            return eventhandler.getMarkdownBody();
+        } else {
+            return eventhandler.getMarkdownBody().toHtmlEscaped();
+        }
     }
     return {};
 }
 
-MessageContentModel *ChatBarCache::relationEventContentModel()
-{
-    if (parent() == nullptr) {
-        qWarning() << "ChatBarCache created with no parent, a NeoChatRoom must be set as the parent on creation.";
-        return nullptr;
-    }
-    if (m_relationId.isEmpty()) {
-        return nullptr;
-    }
-    if (m_relationContentModel != nullptr) {
-        return m_relationContentModel;
-    }
-
-    auto room = dynamic_cast<NeoChatRoom *>(parent());
-    if (room == nullptr) {
-        qWarning() << "ChatBarCache created with incorrect parent, a NeoChatRoom must be set as the parent on creation.";
-        return nullptr;
-    }
-    m_relationContentModel = new MessageContentModel(room, m_relationId, true);
-    return m_relationContentModel;
-}
-
 bool ChatBarCache::isThreaded() const
 {
     return !m_threadId.isEmpty();
@@ -164,8 +144,8 @@ void ChatBarCache::setThreadId(const QString &threadId)
     if (m_threadId == threadId) {
         return;
     }
-    const auto oldThreadId = std::exchange(m_threadId, threadId);
-    Q_EMIT threadIdChanged(oldThreadId, m_threadId);
+    m_threadId = threadId;
+    Q_EMIT threadIdChanged();
 }
 
 QString ChatBarCache::attachmentPath() const
@@ -181,22 +161,10 @@ void ChatBarCache::setAttachmentPath(const QString &attachmentPath)
     m_attachmentPath = attachmentPath;
     m_relationType = None;
     const auto oldEventId = std::exchange(m_relationId, QString());
-    delete m_relationContentModel;
     Q_EMIT attachmentPathChanged();
     Q_EMIT relationIdChanged(oldEventId, m_relationId);
 }
 
-void ChatBarCache::clearRelations()
-{
-    const auto oldEventId = std::exchange(m_relationId, QString());
-    const auto oldThreadId = std::exchange(m_threadId, QString());
-    m_attachmentPath = QString();
-    delete m_relationContentModel;
-    Q_EMIT relationIdChanged(oldEventId, m_relationId);
-    Q_EMIT threadIdChanged(oldThreadId, m_threadId);
-    Q_EMIT attachmentPathChanged();
-}
-
 QList<Mention> *ChatBarCache::mentions()
 {
     return &m_mentions;
@@ -260,15 +228,4 @@ void ChatBarCache::setSavedText(const QString &savedText)
     m_savedText = savedText;
 }
 
-void ChatBarCache::postMessage()
-{
-    auto room = dynamic_cast<NeoChatRoom *>(parent());
-    if (room == nullptr) {
-        qWarning() << "ChatBarCache created with incorrect parent, a NeoChatRoom must be set as the parent on creation.";
-        return;
-    }
-
-    ActionsHandler::handleMessageEvent(room, this);
-}
-
 #include "moc_chatbarcache.cpp"

src/chatbarcache.h

@@ -8,8 +8,6 @@
 #include <QQuickTextDocument>
 #include <QTextCursor>
 
-#include "models/messagecontentmodel.h"
-
 class ChatDocumentHandler;
 
 namespace Quotient
@@ -35,7 +33,7 @@ struct Mention {
  * A class to cache data from a chat bar.
  *
  * A chat bar can be anything that allows users to compose or edit message, it doesn't
- * necessarily have to use the ChatBar component, e.g. ChatBarComponent.
+ * necessarily have to use the ChatBar component, e.g. MessageEditComponent.
  *
  * This object is intended to allow the current contents of a chat bar to be cached
  * between different rooms, i.e. there is an expectation that each NeoChatRoom could
@@ -45,7 +43,7 @@ struct Mention {
  *       as it's parent. This is necessary for certain functions which need to get
  *       relevant room information.
  *
- * @sa ChatBar, ChatBarComponent, NeoChatRoom
+ * @sa ChatBar, MessageEditComponent, NeoChatRoom
  */
 class ChatBarCache : public QObject
 {
@@ -102,7 +100,7 @@ class ChatBarCache : public QObject
      *
      * @sa Quotient::RoomMember
      */
-    Q_PROPERTY(Quotient::RoomMember relationAuthor READ relationAuthor NOTIFY relationIdChanged)
+    Q_PROPERTY(Quotient::RoomMember relationUser READ relationUser NOTIFY relationIdChanged)
 
     /**
      * @brief The content of the related message.
@@ -111,13 +109,6 @@ class ChatBarCache : public QObject
      */
     Q_PROPERTY(QString relationMessage READ relationMessage NOTIFY relationIdChanged)
 
-    /**
-     * @brief The MessageContentModel for the related message.
-     *
-     * Will be nullptr if no related message.
-     */
-    Q_PROPERTY(MessageContentModel *relationEventContentModel READ relationEventContentModel NOTIFY relationIdChanged)
-
     /**
      * @brief Whether the chat bar is replying in a thread.
      */
@@ -163,10 +154,9 @@ public:
     QString editId() const;
     void setEditId(const QString &editId);
 
-    Quotient::RoomMember relationAuthor() const;
+    Quotient::RoomMember relationUser() const;
 
     QString relationMessage() const;
-    MessageContentModel *relationEventContentModel();
 
     bool isThreaded() const;
     QString threadId() const;
@@ -175,13 +165,6 @@ public:
     QString attachmentPath() const;
     void setAttachmentPath(const QString &attachmentPath);
 
-    /**
-     * @brief Clear all relations in the cache.
-     *
-     * This includes relation ID, thread root ID and attachment path.
-     */
-    Q_INVOKABLE void clearRelations();
-
     /**
      * @brief Retrieve the mentions for the current chat bar text.
      */
@@ -202,15 +185,10 @@ public:
      */
     void setSavedText(const QString &savedText);
 
-    /**
-     * @brief Post the contents of the cache as a message in the room.
-     */
-    Q_INVOKABLE void postMessage();
-
 Q_SIGNALS:
     void textChanged();
     void relationIdChanged(const QString &oldEventId, const QString &newEventId);
-    void threadIdChanged(const QString &oldThreadId, const QString &newThreadId);
+    void threadIdChanged();
     void attachmentPathChanged();
 
 private:
@@ -221,6 +199,4 @@ private:
     QString m_attachmentPath = QString();
     QList<Mention> m_mentions;
     QString m_savedText;
-
-    QPointer<MessageContentModel> m_relationContentModel;
 };

src/colorschemer.cpp

@@ -26,9 +26,23 @@ void ColorSchemer::apply(int idx)
     c->activateScheme(c->model()->index(idx, 0));
 }
 
-int ColorSchemer::indexForCurrentScheme()
+void ColorSchemer::apply(const QString &name)
 {
-    return c->indexForSchemeId(c->activeSchemeId()).row();
+    c->activateScheme(c->indexForScheme(name));
+}
+
+int ColorSchemer::indexForScheme(const QString &name) const
+{
+    auto index = c->indexForScheme(name).row();
+    if (index == -1) {
+        index = 0;
+    }
+    return index;
+}
+
+QString ColorSchemer::nameForIndex(int index) const
+{
+    return c->model()->data(c->model()->index(index, 0), Qt::DisplayRole).toString();
 }
 
 #include "moc_colorschemer.cpp"

src/colorschemer.h

@@ -44,11 +44,21 @@ public:
     Q_INVOKABLE void apply(int idx);
 
     /**
-     * @brief Get the row for the current color scheme.
+     * @brief Activates the KColorScheme with the given name.
      *
      * @sa KColorScheme
      */
-    Q_INVOKABLE int indexForCurrentScheme();
+    Q_INVOKABLE void apply(const QString &name);
+
+    /**
+     * @brief Returns the index for the scheme with the given name.
+     */
+    Q_INVOKABLE int indexForScheme(const QString &name) const;
+
+    /**
+     * @brief Returns the name for the scheme with the given index.
+     */
+    Q_INVOKABLE QString nameForIndex(int index) const;
 
 private:
     KColorSchemeManager *c;

src/controller.cpp

@@ -13,6 +13,7 @@
 
 #include <signal.h>
 
+#include <Quotient/accountregistry.h>
 #include <Quotient/csapi/notifications.h>
 #include <Quotient/qt_connection_util.h>
 #include <Quotient/settings.h>
@@ -169,10 +170,6 @@ void Controller::addConnection(NeoChatConnection *c)
         dropConnection(c);
     });
     connect(c, &NeoChatConnection::badgeNotificationCountChanged, this, &Controller::updateBadgeNotificationCount);
-    connect(c, &NeoChatConnection::syncDone, this, [this, c]() {
-        m_notificationsManager.handleNotifications(c);
-    });
-    connect(c, &NeoChatConnection::showInviteNotification, &m_notificationsManager, &NotificationsManager::postInviteNotification);
 
     c->sync();
 
@@ -183,8 +180,6 @@ void Controller::dropConnection(NeoChatConnection *c)
 {
     Q_ASSERT_X(c, __FUNCTION__, "Attempt to drop a null connection");
 
-    c->disconnect(this);
-    c->disconnect(&m_notificationsManager);
     m_accountRegistry.drop(c);
     Q_EMIT connectionDropped(c);
 }
@@ -231,7 +226,7 @@ void Controller::invokeLogin()
                     }
                 });
                 connect(connection, &NeoChatConnection::networkError, this, [this](const QString &error, const QString &, int, int) {
-                    Q_EMIT errorOccured(i18n("Network Error: %1", error));
+                    Q_EMIT errorOccured(i18n("Network Error: %1", error), {});
                 });
 #if Quotient_VERSION_MINOR > 8
                 connection->assumeIdentity(account.userId(), account.deviceId(), accessToken);
@@ -257,17 +252,17 @@ QKeychain::ReadPasswordJob *Controller::loadAccessTokenFromKeyChain(const QStrin
 
         switch (job->error()) {
         case QKeychain::EntryNotFound:
-            Q_EMIT errorOccured(i18n("Access token wasn't found: Maybe it was deleted?"));
+            Q_EMIT errorOccured(i18n("Access token wasn't found"), i18n("Maybe it was deleted?"));
             break;
         case QKeychain::AccessDeniedByUser:
         case QKeychain::AccessDenied:
-            Q_EMIT errorOccured(i18n("Access to keychain was denied: Please allow NeoChat to read the access token"));
+            Q_EMIT errorOccured(i18n("Access to keychain was denied."), i18n("Please allow NeoChat to read the access token"));
             break;
         case QKeychain::NoBackendAvailable:
-            Q_EMIT errorOccured(i18n("No keychain available: Please install a keychain, e.g. KWallet or GNOME keyring on Linux"));
+            Q_EMIT errorOccured(i18n("No keychain available."), i18n("Please install a keychain, e.g. KWallet or GNOME keyring on Linux"));
             break;
         case QKeychain::OtherError:
-            Q_EMIT errorOccured(i18n("Unable to read access token: %1", job->errorString()));
+            Q_EMIT errorOccured(i18n("Unable to read access token"), job->errorString());
             break;
         default:
             break;
@@ -332,18 +327,11 @@ void Controller::setActiveConnection(NeoChatConnection *connection)
         return;
     }
 
-    if (m_connection != nullptr) {
-        m_connection->disconnect(this);
-        m_connection->disconnect(&m_notificationsManager);
-    }
-
     m_connection = connection;
 
     if (m_connection != nullptr) {
         m_connection->refreshBadgeNotificationCount();
         updateBadgeNotificationCount(m_connection, m_connection->badgeNotificationCount());
-
-        connect(m_connection, &NeoChatConnection::errorOccured, this, &Controller::errorOccured);
     }
 
     Q_EMIT activeConnectionChanged(m_connection);
@@ -358,7 +346,7 @@ void Controller::listenForNotifications()
     connect(timer, &QTimer::timeout, qGuiApp, &QGuiApplication::quit);
 
     connect(connector, &KUnifiedPush::Connector::messageReceived, [timer](const QByteArray &data) {
-        instance().m_notificationsManager.postPushNotification(data);
+        NotificationsManager::instance().postPushNotification(data);
         timer->stop();
     });
 
@@ -370,11 +358,6 @@ void Controller::listenForNotifications()
 #endif
 }
 
-void Controller::clearInvitationNotification(const QString &roomId)
-{
-    m_notificationsManager.clearInvitationNotification(roomId);
-}
-
 void Controller::updateBadgeNotificationCount(NeoChatConnection *connection, int count)
 {
     if (connection == m_connection) {
@@ -444,28 +427,11 @@ void Controller::removeConnection(const QString &userId)
 
 bool Controller::csSupported() const
 {
-#if Quotient_VERSION_MINOR > 8
+#if Quotient_VERSION_MINOR > 9
     return true;
 #else
     return false;
 #endif
 }
 
-void Controller::revertToDefaultConfig()
-{
-    const auto config = NeoChatConfig::self();
-    config->setDefaults();
-    config->save();
-}
-
-bool Controller::isImageShown(const QString &eventId)
-{
-    return m_shownImages.contains(eventId);
-}
-
-void Controller::markImageShown(const QString &eventId)
-{
-    m_shownImages.append(eventId);
-}
-
 #include "moc_controller.cpp"

src/controller.h

@@ -7,7 +7,6 @@
 #include <QQmlEngine>
 
 #include "neochatconnection.h"
-#include "notificationsmanager.h"
 #include <Quotient/accountregistry.h>
 
 class TrayIcon;
@@ -54,6 +53,16 @@ class Controller : public QObject
     Q_PROPERTY(bool csSupported READ csSupported CONSTANT)
 
 public:
+    /**
+     * @brief Define the types on inline messages that can be shown.
+     */
+    enum MessageType {
+        Positive, /**< Positive message, typically green. */
+        Info, /**< Info message, typically highlight color. */
+        Error, /**< Error message, typically red. */
+    };
+    Q_ENUM(MessageType)
+
     static Controller &instance();
     static Controller *create(QQmlEngine *engine, QJSEngine *)
     {
@@ -89,13 +98,6 @@ public:
      */
     static void listenForNotifications();
 
-    /**
-     * @brief Clear an existing invite notification for the given room.
-     *
-     * Nothing happens if the given room doesn't have an invite notification.
-     */
-    Q_INVOKABLE void clearInvitationNotification(const QString &roomId);
-
     Q_INVOKABLE QString loadFileContent(const QString &path) const;
 
     Quotient::AccountRegistry &accounts();
@@ -106,17 +108,6 @@ public:
 
     bool csSupported() const;
 
-    /**
-     * @brief Revert all configuration values to their default.
-     *
-     * The parameters along with their defaults are specified in the config file
-     * neochatconfig.kcfg.
-     */
-    Q_INVOKABLE void revertToDefaultConfig();
-
-    Q_INVOKABLE bool isImageShown(const QString &eventId);
-    Q_INVOKABLE void markImageShown(const QString &eventId);
-
 private:
     explicit Controller(QObject *parent = nullptr);
 
@@ -125,13 +116,13 @@ private:
 
     QKeychain::ReadPasswordJob *loadAccessTokenFromKeyChain(const QString &account);
 
+    void loadSettings();
+    void saveSettings() const;
+
     Quotient::AccountRegistry m_accountRegistry;
     QStringList m_accountsLoading;
     QMap<QString, QPointer<NeoChatConnection>> m_connectionsLoading;
     QString m_endpoint;
-    QStringList m_shownImages;
-
-    NotificationsManager m_notificationsManager;
 
 private Q_SLOTS:
     void invokeLogin();
@@ -139,12 +130,10 @@ private Q_SLOTS:
     void updateBadgeNotificationCount(NeoChatConnection *connection, int count);
 
 Q_SIGNALS:
-    /**
-     * @brief Request a error message be shown to the user.
-     */
-    void errorOccured(const QString &error);
+    void errorOccured(const QString &error, const QString &detail);
     void connectionAdded(NeoChatConnection *connection);
     void connectionDropped(NeoChatConnection *connection);
     void activeConnectionChanged(NeoChatConnection *connection);
     void accountsLoadingChanged();
+    void showMessage(MessageType messageType, const QString &message);
 };

src/devtools/DebugOptions.qml

@@ -17,25 +17,25 @@ FormCard.FormCardPage {
 
         FormCard.FormCheckDelegate {
             text: i18nc("@option:check", "Show hidden events in the timeline")
-            checked: NeoChatConfig.showAllEvents
+            checked: Config.showAllEvents
 
-            onToggled: NeoChatConfig.showAllEvents = checked
+            onToggled: Config.showAllEvents = checked
         }
         FormCard.FormCheckDelegate {
             id: roomAccountDataVisibleCheck
             text: i18nc("@option:check Enable the matrix 'threads' feature", "Always allow device verification")
             description: i18n("Allow the user to start a verification session with devices that were already verified")
-            checked: NeoChatConfig.alwaysVerifyDevice
+            checked: Config.alwaysVerifyDevice
 
-            onToggled: NeoChatConfig.alwaysVerifyDevice = checked
+            onToggled: Config.alwaysVerifyDevice = checked
         }
         FormCard.FormCheckDelegate {
             text: i18nc("@option:check", "Show focus in window header")
-            checked: NeoChatConfig.windowTitleFocus
+            checked: Config.windowTitleFocus
 
             onToggled: {
-                NeoChatConfig.windowTitleFocus = checked;
-                NeoChatConfig.save();
+                Config.windowTitleFocus = checked;
+                Config.save();
             }
         }
     }

src/devtools/FeatureFlagPage.qml

@@ -18,23 +18,23 @@ FormCard.FormCardPage {
         FormCard.FormCheckDelegate {
             id: roomAccountDataVisibleCheck
             text: i18nc("@option:check Enable the matrix 'threads' feature", "Threads")
-            checked: NeoChatConfig.threads
+            checked: Config.threads
 
-            onToggled: NeoChatConfig.threads = checked
+            onToggled: Config.threads = checked
         }
         FormCard.FormCheckDelegate {
             text: i18nc("@option:check Enable the matrix 'secret backup' feature", "Secret Backup")
-            checked: NeoChatConfig.secretBackup
+            checked: Config.secretBackup
 
-            onToggled: NeoChatConfig.secretBackup = checked
+            onToggled: Config.secretBackup = checked
         }
         FormCard.FormCheckDelegate {
             text: i18nc("@option:check Enable the matrix feature to add a phone number as a third party ID", "Add phone numbers as 3PIDs")
-            checked: NeoChatConfig.phone3PId
+            checked: Config.phone3PId
 
             onToggled: {
-                NeoChatConfig.phone3PId = checked
-                NeoChatConfig.save();
+                Config.phone3PId = checked
+                Config.save();
             }
         }
     }

src/emojitones.cpp

@@ -5,5 +5,5 @@
 #include "models/emojimodel.h"
 
 QMultiHash<QString, QVariant> EmojiTones::_tones = {
-    // #include "emojitones_data.h"
+#include "emojitones_data.h"
 };

src/enums/delegatetype.h

@@ -38,8 +38,6 @@ public:
         ReadMarker, /**< The local user read marker. */
         Loading, /**< A delegate to tell the user more messages are being loaded. */
         TimelineEnd, /**< A delegate to inform that all messages are loaded. */
-        Predecessor, /**< A delegate to show a room predecessor. */
-        Successor, /**< A delegate to show a room successor. */
         Other, /**< Anything that cannot be classified as another type. */
     };
     Q_ENUM(Type);

src/enums/messagecomponenttype.h

@@ -50,7 +50,7 @@ public:
         Reply, /**< A component to show a replied-to message. */
         LinkPreview, /**< A preview of a URL in the message. */
         LinkPreviewLoad, /**< A loading dialog for a link preview. */
-        ChatBar, /**< A text edit for editing a message. */
+        Edit, /**< A text edit for editing a message. */
         Verification, /**< A user verification session start message. */
         Loading, /**< The component is loading. */
         Other, /**< Anything that cannot be classified as another type. */

src/enums/messagetype.h

@@ -1,31 +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>
-
-/**
- * @class MessageType
- *
- * This class is designed to define the MessageType enumeration.
- */
-class MessageType : public QObject
-{
-    Q_OBJECT
-    QML_ELEMENT
-    QML_UNCREATABLE("")
-
-public:
-    /**
-     * @brief The types of messages that can be shown.
-     */
-    enum Type {
-        Information = 0, /**< Info message, typically highlight color. */
-        Positive, /**< Positive message, typically green. */
-        Warning, /**< Warning message, typically amber. */
-        Error, /**< Error message, typically red. */
-    };
-    Q_ENUM(Type);
-};

src/eventhandler.h

@@ -3,22 +3,24 @@
 
 #pragma once
 
-#include <QDateTime>
-#include <QString>
-#include <Quotient/events/eventcontent.h>
+#include <QObject>
+
+#include <KFormat>
+
+#include <Quotient/eventitem.h>
+#include <Quotient/events/roomevent.h>
+#include <Quotient/events/roommessageevent.h>
+
+#include "enums/messagecomponenttype.h"
 
 namespace Quotient
 {
-namespace EventContent
-{
-class FileInfo;
-}
-class RoomEvent;
 class RoomMember;
-class RoomMessageEvent;
 }
 
+class LinkPreviewer;
 class NeoChatRoom;
+class ReactionModel;
 
 /**
  * @class EventHandler
@@ -36,14 +38,20 @@ class NeoChatRoom;
  */
 class EventHandler
 {
+    Q_GADGET
+
 public:
+    EventHandler(const NeoChatRoom *room, const Quotient::RoomEvent *event);
+
     /**
-     * @brief Return the ID of the event.
-     *
-     * Returns the transaction ID if the Matrix ID is empty, which may be the case
-     * for a pending event.
+     * @brief Return the Matrix ID of the event.
      */
-    static QString id(const Quotient::RoomEvent *event);
+    QString getId() const;
+
+    /**
+     * @brief The MessageComponentType to use to visualise the main event content.
+     */
+    MessageComponentType::Type messageComponentType() const;
 
     /**
      * @brief Get the display name of the event author.
@@ -56,7 +64,7 @@ public:
      * @param isPending whether the event is pending as this cannot be derived from
      *                  just the event object.
      */
-    static QString authorDisplayName(const NeoChatRoom *room, const Quotient::RoomEvent *event, bool isPending = false);
+    QString getAuthorDisplayName(bool isPending = false) const;
 
     /**
      * @brief Get the display name of the event author but with any newlines removed.
@@ -67,12 +75,12 @@ public:
      * @param isPending whether the event is pending as this cannot be derived from
      *                  just the event object.
      */
-    static QString singleLineAuthorDisplayname(const NeoChatRoom *room, const Quotient::RoomEvent *event, bool isPending = false);
+    QString singleLineAuthorDisplayname(bool isPending = false) const;
 
     /**
      * @brief Return a QDateTime object for the event timestamp.
      */
-    static QDateTime time(const Quotient::RoomEvent *event, bool isPending = false, QDateTime lastUpdated = {});
+    QDateTime getTime(bool isPending = false, QDateTime lastUpdated = {}) const;
 
     /**
      * @brief Return a QString for the event timestamp.
@@ -88,32 +96,16 @@ public:
      * @param lastUpdated the time the event was last updated locally as this cannot be
      *                    obtained from the event.
      */
-    static QString timeString(const Quotient::RoomEvent *event,
-                              bool relative,
-                              QLocale::FormatType format = QLocale::ShortFormat,
-                              bool isPending = false,
-                              QDateTime lastUpdated = {});
+    QString getTimeString(bool relative, QLocale::FormatType format = QLocale::ShortFormat, bool isPending = false, QDateTime lastUpdated = {}) const;
 
-    /**
-     * @brief Return a QString for the event timestamp.
-     *
-     * This is intended to return a string that is read for display in the UI without
-     * any further manipulation required.
-     *
-     * @param format the format to use as a string.
-     * @param isPending whether the event is pending as this cannot be derived from
-     *                  just the event object.
-     * @param lastUpdated the time the event was last updated locally as this cannot be
-     *                    obtained from the event.
-     */
-    static QString timeString(const Quotient::RoomEvent *event, const QString &format, bool isPending = false, const QDateTime &lastUpdated = {});
+    QString getTimeString(const QString &format, bool isPending = false, const QDateTime &lastUpdated = {});
 
     /**
      * @brief Whether the event should be highlighted in the timeline.
      *
      * @note Messages in direct chats are never highlighted.
      */
-    static bool isHighlighted(const NeoChatRoom *room, const Quotient::RoomEvent *event);
+    bool isHighlighted();
 
     /**
      * @brief Whether the event should be hidden in the timeline.
@@ -122,7 +114,7 @@ public:
      * user has hidden all state events or if the sender has been ignored by the local
      * user.
      */
-    static bool isHidden(const NeoChatRoom *room, const Quotient::RoomEvent *event);
+    bool isHidden();
 
     /**
      * @brief The input format of the body in the message.
@@ -154,7 +146,7 @@ public:
      *
      * @param stripNewlines whether the output should have new lines in it.
      */
-    static QString richBody(const NeoChatRoom *room, const Quotient::RoomEvent *event, bool stripNewlines = false);
+    QString getRichBody(bool stripNewlines = false) const;
 
     /**
      * @brief Output a string for the message content ready for display in a plain text field.
@@ -170,14 +162,14 @@ public:
      *
      * @param stripNewlines whether the output should have new lines in it.
      */
-    static QString plainBody(const NeoChatRoom *room, const Quotient::RoomEvent *event, bool stripNewlines = false);
+    QString getPlainBody(bool stripNewlines = false) const;
 
     /**
      * @brief Output the original body for the message content, useful for editing the original message.
      *
      * The event type must be a room message event.
      */
-    static QString markdownBody(const Quotient::RoomEvent *event);
+    QString getMarkdownBody() const;
 
     /**
      * @brief Output a generic string for the message content ready for display.
@@ -190,9 +182,9 @@ public:
      * E.g. For a message the text will be:
      *      "sent a message"
      *
-     * @sa richBody(), plainBody()
+     * @sa getRichBody(), getPlainBody()
      */
-    static QString genericBody(const NeoChatRoom *room, const Quotient::RoomEvent *event);
+    QString getGenericBody() const;
 
     /**
      * @brief Output a string for the event to be used as  a RoomList subtitle.
@@ -200,7 +192,7 @@ public:
      * The output includes the username followed by the plain message, all with no
      * line breaks.
      */
-    static QString subtitleText(const NeoChatRoom *room, const Quotient::RoomEvent *event);
+    QString subtitleText() const;
 
     /**
      * @brief Return the media info for the event.
@@ -218,21 +210,22 @@ public:
      *  - 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
      */
-    static QVariantMap mediaInfo(const NeoChatRoom *room, const Quotient::RoomEvent *event);
+    QVariantMap getMediaInfo() const;
 
     /**
      * @brief Whether the event is a reply to another in the timeline.
-     *
-     * @param showFallbacks whether message that have is_falling_back set true should
-     *                      show the fallback reply. Leave true for non-threaded
-     *                      timelines.
      */
-    static bool hasReply(const Quotient::RoomEvent *event, bool showFallbacks = true);
+    bool hasReply() const;
 
     /**
      * @brief Return the Matrix ID of the event replied to.
      */
-    static QString replyId(const Quotient::RoomEvent *event);
+    QString getReplyId() const;
+
+    /**
+     * @brief The MessageComponentType to use to visualise the reply content.
+     */
+    MessageComponentType::Type replyMessageComponentType() const;
 
     /**
      * @brief Get the author of the event replied to in context of the room.
@@ -247,21 +240,73 @@ public:
      *
      * @sa Quotient::RoomMember
      */
-    static Quotient::RoomMember replyAuthor(const NeoChatRoom *room, const Quotient::RoomEvent *event);
+    Quotient::RoomMember getReplyAuthor() const;
+
+    /**
+     * @brief Output a string for the message content of the event replied to ready
+     * for display in a rich text field.
+     *
+     * The output string is dependant upon the event type and the desired output format.
+     *
+     * For most messages this is the body content of the message. For media messages
+     * this will be the caption and for state events it will be a string specific
+     * to that event with some dynamic details about the event added.
+     *
+     * E.g. For a room topic state event the text will be:
+     *      "set the topic to: <new topic text>"
+     *
+     * @param stripNewlines whether the output should have new lines in it.
+     */
+    QString getReplyRichBody(bool stripNewlines = false) const;
+
+    /**
+     * @brief Output a string for the message content of the event replied to ready
+     * for display in a plain text field.
+     *
+     * The output string is dependant upon the event type and the desired output format.
+     *
+     * For most messages this is the body content of the message. For media messages
+     * this will be the caption and for state events it will be a string specific
+     * to that event with some dynamic details about the event added.
+     *
+     * E.g. For a room topic state event the text will be:
+     *      "set the topic to: <new topic text>"
+     *
+     * @param stripNewlines whether the output should have new lines in it.
+     */
+    QString getReplyPlainBody(bool stripNewlines = false) const;
+
+    /**
+     * @brief Return the media info for the event replied to.
+     *
+     * An empty QVariantMap will be returned for any event that doesn't have any
+     * media info.
+     *
+     * @return This should consist of the following:
+     *  - source - The mxc URL for the media.
+     *  - mimeType - The MIME type of the media (should be image/xxx for this delegate).
+     *  - mimeIcon - The MIME icon name (should be image-xxx).
+     *  - size - The file size in bytes.
+     *  - 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;
 
     /**
      * @brief Whether the message is part of a thread.
      *
      * i.e. There is a rel_type of m.thread.
      */
-    static bool isThreaded(const Quotient::RoomEvent *event);
+    bool isThreaded() const;
 
     /**
      * @brief Return the Matrix ID of the thread's root message.
      *
      * Empty if this not part of a thread.
      */
-    static QString threadRoot(const Quotient::RoomEvent *event);
+    QString threadRoot() const;
 
     /**
      * @brief Return the latitude for the event.
@@ -269,7 +314,7 @@ public:
      * Returns -100.0 if the event doesn't have a location (latitudes are in the
      * range -90deg to +90deg so -100 is out of range).
      */
-    static float latitude(const Quotient::RoomEvent *event);
+    float getLatitude() const;
 
     /**
      * @brief Return the longitude for the event.
@@ -277,26 +322,31 @@ public:
      * Returns -200.0 if the event doesn't have a location (latitudes are in the
      * range -180deg to +180deg so -200 is out of range).
      */
-    static float longitude(const Quotient::RoomEvent *event);
+    float getLongitude() const;
 
     /**
      * @brief Return the type of location marker for the event.
      */
-    static QString locationAssetType(const Quotient::RoomEvent *event);
+    QString getLocationAssetType() const;
 
 private:
-    static QString getBody(const NeoChatRoom *room, const Quotient::RoomEvent *event, Qt::TextFormat format, bool stripNewlines);
-    static QString getMessageBody(const NeoChatRoom *room, const Quotient::RoomMessageEvent &event, Qt::TextFormat format, bool stripNewlines);
+    const NeoChatRoom *m_room = nullptr;
+    const Quotient::RoomEvent *m_event = nullptr;
 
-    static QVariantMap getMediaInfoForEvent(const NeoChatRoom *room, const Quotient::RoomEvent *event);
-    QVariantMap static getMediaInfoFromFileInfo(const NeoChatRoom *room,
+    KFormat m_format;
+
+    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(
 #if Quotient_VERSION_MINOR > 8
-                                                const Quotient::EventContent::FileContentBase *fileContent,
+        const Quotient::EventContent::FileContentBase *fileContent,
 #else
-                                                const Quotient::EventContent::TypedBase *fileContent,
+        const Quotient::EventContent::TypedBase *fileContent,
 #endif
-                                                const QString &eventId,
-                                                bool isThumbnail = false,
-                                                bool isSticker = false);
-    static QVariantMap getMediaInfoFromTumbnail(const NeoChatRoom *room, const Quotient::EventContent::Thumbnail &thumbnail, const QString &eventId);
+        const QString &eventId,
+        bool isThumbnail = false,
+        bool isSticker = false) const;
+    QVariantMap getMediaInfoFromTumbnail(const Quotient::EventContent::Thumbnail &thumbnail, const QString &eventId) const;
 };

src/foreigntypes.h

@@ -10,13 +10,22 @@
 #include <Quotient/keyverificationsession.h>
 #include <Quotient/roommember.h>
 
-#if Quotient_VERSION_MINOR > 8
-#include <Quotient/keyimport.h>
-#endif
-
 #include "controller.h"
 #include "neochatconfig.h"
 
+struct ForeignConfig {
+    Q_GADGET
+    QML_FOREIGN(NeoChatConfig)
+    QML_NAMED_ELEMENT(Config)
+    QML_SINGLETON
+public:
+    static NeoChatConfig *create(QQmlEngine *, QJSEngine *)
+    {
+        QQmlEngine::setObjectOwnership(NeoChatConfig::self(), QQmlEngine::CppOwnership);
+        return NeoChatConfig::self();
+    }
+};
+
 struct ForeignAccountRegistry {
     Q_GADGET
     QML_FOREIGN(Quotient::AccountRegistry)
@@ -42,12 +51,3 @@ struct ForeignSSSSHandler {
     QML_FOREIGN(Quotient::SSSSHandler)
     QML_NAMED_ELEMENT(SSSSHandler)
 };
-
-#if Quotient_VERSION_MINOR > 8
-struct ForeignKeyImport {
-    Q_GADGET
-    QML_SINGLETON
-    QML_FOREIGN(Quotient::KeyImport)
-    QML_NAMED_ELEMENT(KeyImport)
-};
-#endif

src/login.cpp

@@ -85,7 +85,7 @@ void LoginHelper::init()
         m_connection = nullptr;
     });
     connect(m_connection, &Connection::networkError, this, [this](QString error, const QString &, int, int) {
-        Q_EMIT m_connection->errorOccured(i18n("Network Error: %1", std::move(error)));
+        Q_EMIT Controller::instance().errorOccured(i18n("Network Error"), std::move(error));
         m_isLoggingIn = false;
         Q_EMIT isLoggingInChanged();
     });
@@ -93,14 +93,14 @@ void LoginHelper::init()
         if (error == QStringLiteral("Invalid username or password")) {
             setInvalidPassword(true);
         } else {
-            Q_EMIT loginErrorOccured(i18n("Login Failed: %1", error));
+            Q_EMIT errorOccured(i18n("Login Failed: %1", error));
         }
         m_isLoggingIn = false;
         Q_EMIT isLoggingInChanged();
     });
 
-    connect(m_connection, &Connection::resolveError, this, [this](QString error) {
-        Q_EMIT m_connection->errorOccured(i18n("Network Error: %1", std::move(error)));
+    connect(m_connection, &Connection::resolveError, this, [](QString error) {
+        Q_EMIT Controller::instance().errorOccured(i18n("Network Error"), std::move(error));
     });
 
     connect(

src/login.h

@@ -130,7 +130,7 @@ Q_SIGNALS:
     void loginFlowsChanged();
     void ssoUrlChanged();
     void connected();
-    void loginErrorOccured(const QString &message);
+    void errorOccured(const QString &message);
     void testingChanged();
     void isLoggingInChanged();
     void isLoggedInChanged();

src/login/WelcomePage.qml

@@ -11,7 +11,7 @@ import org.kde.kirigamiaddons.formcard as FormCard
 import org.kde.neochat
 import org.kde.neochat.settings
 
-Kirigami.Page {
+FormCard.FormCardPage {
     id: root
 
     property bool showExisting: false
@@ -23,237 +23,202 @@ Kirigami.Page {
     signal connectionChosen
 
     title: i18n("Welcome")
-    globalToolBarStyle: Kirigami.ApplicationHeaderStyle.None
 
     header: QQC2.Control {
-        topPadding: 0
-        bottomPadding: 0
-        leftPadding: 0
-        rightPadding: 0
+        contentItem: Kirigami.InlineMessage {
+            id: headerMessage
+            type: Kirigami.MessageType.Error
+            showCloseButton: true
+            visible: false
+        }
+    }
 
-        contentItem: ColumnLayout {
-            spacing: 0
+    Kirigami.Icon {
+        source: "org.kde.neochat"
+        Layout.alignment: Qt.AlignHCenter
+        implicitWidth: Math.round(Kirigami.Units.iconSizes.huge * 1.5)
+        implicitHeight: Math.round(Kirigami.Units.iconSizes.huge * 1.5)
+    }
 
-            Kirigami.Separator {
-                Layout.fillWidth: true
+    Kirigami.Heading {
+        id: welcomeMessage
+
+        text: i18n("Welcome to NeoChat")
+
+        Layout.alignment: Qt.AlignHCenter
+        Layout.topMargin: Kirigami.Units.largeSpacing
+    }
+
+    FormCard.FormHeader {
+        id: existingAccountsHeader
+        title: i18nc("@title", "Continue with an existing account")
+        visible: (loadedAccounts.count > 0 || loadingAccounts.count > 0) && root._showExisting
+    }
+
+    FormCard.FormCard {
+        visible: existingAccountsHeader.visible
+        Repeater {
+            id: loadedAccounts
+            model: AccountRegistry
+            delegate: FormCard.FormButtonDelegate {
+                text: model.userId
+                onClicked: {
+                    Controller.activeConnection = model.connection;
+                    root.connectionChosen();
+                }
             }
+        }
+        Repeater {
+            id: loadingAccounts
+            model: Controller.accountsLoading
+            delegate: FormCard.AbstractFormDelegate {
+                id: loadingDelegate
 
-            Kirigami.InlineMessage {
-                id: headerMessage
-                type: Kirigami.MessageType.Error
-                showCloseButton: true
-                visible: false
+                topPadding: Kirigami.Units.smallSpacing
+                bottomPadding: Kirigami.Units.smallSpacing
 
-                Layout.fillWidth: true
-                Layout.margins: Kirigami.Units.largeSpacing
+                background: null
+                contentItem: RowLayout {
+                    spacing: 0
+
+                    QQC2.Label {
+                        Layout.fillWidth: true
+                        text: i18nc("As in 'this account is still loading'", "%1 (loading)", modelData)
+                        elide: Text.ElideRight
+                        wrapMode: Text.Wrap
+                        maximumLineCount: 2
+                        color: Kirigami.Theme.disabledTextColor
+                        Accessible.ignored: true // base class sets this text on root already
+                    }
+
+                    QQC2.ToolButton {
+                        text: i18nc("@action:button", "Log out of this account")
+                        icon.name: "edit-delete-remove"
+                        onClicked: Controller.removeConnection(modelData)
+                        display: QQC2.Button.IconOnly
+                        QQC2.ToolTip.text: text
+                        QQC2.ToolTip.visible: hovered
+                        QQC2.ToolTip.delay: Kirigami.Units.toolTipDelay
+                        enabled: true
+                        Layout.preferredHeight: Kirigami.Units.gridUnit * 2
+                    }
+
+                    FormCard.FormArrow {
+                        Layout.leftMargin: Kirigami.Units.smallSpacing
+                        Layout.alignment: Qt.AlignRight | Qt.AlignVCenter
+                        direction: Qt.RightArrow
+                        visible: root.background.visible
+                    }
+                }
+            }
+            onCountChanged: {
+                if (loadingAccounts.count === 0 && loadedAccounts.count === 1 && showExisting) {
+                    Controller.activeConnection = AccountRegistry.data(AccountRegistry.index(0, 0), 257);
+                    root.connectionChosen();
+                }
             }
         }
     }
 
-    contentItem: Item {
-        ColumnLayout {
-            anchors {
-                left: parent.left
-                right: parent.right
-                verticalCenter: parent.verticalCenter
-            }
+    FormCard.FormHeader {
+        title: i18nc("@title", "Log in or Create a New Account")
+    }
 
-            spacing: 0
+    FormCard.FormCard {
+        Loader {
+            id: module
+            Layout.fillWidth: true
+            sourceComponent: Qt.createComponent('org.kde.neochat.login', root.initialStep)
 
-            Kirigami.Icon {
-                source: "org.kde.neochat"
-                Layout.alignment: Qt.AlignHCenter
-                implicitWidth: Math.round(Kirigami.Units.iconSizes.huge * 1.5)
-                implicitHeight: Math.round(Kirigami.Units.iconSizes.huge * 1.5)
-            }
+            Connections {
+                id: stepConnections
+                target: currentStep
 
-            Kirigami.Heading {
-                id: welcomeMessage
-
-                text: i18n("NeoChat")
-
-                Layout.alignment: Qt.AlignHCenter
-                Layout.topMargin: Kirigami.Units.largeSpacing
-            }
-
-            FormCard.FormHeader {
-                id: existingAccountsHeader
-                title: i18nc("@title", "Continue with an existing account")
-                visible: (loadedAccounts.count > 0 || loadingAccounts.count > 0) && root._showExisting
-                maximumWidth: Kirigami.Units.gridUnit * 20
-            }
-
-            FormCard.FormCard {
-                visible: existingAccountsHeader.visible
-                maximumWidth: Kirigami.Units.gridUnit * 20
-                Repeater {
-                    id: loadedAccounts
-                    model: AccountRegistry
-                    delegate: FormCard.FormButtonDelegate {
-                        text: model.userId
-                        onClicked: {
-                            Controller.activeConnection = model.connection;
-                            root.connectionChosen();
-                        }
-                    }
-                }
-                Repeater {
-                    id: loadingAccounts
-                    model: Controller.accountsLoading
-                    delegate: FormCard.AbstractFormDelegate {
-                        id: loadingDelegate
-
-                        topPadding: Kirigami.Units.smallSpacing
-                        bottomPadding: Kirigami.Units.smallSpacing
-
-                        background: null
-                        contentItem: RowLayout {
-                            spacing: 0
-
-                            QQC2.Label {
-                                Layout.fillWidth: true
-                                text: i18nc("As in 'this account is still loading'", "%1 (loading)", modelData)
-                                elide: Text.ElideRight
-                                wrapMode: Text.Wrap
-                                maximumLineCount: 2
-                                color: Kirigami.Theme.disabledTextColor
-                                Accessible.ignored: true // base class sets this text on root already
-                            }
-
-                            QQC2.ToolButton {
-                                text: i18nc("@action:button", "Log out of this account")
-                                icon.name: "im-kick-user"
-                                onClicked: Controller.removeConnection(modelData)
-                                display: QQC2.Button.IconOnly
-                                QQC2.ToolTip.text: text
-                                QQC2.ToolTip.visible: hovered
-                                QQC2.ToolTip.delay: Kirigami.Units.toolTipDelay
-                                enabled: true
-                                Layout.preferredHeight: Kirigami.Units.gridUnit * 2
-                            }
-
-                            FormCard.FormArrow {
-                                Layout.leftMargin: Kirigami.Units.smallSpacing
-                                Layout.alignment: Qt.AlignRight | Qt.AlignVCenter
-                                direction: Qt.RightArrow
-                                visible: root.background.visible
-                            }
-                        }
-                    }
-                    onCountChanged: {
-                        if (loadingAccounts.count === 0 && loadedAccounts.count === 1 && showExisting) {
-                            Controller.activeConnection = AccountRegistry.data(AccountRegistry.index(0, 0), 257);
-                            root.connectionChosen();
-                        }
-                    }
-                }
-            }
-
-            FormCard.FormHeader {
-                title: i18nc("@title", "Log in or Create a New Account")
-                maximumWidth: Kirigami.Units.gridUnit * 20
-            }
-
-            FormCard.FormCard {
-                maximumWidth: Kirigami.Units.gridUnit * 20
-                Loader {
-                    id: module
-                    Layout.fillWidth: true
-                    sourceComponent: Qt.createComponent('org.kde.neochat.login', root.initialStep)
-
-                    Connections {
-                        id: stepConnections
-                        target: currentStep
-
-                        function onProcessed(nextStep: string): void {
-                            module.source = nextStep + ".qml";
-                            root.currentStepString = nextStep;
-                            headerMessage.text = "";
-                            headerMessage.visible = false;
-                            if (!module.item.noControls) {
-                                module.item.forceActiveFocus();
-                            } else {
-                                continueButton.forceActiveFocus();
-                            }
-                        }
-
-                        function onShowMessage(message: string): void {
-                            headerMessage.text = message;
-                            headerMessage.visible = true;
-                            headerMessage.type = Kirigami.MessageType.Information;
-                        }
-
-                        function onClearError(): void {
-                            headerMessage.text = "";
-                            headerMessage.visible = false;
-                        }
-
-                        function onCloseDialog(): void {
-                            root.closeDialog();
-                        }
-                    }
-
-                    Connections {
-                        target: Registration
-
-                        function onNextStepChanged() {
-                            if (Registration.nextStep === "m.login.recaptcha") {
-                                stepConnections.onProcessed("Captcha");
-                            }
-                            if (Registration.nextStep === "m.login.terms") {
-                                stepConnections.onProcessed("Terms");
-                            }
-                            if (Registration.nextStep === "m.login.email.identity") {
-                                stepConnections.onProcessed("Email");
-                            }
-                            if (Registration.nextStep === "loading") {
-                                stepConnections.onProcessed("Loading");
-                            }
-                        }
-                    }
-                    Connections {
-                        target: LoginHelper
-
-                        function onLoginErrorOccured(message) {
-                            headerMessage.text = message;
-                            headerMessage.visible = message.length > 0;
-                            headerMessage.type = Kirigami.MessageType.Error;
-                        }
+                function onProcessed(nextStep: string): void {
+                    module.source = nextStep + ".qml";
+                    root.currentStepString = nextStep;
+                    headerMessage.text = "";
+                    headerMessage.visible = false;
+                    if (!module.item.noControls) {
+                        module.item.forceActiveFocus();
+                    } else {
+                        continueButton.forceActiveFocus();
                     }
                 }
 
-                FormCard.FormDelegateSeparator {
-                    below: continueButton
-                    visible: root.currentStep.nextAction
+                function onShowMessage(message: string): void {
+                    headerMessage.text = message;
+                    headerMessage.visible = true;
+                    headerMessage.type = Kirigami.MessageType.Information;
                 }
 
-                FormCard.FormButtonDelegate {
-                    id: continueButton
-                    text: root.currentStep.nextAction && root.currentStep.nextAction.text ? root.currentStep.nextAction.text : i18nc("@action:button", "Continue")
-                    visible: root.currentStep.nextAction
-                    onClicked: root.currentStep.nextAction.trigger()
-                    icon.name: "arrow-right-symbolic"
-                    enabled: root.currentStep.nextAction ? root.currentStep.nextAction.enabled : false
+                function onClearError(): void {
+                    headerMessage.text = "";
+                    headerMessage.visible = false;
                 }
 
-                FormCard.FormButtonDelegate {
-                    text: i18nc("@action:button", "Go back")
-                    visible: root.currentStep.previousAction
-                    onClicked: root.currentStep.previousAction.trigger()
-                    icon.name: "arrow-left-symbolic"
-                    enabled: root.currentStep.previousAction ? root.currentStep.previousAction.enabled : false
+                function onCloseDialog(): void {
+                    root.closeDialog();
                 }
             }
 
-            FormCard.FormCard {
-                Layout.topMargin: Kirigami.Units.largeSpacing * 2
-                maximumWidth: Kirigami.Units.gridUnit * 20
-                FormCard.FormButtonDelegate {
-                    text: i18nc("@action:button", "Settings")
-                    icon.name: "settings-configure"
-                    onClicked: NeoChatSettingsView.open()
+            Connections {
+                target: Registration
+                function onNextStepChanged() {
+                    if (Registration.nextStep === "m.login.recaptcha") {
+                        stepConnections.onProcessed("Captcha");
+                    }
+                    if (Registration.nextStep === "m.login.terms") {
+                        stepConnections.onProcessed("Terms");
+                    }
+                    if (Registration.nextStep === "m.login.email.identity") {
+                        stepConnections.onProcessed("Email");
+                    }
+                    if (Registration.nextStep === "loading") {
+                        stepConnections.onProcessed("Loading");
+                    }
                 }
             }
+            Connections {
+                target: LoginHelper
+                function onErrorOccured(message) {
+                    headerMessage.text = message;
+                    headerMessage.visible = message.length > 0;
+                    headerMessage.type = Kirigami.MessageType.Error;
+                }
+            }
+        }
+
+        FormCard.FormDelegateSeparator {
+            below: continueButton
+        }
+
+        FormCard.FormButtonDelegate {
+            id: continueButton
+            text: root.currentStep.nextAction && root.currentStep.nextAction.text ? root.currentStep.nextAction.text : i18nc("@action:button", "Continue")
+            visible: root.currentStep.nextAction
+            onClicked: root.currentStep.nextAction.trigger()
+            icon.name: "arrow-right"
+            enabled: root.currentStep.nextAction ? root.currentStep.nextAction.enabled : false
+        }
+
+        FormCard.FormButtonDelegate {
+            text: i18nc("@action:button", "Go back")
+            visible: root.currentStep.previousAction
+            onClicked: root.currentStep.previousAction.trigger()
+            icon.name: "arrow-left"
+            enabled: root.currentStep.previousAction ? root.currentStep.previousAction.enabled : false
+        }
+    }
+
+    FormCard.FormCard {
+        Layout.topMargin: Kirigami.Units.largeSpacing
+        FormCard.FormButtonDelegate {
+            text: i18nc("@action:button", "Open proxy settings")
+            icon.name: "settings-configure"
+            onClicked: pageStack.pushDialogLayer(Qt.createComponent("org.kde.neochat.settings", "NetworkProxyPage"), {}, {
+                title: i18nc("@title:window", "Proxy Settings")
+            });
         }
     }
 

src/main.cpp

@@ -48,6 +48,7 @@
 #include "colorschemer.h"
 #include "controller.h"
 #include "logger.h"
+#include "neochatconfig.h"
 #include "roommanager.h"
 #include "sharehandler.h"
 #include "windowcontroller.h"
@@ -147,7 +148,7 @@ int main(int argc, char *argv[])
                     i18n("Maintainer"),
                     QStringLiteral("carl@carlschwan.eu"),
                     QStringLiteral("https://carlschwan.eu"),
-                    QUrl(QStringLiteral("https://carlschwan.eu/avatar.png")));
+                    QStringLiteral("https://carlschwan.eu/avatar.png"));
     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"));
@@ -184,6 +185,9 @@ int main(int argc, char *argv[])
 #endif
 
     ColorSchemer colorScheme;
+    if (!NeoChatConfig::self()->colorScheme().isEmpty()) {
+        colorScheme.apply(NeoChatConfig::self()->colorScheme());
+    }
 
     QCommandLineParser parser;
     parser.setApplicationDescription(i18n("Client for the matrix communication protocol"));
@@ -303,6 +307,7 @@ int main(int argc, char *argv[])
     QWindow *window = windowFromEngine(&engine);
 
     WindowController::instance().setWindow(window);
+    WindowController::instance().restoreGeometry();
 
     return app.exec();
 }

src/matriximageprovider.cpp

@@ -0,0 +1,124 @@
+// SPDX-FileCopyrightText: 2018-2019 Black Hat <bhat@encom.eu.org>
+// SPDX-FileCopyrightText: 2019 Kitsune Ral <kitsune-ral@users.sf.net>
+// SPDX-License-Identifier: GPL-3.0-only
+
+#include "matriximageprovider.h"
+
+#include <QDebug>
+#include <QDir>
+#include <QFileInfo>
+#include <QStandardPaths>
+#include <QThread>
+
+#include <KLocalizedString>
+
+#include "neochatconnection.h"
+
+using namespace Quotient;
+
+ThumbnailResponse::ThumbnailResponse(QString id, QSize size, NeoChatConnection *connection)
+    : mediaId(std::move(id))
+    , requestedSize(size)
+    , localFile(QStringLiteral("%1/image_provider/%2-%3x%4.png")
+                    .arg(QStandardPaths::writableLocation(QStandardPaths::CacheLocation),
+                         mediaId,
+                         QString::number(requestedSize.width()),
+                         QString::number(requestedSize.height())))
+    , m_connection(connection)
+    , errorStr("Image request hasn't started"_ls)
+{
+    if (requestedSize.isEmpty()) {
+        requestedSize.setHeight(100);
+        requestedSize.setWidth(100);
+    }
+    if (mediaId.count(QLatin1Char('/')) != 1) {
+        if (mediaId.startsWith(QLatin1Char('/'))) {
+            mediaId = mediaId.mid(1);
+        } else {
+            errorStr = i18n("Media id '%1' doesn't follow server/mediaId pattern", mediaId);
+            Q_EMIT finished();
+            return;
+        }
+    }
+
+    mediaId = mediaId.split(QLatin1Char('?'))[0];
+
+    QImage cachedImage;
+    if (cachedImage.load(localFile)) {
+        image = cachedImage;
+        errorStr.clear();
+        Q_EMIT finished();
+        return;
+    }
+
+    if (!m_connection) {
+        qWarning() << "Current connection is null";
+        return;
+    }
+
+    // Execute a request on the main thread asynchronously
+    moveToThread(m_connection->thread());
+    QMetaObject::invokeMethod(this, &ThumbnailResponse::startRequest, Qt::QueuedConnection);
+}
+
+void ThumbnailResponse::startRequest()
+{
+    if (!m_connection) {
+        return;
+    }
+    // Runs in the main thread, not QML thread
+    Q_ASSERT(QThread::currentThread() == m_connection->thread());
+    job = m_connection->getThumbnail(mediaId, requestedSize);
+    // Connect to any possible outcome including abandonment
+    // to make sure the QML thread is not left stuck forever.
+    connect(job, &BaseJob::finished, this, &ThumbnailResponse::prepareResult);
+}
+
+void ThumbnailResponse::prepareResult()
+{
+    Q_ASSERT(QThread::currentThread() == job->thread());
+    Q_ASSERT(job->error() != BaseJob::Pending);
+    {
+        QWriteLocker _(&lock);
+        if (job->error() == BaseJob::Success) {
+            image = job->thumbnail();
+
+            QString localPath = QFileInfo(localFile).absolutePath();
+            QDir dir;
+            if (!dir.exists(localPath)) {
+                dir.mkpath(localPath);
+            }
+
+            image.save(localFile);
+
+            errorStr.clear();
+        } else if (job->error() == BaseJob::Abandoned) {
+            errorStr = i18n("Image request has been cancelled");
+            // qDebug() << "ThumbnailResponse: cancelled for" << mediaId;
+        } else {
+            errorStr = job->errorString();
+            qWarning() << "ThumbnailResponse: no valid image for" << mediaId << "-" << errorStr;
+        }
+        job = nullptr;
+    }
+    Q_EMIT finished();
+}
+
+QQuickTextureFactory *ThumbnailResponse::textureFactory() const
+{
+    QReadLocker _(&lock);
+    return QQuickTextureFactory::textureFactoryForImage(image);
+}
+
+QString ThumbnailResponse::errorString() const
+{
+    QReadLocker _(&lock);
+    return errorStr;
+}
+
+QQuickImageResponse *MatrixImageProvider::requestImageResponse(const QString &id, const QSize &requestedSize)
+{
+    return new ThumbnailResponse(id, requestedSize, m_connection);
+}
+
+#include "moc_matriximageprovider.cpp"

src/matriximageprovider.h

@@ -0,0 +1,80 @@
+// SPDX-FileCopyrightText: 2018-2019 Black Hat <bhat@encom.eu.org>
+// SPDX-FileCopyrightText: 2019 Kitsune Ral <kitsune-ral@users.sf.net>
+// SPDX-License-Identifier: GPL-3.0-only
+
+#pragma once
+
+#include <QQuickAsyncImageProvider>
+
+#include <Quotient/jobs/mediathumbnailjob.h>
+
+#include <QReadWriteLock>
+
+class NeoChatConnection;
+
+/**
+ * @class ThumbnailResponse
+ *
+ * A QQuickImageResponse for an mxc image.
+ *
+ * @sa QQuickImageResponse
+ */
+class ThumbnailResponse : public QQuickImageResponse
+{
+    Q_OBJECT
+public:
+    explicit ThumbnailResponse(QString mediaId, QSize requestedSize, NeoChatConnection *m_connection);
+    ~ThumbnailResponse() override = default;
+
+private Q_SLOTS:
+    void startRequest();
+    void prepareResult();
+
+private:
+    QString mediaId;
+    QSize requestedSize;
+    const QString localFile;
+    Quotient::MediaThumbnailJob *job = nullptr;
+    QPointer<NeoChatConnection> m_connection;
+
+    QImage image;
+    QString errorStr;
+    mutable QReadWriteLock lock; // Guards ONLY these two members above
+
+    QQuickTextureFactory *textureFactory() const override;
+    QString errorString() const override;
+};
+
+/**
+ * @class MatrixImageProvider
+ *
+ * A QQuickAsyncImageProvider for mxc images.
+ *
+ * @sa QQuickAsyncImageProvider
+ */
+class MatrixImageProvider : public QQuickAsyncImageProvider
+{
+    Q_OBJECT
+    QML_ELEMENT
+    QML_SINGLETON
+
+    Q_PROPERTY(NeoChatConnection *connection MEMBER m_connection)
+public:
+    static MatrixImageProvider *create(QQmlEngine *engine, QJSEngine *)
+    {
+        static MatrixImageProvider *instance = new MatrixImageProvider;
+        engine->setObjectOwnership(instance, QQmlEngine::CppOwnership);
+        return instance;
+    }
+
+    /**
+     * @brief Return a job to provide the image with the given ID.
+     *
+     * @sa QQuickAsyncImageProvider::requestImageResponse
+     */
+    QQuickImageResponse *requestImageResponse(const QString &id, const QSize &requestedSize) override;
+
+private:
+    QPointer<NeoChatConnection> m_connection;
+    MatrixImageProvider() = default;
+};

src/messagecomponent.h

@@ -1,22 +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 "enums/messagecomponenttype.h"
-
-struct MessageComponent {
-    MessageComponentType::Type type = MessageComponentType::Other;
-    QString content;
-    QVariantMap attributes;
-
-    int operator==(const MessageComponent &right) const
-    {
-        return type == right.type && content == right.content && attributes == right.attributes;
-    }
-
-    bool isEmpty() const
-    {
-        return type == MessageComponentType::Other;
-    }
-};

src/models/actionsmodel.cpp

@@ -4,7 +4,7 @@
 #include "actionsmodel.h"
 
 #include "chatbarcache.h"
-#include "enums/messagetype.h"
+#include "controller.h"
 #include "neochatconnection.h"
 #include "neochatroom.h"
 #include "roommanager.h"
@@ -24,14 +24,15 @@ QStringList rainbowColors{"#ff2b00"_ls, "#ff5500"_ls, "#ff8000"_ls, "#ffaa00"_ls
 
 auto leaveRoomLambda = [](const QString &text, NeoChatRoom *room, ChatBarCache *) {
     if (text.isEmpty()) {
-        Q_EMIT room->showMessage(MessageType::Information, i18n("Leaving this room."));
+        Q_EMIT Controller::instance().showMessage(Controller::Info, i18n("Leaving this room."));
         room->connection()->leaveRoom(room);
     } else {
         QRegularExpression roomRegex(QStringLiteral(R"(^[#!][^:]+:\w(?:\w|\.|-)*\.\w+(?::\d{1,5})?)"));
         auto regexMatch = roomRegex.match(text);
         if (!regexMatch.hasMatch()) {
-            Q_EMIT room->showMessage(MessageType::Error,
-                                     i18nc("'<text>' does not look like a room id or alias.", "'%1' does not look like a room id or alias.", text));
+            Q_EMIT Controller::instance().showMessage(
+                Controller::Error,
+                i18nc("'<text>' does not look like a room id or alias.", "'%1' does not look like a room id or alias.", text));
             return QString();
         }
         auto leaving = room->connection()->room(text);
@@ -39,10 +40,10 @@ auto leaveRoomLambda = [](const QString &text, NeoChatRoom *room, ChatBarCache *
             leaving = room->connection()->roomByAlias(text);
         }
         if (leaving) {
-            Q_EMIT room->showMessage(MessageType::Information, i18nc("Leaving room <roomname>.", "Leaving room %1.", text));
+            Q_EMIT Controller::instance().showMessage(Controller::Info, i18nc("Leaving room <roomname>.", "Leaving room %1.", text));
             room->connection()->leaveRoom(leaving);
         } else {
-            Q_EMIT room->showMessage(MessageType::Information, i18nc("Room <roomname> not found", "Room %1 not found.", text));
+            Q_EMIT Controller::instance().showMessage(Controller::Info, i18nc("Room <roomname> not found", "Room %1 not found.", text));
         }
     }
     return QString();
@@ -50,7 +51,7 @@ auto leaveRoomLambda = [](const QString &text, NeoChatRoom *room, ChatBarCache *
 
 auto roomNickLambda = [](const QString &text, NeoChatRoom *room, ChatBarCache *) {
     if (text.isEmpty()) {
-        Q_EMIT room->showMessage(MessageType::Error, i18n("No new nickname provided, no changes will happen."));
+        Q_EMIT Controller::instance().showMessage(Controller::Error, i18n("No new nickname provided, no changes will happen."));
     } else {
         room->connection()->user()->rename(text, room);
     }
@@ -192,29 +193,31 @@ QList<ActionsModel::Action> actions{
                 QStringLiteral(R"((^|[][[:space:](){}`'";])([!#@][-a-z0-9_=#/.]{1,252}:\w(?:\w|\.|-)*\.\w+(?::\d{1,5})?))"));
             auto regexMatch = mxidRegex.match(text);
             if (!regexMatch.hasMatch()) {
-                Q_EMIT room->showMessage(MessageType::Error, i18nc("'<text>' does not look like a matrix id.", "'%1' does not look like a matrix id.", text));
+                Q_EMIT Controller::instance().showMessage(Controller::Error,
+                                                          i18nc("'<text>' does not look like a matrix id.", "'%1' does not look like a matrix id.", text));
                 return QString();
             }
             const RoomMemberEvent *roomMemberEvent = room->currentState().get<RoomMemberEvent>(text);
             if (roomMemberEvent && roomMemberEvent->membership() == Membership::Invite) {
-                Q_EMIT room->showMessage(MessageType::Information,
-                                         i18nc("<user> is already invited to this room.", "%1 is already invited to this room.", text));
+                Q_EMIT Controller::instance().showMessage(Controller::Info,
+                                                          i18nc("<user> is already invited to this room.", "%1 is already invited to this room.", text));
                 return QString();
             }
             if (roomMemberEvent && roomMemberEvent->membership() == Membership::Ban) {
-                Q_EMIT room->showMessage(MessageType::Information, i18nc("<user> is banned from this room.", "%1 is banned from this room.", text));
+                Q_EMIT Controller::instance().showMessage(Controller::Info, i18nc("<user> is banned from this room.", "%1 is banned from this room.", text));
                 return QString();
             }
             if (room->localMember().id() == text) {
-                Q_EMIT room->showMessage(MessageType::Positive, i18n("You are already in this room."));
+                Q_EMIT Controller::instance().showMessage(Controller::Positive, i18n("You are already in this room."));
                 return QString();
             }
-            if (room->joinedMemberIds().contains(text)) {
-                Q_EMIT room->showMessage(MessageType::Information, i18nc("<user> is already in this room.", "%1 is already in this room.", text));
+            if (room->members().contains(room->member(text))) {
+                Q_EMIT Controller::instance().showMessage(Controller::Info, i18nc("<user> is already in this room.", "%1 is already in this room.", text));
                 return QString();
             }
             room->inviteToRoom(text);
-            Q_EMIT room->showMessage(MessageType::Positive, i18nc("<username> was invited into this room", "%1 was invited into this room", text));
+            Q_EMIT Controller::instance().showMessage(Controller::Positive,
+                                                      i18nc("<username> was invited into this room", "%1 was invited into this room", text));
             return QString();
         },
         false,
@@ -228,8 +231,9 @@ QList<ActionsModel::Action> actions{
             QRegularExpression roomRegex(QStringLiteral(R"(^[#!][^:]+:\w(?:\w|\.|-)*\.\w+(?::\d{1,5})?)"));
             auto regexMatch = roomRegex.match(text);
             if (!regexMatch.hasMatch()) {
-                Q_EMIT room->showMessage(MessageType::Error,
-                                         i18nc("'<text>' does not look like a room id or alias.", "'%1' does not look like a room id or alias.", text));
+                Q_EMIT Controller::instance().showMessage(
+                    Controller::Error,
+                    i18nc("'<text>' does not look like a room id or alias.", "'%1' does not look like a room id or alias.", text));
                 return QString();
             }
             auto targetRoom = text.startsWith(QLatin1Char('!')) ? room->connection()->room(text) : room->connection()->roomByAlias(text);
@@ -237,7 +241,7 @@ QList<ActionsModel::Action> actions{
                 RoomManager::instance().resolveResource(targetRoom->id());
                 return QString();
             }
-            Q_EMIT room->showMessage(MessageType::Information, i18nc("Joining room <roomname>.", "Joining room %1.", text));
+            Q_EMIT Controller::instance().showMessage(Controller::Info, i18nc("Joining room <roomname>.", "Joining room %1.", text));
             RoomManager::instance().resolveResource(text, "join"_ls);
             return QString();
         },
@@ -254,8 +258,9 @@ QList<ActionsModel::Action> actions{
             QRegularExpression roomRegex(QStringLiteral(R"(^[#!][^:]+:\w(?:\w|\.|-)*\.\w+(?::\d{1,5})?)"));
             auto regexMatch = roomRegex.match(roomName);
             if (!regexMatch.hasMatch()) {
-                Q_EMIT room->showMessage(MessageType::Error,
-                                         i18nc("'<text>' does not look like a room id or alias.", "'%1' does not look like a room id or alias.", text));
+                Q_EMIT Controller::instance().showMessage(
+                    Controller::Error,
+                    i18nc("'<text>' does not look like a room id or alias.", "'%1' does not look like a room id or alias.", text));
                 return QString();
             }
             auto targetRoom = text.startsWith(QLatin1Char('!')) ? room->connection()->room(text) : room->connection()->roomByAlias(text);
@@ -263,7 +268,7 @@ QList<ActionsModel::Action> actions{
                 RoomManager::instance().resolveResource(targetRoom->id());
                 return QString();
             }
-            Q_EMIT room->showMessage(MessageType::Information, i18nc("Knocking room <roomname>.", "Knocking room %1.", text));
+            Q_EMIT Controller::instance().showMessage(Controller::Info, i18nc("Knocking room <roomname>.", "Knocking room %1.", text));
             auto connection = dynamic_cast<NeoChatConnection *>(room->connection());
             const auto knownServer = roomName.mid(roomName.indexOf(":"_ls) + 1);
             if (parts.length() >= 2) {
@@ -284,15 +289,16 @@ QList<ActionsModel::Action> actions{
             QRegularExpression roomRegex(QStringLiteral(R"(^[#!][^:]+:\w(?:\w|\.|-)*\.\w+(?::\d{1,5})?)"));
             auto regexMatch = roomRegex.match(text);
             if (!regexMatch.hasMatch()) {
-                Q_EMIT room->showMessage(MessageType::Error,
-                                         i18nc("'<text>' does not look like a room id or alias.", "'%1' does not look like a room id or alias.", text));
+                Q_EMIT Controller::instance().showMessage(
+                    Controller::Error,
+                    i18nc("'<text>' does not look like a room id or alias.", "'%1' does not look like a room id or alias.", text));
                 return QString();
             }
             if (room->connection()->room(text) || room->connection()->roomByAlias(text)) {
-                Q_EMIT room->showMessage(MessageType::Information, i18nc("You are already in room <roomname>.", "You are already in room %1.", text));
+                Q_EMIT Controller::instance().showMessage(Controller::Info, i18nc("You are already in room <roomname>.", "You are already in room %1.", text));
                 return QString();
             }
-            Q_EMIT room->showMessage(MessageType::Information, i18nc("Joining room <roomname>.", "Joining room %1.", text));
+            Q_EMIT Controller::instance().showMessage(Controller::Info, i18nc("Joining room <roomname>.", "Joining room %1.", text));
             RoomManager::instance().resolveResource(text, "join"_ls);
             return QString();
         },
@@ -321,7 +327,7 @@ QList<ActionsModel::Action> actions{
         QStringLiteral("nick"),
         [](const QString &text, NeoChatRoom *room, ChatBarCache *) {
             if (text.isEmpty()) {
-                Q_EMIT room->showMessage(MessageType::Error, i18n("No new nickname provided, no changes will happen."));
+                Q_EMIT Controller::instance().showMessage(Controller::Error, i18n("No new nickname provided, no changes will happen."));
             } else {
                 room->connection()->user()->rename(text);
             }
@@ -355,15 +361,16 @@ QList<ActionsModel::Action> actions{
                 QStringLiteral(R"((^|[][[:space:](){}`'";])([!#@][-a-z0-9_=#/.]{1,252}:\w(?:\w|\.|-)*\.\w+(?::\d{1,5})?))"));
             auto regexMatch = mxidRegex.match(text);
             if (!regexMatch.hasMatch()) {
-                Q_EMIT room->showMessage(MessageType::Error, i18nc("'<text>' does not look like a matrix id.", "'%1' does not look like a matrix id.", text));
+                Q_EMIT Controller::instance().showMessage(Controller::Error,
+                                                          i18nc("'<text>' does not look like a matrix id.", "'%1' does not look like a matrix id.", text));
                 return QString();
             }
             if (room->connection()->ignoredUsers().contains(text)) {
-                Q_EMIT room->showMessage(MessageType::Information, i18nc("<username> is already ignored.", "%1 is already ignored.", text));
+                Q_EMIT Controller::instance().showMessage(Controller::Info, i18nc("<username> is already ignored.", "%1 is already ignored.", text));
                 return QString();
             }
             room->connection()->addToIgnoredUsers(text);
-            Q_EMIT room->showMessage(MessageType::Positive, i18nc("<username> is now ignored", "%1 is now ignored.", text));
+            Q_EMIT Controller::instance().showMessage(Controller::Positive, i18nc("<username> is now ignored", "%1 is now ignored.", text));
 
             return QString();
         },
@@ -379,15 +386,16 @@ QList<ActionsModel::Action> actions{
                 QStringLiteral(R"((^|[][[:space:](){}`'";])([!#@][-a-z0-9_=#/.]{1,252}:\w(?:\w|\.|-)*\.\w+(?::\d{1,5})?))"));
             auto regexMatch = mxidRegex.match(text);
             if (!regexMatch.hasMatch()) {
-                Q_EMIT room->showMessage(MessageType::Error, i18nc("'<text>' does not look like a matrix id.", "'%1' does not look like a matrix id.", text));
+                Q_EMIT Controller::instance().showMessage(Controller::Error,
+                                                          i18nc("'<text>' does not look like a matrix id.", "'%1' does not look like a matrix id.", text));
                 return QString();
             }
             if (!room->connection()->ignoredUsers().contains(text)) {
-                Q_EMIT room->showMessage(MessageType::Information, i18nc("<username> is not ignored.", "%1 is not ignored.", text));
+                Q_EMIT Controller::instance().showMessage(Controller::Info, i18nc("<username> is not ignored.", "%1 is not ignored.", text));
                 return QString();
             }
             room->connection()->removeFromIgnoredUsers(text);
-            Q_EMIT room->showMessage(MessageType::Positive, i18nc("<username> is no longer ignored.", "%1 is no longer ignored.", text));
+            Q_EMIT Controller::instance().showMessage(Controller::Positive, i18nc("<username> is no longer ignored.", "%1 is no longer ignored.", text));
             return QString();
         },
         false,
@@ -423,13 +431,14 @@ QList<ActionsModel::Action> actions{
                 QStringLiteral(R"((^|[][[:space:](){}`'";])([!#@][-a-z0-9_=#/.]{1,252}:\w(?:\w|\.|-)*\.\w+(?::\d{1,5})?))"));
             auto regexMatch = mxidRegex.match(parts[0]);
             if (!regexMatch.hasMatch()) {
-                Q_EMIT room->showMessage(MessageType::Error, i18nc("'<text>' does not look like a matrix id.", "'%1' does not look like a matrix id.", text));
+                Q_EMIT Controller::instance().showMessage(Controller::Error,
+                                                          i18nc("'<text>' does not look like a matrix id.", "'%1' does not look like a matrix id.", text));
                 return QString();
             }
             auto state = room->currentState().get<RoomMemberEvent>(parts[0]);
             if (state && state->membership() == Membership::Ban) {
-                Q_EMIT room->showMessage(MessageType::Information,
-                                         i18nc("<user> is already banned from this room.", "%1 is already banned from this room.", text));
+                Q_EMIT Controller::instance().showMessage(Controller::Info,
+                                                          i18nc("<user> is already banned from this room.", "%1 is already banned from this room.", text));
                 return QString();
             }
             auto plEvent = room->currentState().get<RoomPowerLevelsEvent>();
@@ -437,17 +446,18 @@ QList<ActionsModel::Action> actions{
                 return QString();
             }
             if (plEvent->ban() > plEvent->powerLevelForUser(room->localMember().id())) {
-                Q_EMIT room->showMessage(MessageType::Error, i18n("You are not allowed to ban users from this room."));
+                Q_EMIT Controller::instance().showMessage(Controller::Error, i18n("You are not allowed to ban users from this room."));
                 return QString();
             }
             if (plEvent->powerLevelForUser(room->localMember().id()) <= plEvent->powerLevelForUser(parts[0])) {
-                Q_EMIT room->showMessage(
-                    MessageType::Error,
+                Q_EMIT Controller::instance().showMessage(
+                    Controller::Error,
                     i18nc("You are not allowed to ban <username> from this room.", "You are not allowed to ban %1 from this room.", parts[0]));
                 return QString();
             }
             room->ban(parts[0], parts.size() > 1 ? parts.mid(1).join(QLatin1Char(' ')) : QString());
-            Q_EMIT room->showMessage(MessageType::Positive, i18nc("<username> was banned from this room.", "%1 was banned from this room.", parts[0]));
+            Q_EMIT Controller::instance().showMessage(Controller::Positive,
+                                                      i18nc("<username> was banned from this room.", "%1 was banned from this room.", parts[0]));
             return QString();
         },
         false,
@@ -462,7 +472,8 @@ QList<ActionsModel::Action> actions{
                 QStringLiteral(R"((^|[][[:space:](){}`'";])([!#@][-a-z0-9_=#/.]{1,252}:\w(?:\w|\.|-)*\.\w+(?::\d{1,5})?))"));
             auto regexMatch = mxidRegex.match(text);
             if (!regexMatch.hasMatch()) {
-                Q_EMIT room->showMessage(MessageType::Error, i18nc("'<text>' does not look like a matrix id.", "'%1' does not look like a matrix id.", text));
+                Q_EMIT Controller::instance().showMessage(Controller::Error,
+                                                          i18nc("'<text>' does not look like a matrix id.", "'%1' does not look like a matrix id.", text));
                 return QString();
             }
             auto plEvent = room->currentState().get<RoomPowerLevelsEvent>();
@@ -470,16 +481,18 @@ QList<ActionsModel::Action> actions{
                 return QString();
             }
             if (plEvent->ban() > plEvent->powerLevelForUser(room->localMember().id())) {
-                Q_EMIT room->showMessage(MessageType::Error, i18n("You are not allowed to unban users from this room."));
+                Q_EMIT Controller::instance().showMessage(Controller::Error, i18n("You are not allowed to unban users from this room."));
                 return QString();
             }
             auto state = room->currentState().get<RoomMemberEvent>(text);
             if (state && state->membership() != Membership::Ban) {
-                Q_EMIT room->showMessage(MessageType::Information, i18nc("<user> is not banned from this room.", "%1 is not banned from this room.", text));
+                Q_EMIT Controller::instance().showMessage(Controller::Info,
+                                                          i18nc("<user> is not banned from this room.", "%1 is not banned from this room.", text));
                 return QString();
             }
             room->unban(text);
-            Q_EMIT room->showMessage(MessageType::Positive, i18nc("<username> was unbanned from this room.", "%1 was unbanned from this room.", text));
+            Q_EMIT Controller::instance().showMessage(Controller::Positive,
+                                                      i18nc("<username> was unbanned from this room.", "%1 was unbanned from this room.", text));
 
             return QString();
         },
@@ -496,16 +509,16 @@ QList<ActionsModel::Action> actions{
                 QStringLiteral(R"((^|[][[:space:](){}`'";])([!#@][-a-z0-9_=#/.]{1,252}:\w(?:\w|\.|-)*\.\w+(?::\d{1,5})?))"));
             auto regexMatch = mxidRegex.match(parts[0]);
             if (!regexMatch.hasMatch()) {
-                Q_EMIT room->showMessage(MessageType::Error,
-                                         i18nc("'<text>' does not look like a matrix id.", "'%1' does not look like a matrix id.", parts[0]));
+                Q_EMIT Controller::instance().showMessage(Controller::Error,
+                                                          i18nc("'<text>' does not look like a matrix id.", "'%1' does not look like a matrix id.", parts[0]));
                 return QString();
             }
             if (parts[0] == room->localMember().id()) {
-                Q_EMIT room->showMessage(MessageType::Error, i18n("You cannot kick yourself from the room."));
+                Q_EMIT Controller::instance().showMessage(Controller::Error, i18n("You cannot kick yourself from the room."));
                 return QString();
             }
             if (!room->isMember(parts[0])) {
-                Q_EMIT room->showMessage(MessageType::Error, i18nc("<username> is not in this room", "%1 is not in this room.", parts[0]));
+                Q_EMIT Controller::instance().showMessage(Controller::Error, i18nc("<username> is not in this room", "%1 is not in this room.", parts[0]));
                 return QString();
             }
             auto plEvent = room->currentState().get<RoomPowerLevelsEvent>();
@@ -514,17 +527,18 @@ QList<ActionsModel::Action> actions{
             }
             auto kick = plEvent->kick();
             if (plEvent->powerLevelForUser(room->localMember().id()) < kick) {
-                Q_EMIT room->showMessage(MessageType::Error, i18n("You are not allowed to kick users from this room."));
+                Q_EMIT Controller::instance().showMessage(Controller::Error, i18n("You are not allowed to kick users from this room."));
                 return QString();
             }
             if (plEvent->powerLevelForUser(room->localMember().id()) <= plEvent->powerLevelForUser(parts[0])) {
-                Q_EMIT room->showMessage(
-                    MessageType::Error,
+                Q_EMIT Controller::instance().showMessage(
+                    Controller::Error,
                     i18nc("You are not allowed to kick <username> from this room", "You are not allowed to kick %1 from this room.", parts[0]));
                 return QString();
             }
             room->kickMember(parts[0], parts.size() > 1 ? parts.mid(1).join(QLatin1Char(' ')) : QString());
-            Q_EMIT room->showMessage(MessageType::Positive, i18nc("<username> was kicked from this room.", "%1 was kicked from this room.", parts[0]));
+            Q_EMIT Controller::instance().showMessage(Controller::Positive,
+                                                      i18nc("<username> was kicked from this room.", "%1 was kicked from this room.", parts[0]));
             return QString();
         },
         false,

src/models/messagecontentmodel.cpp

@@ -2,18 +2,18 @@
 // SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
 
 #include "messagecontentmodel.h"
-#include "eventhandler.h"
 #include "neochatconfig.h"
+#include "neochatroommember.h"
 
 #include <QImageReader>
 
+#include <Quotient/events/eventcontent.h>
 #include <Quotient/events/redactionevent.h>
 #include <Quotient/events/roommessageevent.h>
 #include <Quotient/events/stickerevent.h>
-#include <Quotient/qt_connection_util.h>
 
 #include <KLocalizedString>
-#include <Kirigami/Platform/PlatformTheme>
+#include <Quotient/qt_connection_util.h>
 
 #ifndef Q_OS_ANDROID
 #include <KSyntaxHighlighting/Definition>
@@ -21,7 +21,10 @@
 #endif
 
 #include "chatbarcache.h"
+#include "enums/messagecomponenttype.h"
+#include "eventhandler.h"
 #include "filetype.h"
+#include "itinerarymodel.h"
 #include "linkpreviewer.h"
 #include "neochatconnection.h"
 #include "neochatroom.h"
@@ -29,8 +32,20 @@
 
 using namespace Quotient;
 
-MessageContentModel::MessageContentModel(NeoChatRoom *room, const QString &eventId, bool isReply, bool isPending, MessageContentModel *parent)
-    : QAbstractListModel(parent)
+MessageContentModel::MessageContentModel(NeoChatRoom *room, const Quotient::RoomEvent *event, bool isReply, bool isPending)
+    : QAbstractListModel(nullptr)
+    , m_room(room)
+    , m_eventId(event != nullptr ? event->id() : QString())
+    , m_eventSenderId(event != nullptr ? event->senderId() : QString())
+    , m_isPending(isPending)
+    , m_isReply(isReply)
+{
+    intiializeEvent(event);
+    initializeModel();
+}
+
+MessageContentModel::MessageContentModel(NeoChatRoom *room, const QString &eventId, bool isReply, bool isPending)
+    : QAbstractListModel(nullptr)
     , m_room(room)
     , m_eventId(eventId)
     , m_isPending(isPending)
@@ -42,79 +57,76 @@ MessageContentModel::MessageContentModel(NeoChatRoom *room, const QString &event
 void MessageContentModel::initializeModel()
 {
     Q_ASSERT(m_room != nullptr);
+    // Allow making a model for an event that is being downloaded but will appear later
+    // e.g. a reply, but we need an ID to know when it has arrived.
     Q_ASSERT(!m_eventId.isEmpty());
 
-    connect(this, &MessageContentModel::eventUnavailable, this, &MessageContentModel::getEvent);
+    Quotient::connectUntil(m_room.get(), &NeoChatRoom::extraEventLoaded, this, [this](const QString &eventId) {
+        if (m_room != nullptr) {
+            if (eventId == m_eventId) {
+                m_event = loadEvent<RoomEvent>(m_room->getEvent(eventId)->fullJson());
+                Q_EMIT eventUpdated();
+                updateReplyModel();
+                resetContent();
+                return true;
+            }
+        }
+        return false;
+    });
+
+    if (m_event == nullptr) {
+        m_room->downloadEventFromServer(m_eventId);
+    }
 
     connect(m_room, &NeoChatRoom::pendingEventAboutToMerge, this, [this](Quotient::RoomEvent *serverEvent) {
-        if (m_room != nullptr) {
-            if (m_eventId == serverEvent->id() || m_eventId == serverEvent->transactionId()) {
+        if (m_room != nullptr && m_event != nullptr) {
+            if (m_eventId == serverEvent->id()) {
                 beginResetModel();
                 m_isPending = false;
-                m_eventId = serverEvent->id();
-                initializeEvent();
+                intiializeEvent(serverEvent);
                 endResetModel();
             }
         }
     });
-    connect(m_room, &NeoChatRoom::addedMessages, this, [this](int fromIndex, int toIndex) {
-        if (m_room != nullptr) {
-            for (int i = fromIndex; i <= toIndex; i++) {
-                if (m_room->findInTimeline(i)->event()->id() == m_eventId) {
-                    initializeEvent();
-                    updateReplyModel();
-                    resetModel();
-                }
-            }
-        }
-    });
     connect(m_room, &NeoChatRoom::replacedEvent, this, [this](const Quotient::RoomEvent *newEvent) {
-        if (m_room != nullptr) {
+        if (m_room != nullptr && m_event != nullptr) {
             if (m_eventId == newEvent->id()) {
                 beginResetModel();
-                initializeEvent();
-                resetContent();
+                intiializeEvent(newEvent);
                 endResetModel();
             }
         }
     });
     connect(m_room, &NeoChatRoom::newFileTransfer, this, [this](const QString &eventId) {
-        if (eventId == m_eventId) {
+        if (m_event != nullptr && eventId == m_eventId) {
             Q_EMIT dataChanged(index(0), index(rowCount() - 1), {FileTransferInfoRole});
         }
     });
     connect(m_room, &NeoChatRoom::fileTransferProgress, this, [this](const QString &eventId) {
-        if (eventId == m_eventId) {
+        if (m_event != nullptr && eventId == m_eventId) {
             Q_EMIT dataChanged(index(0), index(rowCount() - 1), {FileTransferInfoRole});
         }
     });
     connect(m_room, &NeoChatRoom::fileTransferCompleted, this, [this](const QString &eventId) {
-        if (m_room != nullptr && eventId == m_eventId) {
+        if (m_room != nullptr && m_event != nullptr && eventId == m_eventId) {
             resetContent();
             Q_EMIT dataChanged(index(0), index(rowCount() - 1), {FileTransferInfoRole});
         }
     });
     connect(m_room, &NeoChatRoom::fileTransferFailed, this, [this](const QString &eventId) {
-        if (eventId == m_eventId) {
+        if (m_event != nullptr && eventId == m_eventId) {
             resetContent();
             Q_EMIT dataChanged(index(0), index(rowCount() - 1), {FileTransferInfoRole});
         }
     });
     connect(m_room->editCache(), &ChatBarCache::relationIdChanged, this, [this](const QString &oldEventId, const QString &newEventId) {
-        if (oldEventId == m_eventId || newEventId == m_eventId) {
+        if (m_event != nullptr && (oldEventId == m_eventId || newEventId == m_eventId)) {
             // HACK: Because DelegateChooser can't switch the delegate on dataChanged it has to think there is a new delegate.
             beginResetModel();
             resetContent(newEventId == m_eventId);
             endResetModel();
         }
     });
-    connect(m_room->threadCache(), &ChatBarCache::threadIdChanged, this, [this](const QString &oldThreadId, const QString &newThreadId) {
-        if (oldThreadId == m_eventId || newThreadId == m_eventId) {
-            beginResetModel();
-            resetContent(false, newThreadId == m_eventId);
-            endResetModel();
-        }
-    });
     connect(m_room, &NeoChatRoom::urlPreviewEnabledChanged, this, [this]() {
         resetContent();
     });
@@ -122,78 +134,49 @@ void MessageContentModel::initializeModel()
         resetContent();
     });
     connect(m_room, &Room::memberNameUpdated, this, [this](RoomMember member) {
-        if (m_room != nullptr) {
+        if (m_room != nullptr && m_event != nullptr) {
             if (m_eventSenderId.isEmpty() || m_eventSenderId == member.id()) {
                 Q_EMIT dataChanged(index(0, 0), index(rowCount() - 1, 0), {AuthorRole});
             }
         }
     });
     connect(m_room, &Room::memberAvatarUpdated, this, [this](RoomMember member) {
-        if (m_room != nullptr) {
+        if (m_room != nullptr && m_event != nullptr) {
             if (m_eventSenderId.isEmpty() || m_eventSenderId == member.id()) {
                 Q_EMIT dataChanged(index(0, 0), index(rowCount() - 1, 0), {AuthorRole});
             }
         }
     });
 
-    connect(NeoChatConfig::self(), &NeoChatConfig::ThreadsChanged, this, [this]() {
+    if (m_event != nullptr) {
         updateReplyModel();
-        resetModel();
-    });
-
-    initializeEvent();
-    updateReplyModel();
+    }
     resetModel();
 }
 
-void MessageContentModel::initializeEvent()
+void MessageContentModel::intiializeEvent(const QString &eventId)
 {
-    const auto event = m_room->getEvent(m_eventId);
-    if (event == nullptr) {
-        Q_EMIT eventUnavailable();
-        return;
+    const auto newEvent = m_room->getEvent(eventId);
+    if (newEvent != nullptr) {
+        intiializeEvent(newEvent);
     }
+}
 
+void MessageContentModel::intiializeEvent(const Quotient::RoomEvent *event)
+{
+    m_event = loadEvent<RoomEvent>(event->fullJson());
+    auto senderId = event->senderId();
+    // A pending event might not have a sender ID set yet but in that case it must
+    // be the local member.
+    if (senderId.isEmpty()) {
+        senderId = m_room->localMember().id();
+    }
     if (m_eventSenderObject == nullptr) {
-        auto senderId = event->senderId();
-        // A pending event might not have a sender ID set yet but in that case it must
-        // be the local member.
-        if (senderId.isEmpty()) {
-            senderId = m_room->localMember().id();
-        }
         m_eventSenderObject = std::unique_ptr<NeochatRoomMember>(new NeochatRoomMember(m_room, senderId));
     }
     Q_EMIT eventUpdated();
 }
 
-void MessageContentModel::getEvent()
-{
-    Quotient::connectUntil(m_room.get(), &NeoChatRoom::extraEventLoaded, this, [this](const QString &eventId) {
-        if (m_room != nullptr) {
-            if (eventId == m_eventId) {
-                m_notFound = false;
-                initializeEvent();
-                updateReplyModel();
-                resetModel();
-                return true;
-            }
-        }
-        return false;
-    });
-    Quotient::connectUntil(m_room.get(), &NeoChatRoom::extraEventNotFound, this, [this](const QString &eventId) {
-        if (m_room != nullptr) {
-            if (eventId == m_eventId) {
-                m_notFound = true;
-                resetModel();
-                return true;
-            }
-        }
-        return false;
-    });
-
-    m_room->downloadEventFromServer(m_eventId);
-}
-
 bool MessageContentModel::showAuthor() const
 {
     return m_showAuthor;
@@ -206,7 +189,7 @@ void MessageContentModel::setShowAuthor(bool showAuthor)
     }
     m_showAuthor = showAuthor;
 
-    if (m_room->connection()->isIgnored(m_eventSenderId)) {
+    if (m_event != nullptr) {
         if (showAuthor) {
             beginInsertRows({}, 0, 0);
             m_components.prepend(MessageComponent{MessageComponentType::Author, QString(), {}});
@@ -233,49 +216,20 @@ QVariant MessageContentModel::data(const QModelIndex &index, int role) const
         return {};
     }
 
+    EventHandler eventHandler(m_room, m_event.get());
     const auto component = m_components[index.row()];
 
-    const auto event = m_room->getEvent(m_eventId);
-    if (event == nullptr) {
-        if (role == DisplayRole) {
-            if (m_isReply) {
-                return i18n("Loading reply");
-            } else {
-                return i18n("Loading");
-            }
-        }
-        if (role == ComponentTypeRole) {
-            return component.type;
-        }
-        return {};
-    }
-
     if (role == DisplayRole) {
-        if (m_notFound || m_room->connection()->isIgnored(m_eventSenderId)) {
-            Kirigami::Platform::PlatformTheme *theme =
-                static_cast<Kirigami::Platform::PlatformTheme *>(qmlAttachedPropertiesObject<Kirigami::Platform::PlatformTheme>(this, true));
-
-            QString disabledTextColor;
-            if (theme != nullptr) {
-                disabledTextColor = theme->disabledTextColor().name();
-            } else {
-                disabledTextColor = QStringLiteral("#000000");
-            }
-            return QString(QStringLiteral("<span style=\"color:%1\">").arg(disabledTextColor)
-                           + i18nc("@info", "This message was either not found, you do not have permission to view it, or it was sent by an ignored user")
-                           + QStringLiteral("</span>"));
+        if (component.type == MessageComponentType::Loading && m_isReply) {
+            return i18n("Loading reply");
         }
-        if (component.type == MessageComponentType::Loading) {
-            if (m_isReply) {
-                return i18n("Loading reply");
-            } else {
-                return i18n("Loading");
-            }
+        if (m_event == nullptr) {
+            return QString();
         }
         if (!component.content.isEmpty()) {
             return component.content;
         }
-        return EventHandler::richBody(m_room, event);
+        return eventHandler.getRichBody();
     }
     if (role == ComponentTypeRole) {
         return component.type;
@@ -284,53 +238,56 @@ QVariant MessageContentModel::data(const QModelIndex &index, int role) const
         return component.attributes;
     }
     if (role == EventIdRole) {
-        return EventHandler::id(event);
+        return eventHandler.getId();
     }
     if (role == TimeRole) {
-        const auto pendingIt = std::find_if(m_room->pendingEvents().cbegin(), m_room->pendingEvents().cend(), [event](const PendingEventItem &pendingEvent) {
-            return event->transactionId() == pendingEvent->transactionId();
+        const auto pendingIt = std::find_if(m_room->pendingEvents().cbegin(), m_room->pendingEvents().cend(), [this](const PendingEventItem &pendingEvent) {
+            return m_event->transactionId() == pendingEvent->transactionId();
         });
 
         auto lastUpdated = pendingIt == m_room->pendingEvents().cend() ? QDateTime() : pendingIt->lastUpdated();
-        return EventHandler::time(event, m_isPending, lastUpdated);
+        return eventHandler.getTime(m_isPending, lastUpdated);
     }
     if (role == TimeStringRole) {
-        const auto pendingIt = std::find_if(m_room->pendingEvents().cbegin(), m_room->pendingEvents().cend(), [event](const PendingEventItem &pendingEvent) {
-            return event->transactionId() == pendingEvent->transactionId();
+        const auto pendingIt = std::find_if(m_room->pendingEvents().cbegin(), m_room->pendingEvents().cend(), [this](const PendingEventItem &pendingEvent) {
+            return m_event->transactionId() == pendingEvent->transactionId();
         });
 
         auto lastUpdated = pendingIt == m_room->pendingEvents().cend() ? QDateTime() : pendingIt->lastUpdated();
-        return EventHandler::timeString(event, QStringLiteral("hh:mm"), m_isPending, lastUpdated);
+        return eventHandler.getTimeString(QStringLiteral("hh:mm"), m_isPending, lastUpdated);
     }
     if (role == AuthorRole) {
         return QVariant::fromValue<NeochatRoomMember *>(m_eventSenderObject.get());
     }
     if (role == MediaInfoRole) {
-        return EventHandler::mediaInfo(m_room, event);
+        return eventHandler.getMediaInfo();
     }
     if (role == FileTransferInfoRole) {
-        return QVariant::fromValue(m_room->cachedFileTransferInfo(event));
+        return QVariant::fromValue(m_room->cachedFileTransferInfo(m_event.get()));
     }
     if (role == ItineraryModelRole) {
         return QVariant::fromValue<ItineraryModel *>(m_itineraryModel);
     }
     if (role == LatitudeRole) {
-        return EventHandler::latitude(event);
+        return eventHandler.getLatitude();
     }
     if (role == LongitudeRole) {
-        return EventHandler::longitude(event);
+        return eventHandler.getLongitude();
     }
     if (role == AssetRole) {
-        return EventHandler::locationAssetType(event);
+        return eventHandler.getLocationAssetType();
     }
     if (role == PollHandlerRole) {
         return QVariant::fromValue<PollHandler *>(m_room->poll(m_eventId));
     }
+    if (role == IsReplyRole) {
+        return eventHandler.hasReply();
+    }
     if (role == ReplyEventIdRole) {
-        return EventHandler::replyId(event);
+        return eventHandler.getReplyId();
     }
     if (role == ReplyAuthorRole) {
-        return QVariant::fromValue(EventHandler::replyAuthor(m_room, event));
+        return QVariant::fromValue(eventHandler.getReplyAuthor());
     }
     if (role == ReplyContentModelRole) {
         return QVariant::fromValue<MessageContentModel *>(m_replyModel);
@@ -343,12 +300,6 @@ QVariant MessageContentModel::data(const QModelIndex &index, int role) const
             return QVariant::fromValue<LinkPreviewer *>(emptyLinkPreview);
         }
     }
-    if (role == ChatBarCacheRole) {
-        if (m_room->threadCache()->threadId() == m_eventId) {
-            return QVariant::fromValue<ChatBarCache *>(m_room->threadCache());
-        }
-        return QVariant::fromValue<ChatBarCache *>(m_room->editCache());
-    }
 
     return {};
 }
@@ -376,28 +327,20 @@ QHash<int, QByteArray> MessageContentModel::roleNames() const
     roles[LongitudeRole] = "longitude";
     roles[AssetRole] = "asset";
     roles[PollHandlerRole] = "pollHandler";
+    roles[IsReplyRole] = "isReply";
     roles[ReplyEventIdRole] = "replyEventId";
     roles[ReplyAuthorRole] = "replyAuthor";
     roles[ReplyContentModelRole] = "replyContentModel";
     roles[LinkPreviewerRole] = "linkPreviewer";
-    roles[ChatBarCacheRole] = "chatBarCache";
     return roles;
 }
 
 void MessageContentModel::resetModel()
 {
-    const auto event = m_room->getEvent(m_eventId);
-
     beginResetModel();
     m_components.clear();
 
-    if (m_room->connection()->isIgnored(m_eventSenderId) || m_notFound) {
-        m_components += MessageComponent{MessageComponentType::Text, QString(), {}};
-        endResetModel();
-        return;
-    }
-
-    if (event == nullptr) {
+    if (m_event == nullptr) {
         m_components += MessageComponent{MessageComponentType::Loading, QString(), {}};
         endResetModel();
         return;
@@ -411,14 +354,16 @@ void MessageContentModel::resetModel()
     endResetModel();
 }
 
-void MessageContentModel::resetContent(bool isEditing, bool isThreading)
+void MessageContentModel::resetContent(bool isEditing)
 {
+    Q_ASSERT(m_event != nullptr);
+
     const auto startRow = m_components[0].type == MessageComponentType::Author ? 1 : 0;
     beginRemoveRows({}, startRow, rowCount() - 1);
     m_components.remove(startRow, rowCount() - startRow);
     endRemoveRows();
 
-    const auto newComponents = messageContentComponents(isEditing, isThreading);
+    const auto newComponents = messageContentComponents(isEditing);
     if (newComponents.size() == 0) {
         return;
     }
@@ -427,22 +372,17 @@ void MessageContentModel::resetContent(bool isEditing, bool isThreading)
     endInsertRows();
 }
 
-QList<MessageComponent> MessageContentModel::messageContentComponents(bool isEditing, bool isThreading)
+QList<MessageComponent> MessageContentModel::messageContentComponents(bool isEditing)
 {
-    const auto event = m_room->getEvent(m_eventId);
-    if (event == nullptr) {
-        return {};
-    }
-
     QList<MessageComponent> newComponents;
 
-    if (eventCast<const Quotient::RoomMessageEvent>(event)
-        && eventCast<const Quotient::RoomMessageEvent>(event)->rawMsgtype() == QStringLiteral("m.key.verification.request")) {
+    if (eventCast<const Quotient::RoomMessageEvent>(m_event)
+        && eventCast<const Quotient::RoomMessageEvent>(m_event)->rawMsgtype() == QStringLiteral("m.key.verification.request")) {
         newComponents += MessageComponent{MessageComponentType::Verification, QString(), {}};
         return newComponents;
     }
 
-    if (event->isRedacted()) {
+    if (m_event->isRedacted()) {
         newComponents += MessageComponent{MessageComponentType::Text, QString(), {}};
         return newComponents;
     }
@@ -452,43 +392,37 @@ QList<MessageComponent> MessageContentModel::messageContentComponents(bool isEdi
     }
 
     if (isEditing) {
-        newComponents += MessageComponent{MessageComponentType::ChatBar, QString(), {}};
+        newComponents += MessageComponent{MessageComponentType::Edit, QString(), {}};
     } else {
-        newComponents.append(componentsForType(MessageComponentType::typeForEvent(*event)));
+        EventHandler eventHandler(m_room, m_event.get());
+        newComponents.append(componentsForType(eventHandler.messageComponentType()));
     }
 
     if (m_room->urlPreviewEnabled()) {
         newComponents = addLinkPreviews(newComponents);
     }
 
-    // If the event is already threaded the ThreadModel will handle displaying a chat bar.
-    if (isThreading && !EventHandler::isThreaded(event)) {
-        newComponents += MessageComponent{MessageComponentType::ChatBar, QString(), {}};
-    }
-
     return newComponents;
 }
 
 void MessageContentModel::updateReplyModel()
 {
-    const auto event = m_room->getEvent(m_eventId);
-    if (event == nullptr || m_isReply) {
+    if (m_event == nullptr || m_replyModel != nullptr || m_isReply) {
         return;
     }
 
-    if (!EventHandler::hasReply(event) || (EventHandler::isThreaded(event) && NeoChatConfig::self()->threads())) {
-        if (m_replyModel) {
-            delete m_replyModel;
-        }
+    EventHandler eventHandler(m_room, m_event.get());
+    if (!eventHandler.hasReply()) {
         return;
     }
 
-    if (m_replyModel != nullptr) {
-        return;
+    const auto replyEvent = m_room->findInTimeline(eventHandler.getReplyId());
+    if (replyEvent == m_room->historyEdge()) {
+        m_replyModel = new MessageContentModel(m_room, eventHandler.getReplyId(), true);
+    } else {
+        m_replyModel = new MessageContentModel(m_room, replyEvent->get(), true);
     }
 
-    m_replyModel = new MessageContentModel(m_room, EventHandler::replyId(event), true, false, this);
-
     connect(m_replyModel, &MessageContentModel::eventUpdated, this, [this]() {
         Q_EMIT dataChanged(index(0), index(0), {ReplyAuthorRole});
     });
@@ -496,45 +430,37 @@ void MessageContentModel::updateReplyModel()
 
 QList<MessageComponent> MessageContentModel::componentsForType(MessageComponentType::Type type)
 {
-    const auto event = m_room->getEvent(m_eventId);
-    if (event == nullptr) {
-        return {};
-    }
-
     switch (type) {
     case MessageComponentType::Text: {
-        const auto roomMessageEvent = eventCast<const Quotient::RoomMessageEvent>(event);
-        auto body = EventHandler::rawMessageBody(*roomMessageEvent);
-        return TextHandler().textComponents(body,
-                                            EventHandler::messageBodyInputFormat(*roomMessageEvent),
-                                            m_room,
-                                            roomMessageEvent,
-                                            roomMessageEvent->isReplaced());
+        const auto event = eventCast<const Quotient::RoomMessageEvent>(m_event);
+        auto body = EventHandler::rawMessageBody(*event);
+        return TextHandler().textComponents(body, EventHandler::messageBodyInputFormat(*event), m_room, event, event->isReplaced());
     }
     case MessageComponentType::File: {
         QList<MessageComponent> components;
         components += MessageComponent{MessageComponentType::File, QString(), {}};
-        const auto roomMessageEvent = eventCast<const Quotient::RoomMessageEvent>(event);
+        const auto event = eventCast<const Quotient::RoomMessageEvent>(m_event);
 
         if (m_emptyItinerary) {
             if (!m_isReply) {
-                auto fileTransferInfo = m_room->cachedFileTransferInfo(event);
+                auto fileTransferInfo = m_room->cachedFileTransferInfo(m_event.get());
 
 #ifndef Q_OS_ANDROID
-                Q_ASSERT(roomMessageEvent->content() != nullptr && roomMessageEvent->hasFileContent());
 #if Quotient_VERSION_MINOR > 8
-                const QMimeType mimeType = roomMessageEvent->fileContent()->mimeType;
+                Q_ASSERT(event->content() != nullptr && event->has<EventContent::FileContent>());
+                const QMimeType mimeType = event->get<EventContent::FileContent>()->mimeType;
 #else
-                const QMimeType mimeType = roomMessageEvent->content()->fileInfo()->mimeType;
+                Q_ASSERT(event->content() != nullptr && event->hasFileContent());
+                const QMimeType mimeType = event->content()->fileInfo()->mimeType;
 #endif
                 if (mimeType.name() == QStringLiteral("text/plain") || mimeType.parentMimeTypes().contains(QStringLiteral("text/plain"))) {
 #if Quotient_VERSION_MINOR > 8
-                    QString originalName = roomMessageEvent->fileContent()->originalName;
+                    QString originalName = event->get<EventContent::FileContent>()->originalName;
 #else
-                    QString originalName = roomMessageEvent->content()->fileInfo()->originalName;
+                    QString originalName = event->content()->fileInfo()->originalName;
 #endif
                     if (originalName.isEmpty()) {
-                        originalName = roomMessageEvent->plainBody();
+                        originalName = event->plainBody();
                     }
                     KSyntaxHighlighting::Repository repository;
                     KSyntaxHighlighting::Definition definitionForFile = repository.definitionForFileName(originalName);
@@ -563,27 +489,19 @@ QList<MessageComponent> MessageContentModel::componentsForType(MessageComponentT
         } else {
             updateItineraryModel();
         }
-        auto body = EventHandler::rawMessageBody(*roomMessageEvent);
-        components += TextHandler().textComponents(body,
-                                                   EventHandler::messageBodyInputFormat(*roomMessageEvent),
-                                                   m_room,
-                                                   roomMessageEvent,
-                                                   roomMessageEvent->isReplaced());
+        auto body = EventHandler::rawMessageBody(*event);
+        components += TextHandler().textComponents(body, EventHandler::messageBodyInputFormat(*event), m_room, event, event->isReplaced());
         return components;
     }
     case MessageComponentType::Image:
     case MessageComponentType::Audio:
     case MessageComponentType::Video: {
-        if (!event->is<StickerEvent>()) {
-            const auto roomMessageEvent = eventCast<const Quotient::RoomMessageEvent>(event);
+        if (!m_event->is<StickerEvent>()) {
+            const auto event = eventCast<const Quotient::RoomMessageEvent>(m_event);
             QList<MessageComponent> components;
             components += MessageComponent{type, QString(), {}};
-            auto body = EventHandler::rawMessageBody(*roomMessageEvent);
-            components += TextHandler().textComponents(body,
-                                                       EventHandler::messageBodyInputFormat(*roomMessageEvent),
-                                                       m_room,
-                                                       roomMessageEvent,
-                                                       roomMessageEvent->isReplaced());
+            auto body = EventHandler::rawMessageBody(*event);
+            components += TextHandler().textComponents(body, EventHandler::messageBodyInputFormat(*event), m_room, event, event->isReplaced());
             return components;
         }
     }
@@ -658,13 +576,16 @@ void MessageContentModel::closeLinkPreview(int row)
 
 void MessageContentModel::updateItineraryModel()
 {
-    const auto event = m_room->getEvent(m_eventId);
-    if (m_room == nullptr || event == nullptr) {
+    if (m_room == nullptr || m_event == nullptr) {
         return;
     }
 
-    if (auto roomMessageEvent = eventCast<const Quotient::RoomMessageEvent>(event)) {
-        if (roomMessageEvent->hasFileContent()) {
+    if (auto event = eventCast<const Quotient::RoomMessageEvent>(m_event)) {
+#if Quotient_VERSION_MINOR > 8
+        if (event->has<EventContent::FileContent>()) {
+#else
+        if (event->hasFileContent()) {
+#endif
             auto filePath = m_room->cachedFileTransferInfo(event).localPath;
             if (filePath.isEmpty() && m_itineraryModel != nullptr) {
                 delete m_itineraryModel;

src/models/messagecontentmodel.h

@@ -10,10 +10,26 @@
 #include <Quotient/room.h>
 
 #include "enums/messagecomponenttype.h"
+#include "eventhandler.h"
 #include "itinerarymodel.h"
-#include "messagecomponent.h"
 #include "neochatroommember.h"
 
+struct MessageComponent {
+    MessageComponentType::Type type = MessageComponentType::Other;
+    QString content;
+    QVariantMap attributes;
+
+    int operator==(const MessageComponent &right) const
+    {
+        return type == right.type && content == right.content && attributes == right.attributes;
+    }
+
+    bool isEmpty() const
+    {
+        return type == MessageComponentType::Other;
+    }
+};
+
 /**
  * @class MessageContentModel
  *
@@ -50,20 +66,17 @@ public:
         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. */
         ReplyEventIdRole, /**< The matrix ID of the message that was replied to. */
         ReplyAuthorRole, /**< The author of the event that was replied to. */
         ReplyContentModelRole, /**< The MessageContentModel for the reply event. */
 
         LinkPreviewerRole, /**< The link preview details. */
-        ChatBarCacheRole, /**< The ChatBarCache to use. */
     };
     Q_ENUM(Roles)
 
-    explicit MessageContentModel(NeoChatRoom *room,
-                                 const QString &eventId,
-                                 bool isReply = false,
-                                 bool isPending = false,
-                                 MessageContentModel *parent = nullptr);
+    explicit MessageContentModel(NeoChatRoom *room, const Quotient::RoomEvent *event, bool isReply = false, bool isPending = false);
+    MessageContentModel(NeoChatRoom *room, const QString &eventId, bool isReply = false, bool isPending = false);
 
     bool showAuthor() const;
     void setShowAuthor(bool showAuthor);
@@ -98,7 +111,6 @@ public:
 
 Q_SIGNALS:
     void showAuthorChanged();
-    void eventUnavailable();
     void eventUpdated();
 
 private:
@@ -106,20 +118,20 @@ private:
     QString m_eventId;
     QString m_eventSenderId;
     std::unique_ptr<NeochatRoomMember> m_eventSenderObject = nullptr;
+    Quotient::RoomEventPtr m_event;
 
     bool m_isPending;
     bool m_showAuthor = true;
     bool m_isReply;
-    bool m_notFound = false;
 
     void initializeModel();
-    void initializeEvent();
-    void getEvent();
+    void intiializeEvent(const QString &eventId);
+    void intiializeEvent(const Quotient::RoomEvent *event);
 
     QList<MessageComponent> m_components;
     void resetModel();
-    void resetContent(bool isEditing = false, bool isThreading = false);
-    QList<MessageComponent> messageContentComponents(bool isEditing = false, bool isThreading = false);
+    void resetContent(bool isEditing = false);
+    QList<MessageComponent> messageContentComponents(bool isEditing = false);
 
     QPointer<MessageContentModel> m_replyModel;
     void updateReplyModel();

src/models/messageeventmodel.cpp

@@ -8,6 +8,7 @@
 #include "neochatconfig.h"
 
 #include <Quotient/csapi/rooms.h>
+#include <Quotient/events/eventcontent.h>
 #include <Quotient/events/redactionevent.h>
 #include <Quotient/events/roommessageevent.h>
 #include <Quotient/events/stickerevent.h>
@@ -17,14 +18,18 @@
 #include <QGuiApplication>
 #include <QTimeZone>
 
-#include <KFormat>
 #include <KLocalizedString>
 
 #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 "neochatroom.h"
+#include "neochatroommember.h"
+#include "readmarkermodel.h"
 #include "texthandler.h"
 
 using namespace Quotient;
@@ -67,11 +72,6 @@ MessageEventModel::MessageEventModel(QObject *parent)
     connect(this, &MessageEventModel::modelReset, this, [this]() {
         resetting = false;
     });
-
-    connect(NeoChatConfig::self(), &NeoChatConfig::ThreadsChanged, this, [this]() {
-        beginResetModel();
-        endResetModel();
-    });
 }
 
 NeoChatRoom *MessageEventModel::room() const
@@ -89,6 +89,7 @@ void MessageEventModel::setRoom(NeoChatRoom *room)
         // HACK: Reset the model to a null room first to make sure QML dismantles
         // last room's objects before the room is actually changed
         beginResetModel();
+        m_readMarkerModels.clear();
         m_currentRoom->disconnect(this);
         m_currentRoom = nullptr;
         endResetModel();
@@ -96,9 +97,6 @@ void MessageEventModel::setRoom(NeoChatRoom *room)
         // Don't clear the member objects until the model has been fully reset and all
         // refs cleared.
         m_memberObjects.clear();
-        m_contentModels.clear();
-        m_reactionModels.clear();
-        m_readMarkerModels.clear();
     }
 
     beginResetModel();
@@ -412,7 +410,7 @@ QVariant MessageEventModel::data(const QModelIndex &idx, int role) const
             return DelegateType::ReadMarker;
         case TimeRole: {
             const QDateTime eventDate = data(index(m_lastReadEventIndex.row() + 1, 0), TimeRole).toDateTime().toLocalTime();
-            static const KFormat format;
+            const KFormat format;
             return format.formatRelativeDateTime(eventDate, QLocale::ShortFormat);
         }
         case SpecialMarksRole:
@@ -433,25 +431,26 @@ 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);
+
     if (role == Qt::DisplayRole) {
-        return EventHandler::richBody(m_currentRoom, &evt);
+        return eventHandler.getRichBody();
     }
 
     if (role == ContentModelRole) {
-        QString modelId;
-        if (!evt.id().isEmpty() && m_contentModels.contains(evt.id())) {
-            modelId = evt.id();
-        } else if (!evt.transactionId().isEmpty() && m_contentModels.contains(evt.transactionId())) {
-            modelId = evt.transactionId();
+        if (!evt.isStateEvent() && !evt.id().isEmpty()) {
+            return QVariant::fromValue<MessageContentModel *>(new MessageContentModel(m_currentRoom, &evt));
         }
-        if (!modelId.isEmpty()) {
-            return QVariant::fromValue<MessageContentModel *>(m_contentModels.at(modelId).get());
+        if (evt.isStateEvent()) {
+            if (evt.matrixType() == QStringLiteral("org.matrix.msc3672.beacon_info")) {
+                return QVariant::fromValue<MessageContentModel *>(new MessageContentModel(m_currentRoom, &evt));
+            }
         }
         return {};
     }
 
     if (role == GenericDisplayRole) {
-        return EventHandler::genericBody(m_currentRoom, &evt);
+        return eventHandler.getGenericBody();
     }
 
     if (role == DelegateTypeRole) {
@@ -474,7 +473,7 @@ QVariant MessageEventModel::data(const QModelIndex &idx, int role) const
     }
 
     if (role == HighlightRole) {
-        return EventHandler::isHighlighted(m_currentRoom, &evt);
+        return eventHandler.isHighlighted();
     }
 
     if (role == SpecialMarksRole) {
@@ -487,11 +486,7 @@ QVariant MessageEventModel::data(const QModelIndex &idx, int role) const
             return pendingIt->deliveryStatus();
         }
 
-        if (EventHandler::isHidden(m_currentRoom, &evt)) {
-            return EventStatus::Hidden;
-        }
-
-        if (EventHandler::isThreaded(&evt) && EventHandler::threadRoot(&evt) != EventHandler::id(&evt) && NeoChatConfig::threads()) {
+        if (eventHandler.isHidden()) {
             return EventStatus::Hidden;
         }
 
@@ -499,12 +494,16 @@ QVariant MessageEventModel::data(const QModelIndex &idx, int role) const
     }
 
     if (role == EventIdRole) {
-        return EventHandler::id(&evt);
+        return eventHandler.getId();
     }
 
     if (role == ProgressInfoRole) {
         if (auto e = eventCast<const RoomMessageEvent>(&evt)) {
+#if Quotient_VERSION_MINOR > 8
+            if (e->has<EventContent::FileContent>()) {
+#else
             if (e->hasFileContent()) {
+#endif
                 return QVariant::fromValue(m_currentRoom->cachedFileTransferInfo(&evt));
             }
         }
@@ -515,20 +514,20 @@ QVariant MessageEventModel::data(const QModelIndex &idx, int role) const
 
     if (role == TimeRole) {
         auto lastUpdated = isPending ? pendingIt->lastUpdated() : QDateTime();
-        return EventHandler::time(&evt, isPending, lastUpdated);
+        return eventHandler.getTime(isPending, lastUpdated);
     }
 
     if (role == SectionRole) {
         auto lastUpdated = isPending ? pendingIt->lastUpdated() : QDateTime();
-        return EventHandler::timeString(&evt, true, QLocale::ShortFormat, isPending, lastUpdated);
+        return eventHandler.getTimeString(true, QLocale::ShortFormat, isPending, lastUpdated);
     }
 
     if (role == IsThreadedRole) {
-        return EventHandler::isThreaded(&evt);
+        return eventHandler.isThreaded();
     }
 
     if (role == ThreadRootRole) {
-        return EventHandler::threadRoot(&evt);
+        return eventHandler.threadRoot();
     }
 
     if (role == ShowSectionRole) {
@@ -581,7 +580,7 @@ QVariant MessageEventModel::data(const QModelIndex &idx, int role) const
     }
 
     if (role == AuthorDisplayNameRole) {
-        return EventHandler::authorDisplayName(m_currentRoom, &evt, isPending);
+        return eventHandler.getAuthorDisplayName(isPending);
     }
 
     if (role == IsRedactedRole) {
@@ -593,11 +592,11 @@ QVariant MessageEventModel::data(const QModelIndex &idx, int role) const
     }
 
     if (role == MediaInfoRole) {
-        return EventHandler::mediaInfo(m_currentRoom, &evt);
+        return eventHandler.getMediaInfo();
     }
 
     if (role == IsEditableRole) {
-        return MessageComponentType::typeForEvent(evt) == MessageComponentType::Text && evt.senderId() == m_currentRoom->localMember().id();
+        return eventHandler.messageComponentType() == MessageComponentType::Text && evt.senderId() == m_currentRoom->localMember().id();
     }
 
     return {};
@@ -625,9 +624,6 @@ void MessageEventModel::createEventObjects(const Quotient::RoomEvent *event)
 
     auto eventId = event->id();
     auto senderId = event->senderId();
-    if (eventId.isEmpty()) {
-        eventId = event->transactionId();
-    }
     // A pending event might not have a sender ID set yet but in that case it must
     // be the local member.
     if (senderId.isEmpty()) {
@@ -638,16 +634,6 @@ void MessageEventModel::createEventObjects(const Quotient::RoomEvent *event)
         m_memberObjects[senderId] = std::unique_ptr<NeochatRoomMember>(new NeochatRoomMember(m_currentRoom, senderId));
     }
 
-    if (!m_contentModels.contains(eventId) && !m_contentModels.contains(event->transactionId())) {
-        if (!event->isStateEvent() || event->matrixType() == QStringLiteral("org.matrix.msc3672.beacon_info")) {
-            m_contentModels[eventId] = std::unique_ptr<MessageContentModel>(new MessageContentModel(m_currentRoom, eventId));
-        }
-    }
-
-    if (EventHandler::isThreaded(event) && !m_threadModels.contains(EventHandler::threadRoot(event))) {
-        m_threadModels[EventHandler::threadRoot(event)] = QSharedPointer<ThreadModel>(new ThreadModel(EventHandler::threadRoot(event), m_currentRoom));
-    }
-
     // ReadMarkerModel handles updates to add and remove markers, we only need to
     // handle adding and removing whole models here.
     if (m_readMarkerModels.contains(eventId)) {
@@ -707,9 +693,4 @@ bool MessageEventModel::event(QEvent *event)
     return QObject::event(event);
 }
 
-ThreadModel *MessageEventModel::threadModelForRootId(const QString &threadRootId) const
-{
-    return m_threadModels[threadRootId].data();
-}
-
 #include "moc_messageeventmodel.cpp"

src/models/messageeventmodel.h

@@ -3,16 +3,15 @@
 
 #pragma once
 
+#include <KFormat>
 #include <QAbstractListModel>
 #include <QQmlEngine>
 
 #include "linkpreviewer.h"
-#include "messagecontentmodel.h"
 #include "neochatroom.h"
 #include "neochatroommember.h"
 #include "pollhandler.h"
 #include "readmarkermodel.h"
-#include "threadmodel.h"
 
 class ReactionModel;
 
@@ -55,8 +54,8 @@ public:
 
         ContentModelRole, /**< The MessageContentModel for the event. */
 
-        IsThreadedRole, /**< Whether the message is in a thread. */
-        ThreadRootRole, /**< The Matrix ID of the thread root message, if any . */
+        IsThreadedRole,
+        ThreadRootRole,
 
         ShowSectionRole, /**< Whether the section header should be shown. */
 
@@ -105,8 +104,6 @@ public:
      */
     Q_INVOKABLE [[nodiscard]] int eventIdToRow(const QString &eventID) const;
 
-    Q_INVOKABLE ThreadModel *threadModelForRootId(const QString &threadRootId) const;
-
 protected:
     bool event(QEvent *event) override;
 
@@ -117,11 +114,10 @@ private:
     int rowBelowInserted = -1;
     bool resetting = false;
     bool movingEvent = false;
+    KFormat m_format;
 
     std::map<QString, std::unique_ptr<NeochatRoomMember>> m_memberObjects;
-    std::map<QString, std::unique_ptr<MessageContentModel>> m_contentModels;
     QMap<QString, QSharedPointer<ReadMarkerModel>> m_readMarkerModels;
-    QMap<QString, QSharedPointer<ThreadModel>> m_threadModels;
     QMap<QString, QSharedPointer<ReactionModel>> m_reactionModels;
 
     [[nodiscard]] int timelineBaseIndex() const;

src/models/messagefiltermodel.cpp

@@ -8,8 +8,10 @@
 
 #include "enums/delegatetype.h"
 #include "messagecontentmodel.h"
+#include "messageeventmodel.h"
 #include "neochatconfig.h"
 #include "neochatroommember.h"
+#include "timelinemodel.h"
 
 using namespace Quotient;
 
@@ -133,11 +135,14 @@ bool MessageFilterModel::showAuthor(QModelIndex index) const
 
 QString MessageFilterModel::aggregateEventToString(int sourceRow) const
 {
-    QString aggregateString;
+    QStringList parts;
+    QVariantList uniqueAuthors;
     for (int i = sourceRow; i >= 0; i--) {
-        aggregateString += sourceModel()->data(sourceModel()->index(i, 0), MessageEventModel::GenericDisplayRole).toString();
-        aggregateString += ", "_ls;
+        parts += sourceModel()->data(sourceModel()->index(i, 0), MessageEventModel::GenericDisplayRole).toString();
         QVariant nextAuthor = sourceModel()->data(sourceModel()->index(i, 0), MessageEventModel::AuthorRole);
+        if (!uniqueAuthors.contains(nextAuthor)) {
+            uniqueAuthors.append(nextAuthor);
+        }
         if (i > 0
             && (sourceModel()->data(sourceModel()->index(i - 1, 0), MessageEventModel::DelegateTypeRole) != DelegateType::State // If it's not a state event
                 || sourceModel()->data(sourceModel()->index(i - 1, 0), MessageEventModel::ShowSectionRole).toBool() // or the section needs to be visible
@@ -145,12 +150,46 @@ QString MessageFilterModel::aggregateEventToString(int sourceRow) const
             break;
         }
     }
+    parts.sort(); // Sort them so that all identical events can be collected.
+    if (!parts.isEmpty()) {
+        QStringList chunks;
+        while (!parts.isEmpty()) {
+            chunks += QString();
+            int count = 1;
+            auto part = parts.takeFirst();
+            while (!parts.isEmpty() && parts.first() == part) {
+                parts.removeFirst();
+                count++;
+            }
+            chunks.last() += i18ncp("%1: What's being done; %2: How often it is done.", " %1", " %1 %2 times", part, count);
+        }
+        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> ")
+                                                            .arg(uniqueAuthors[0].toMap()[QStringLiteral("id")].toString(),
+                                                                 uniqueAuthors[0].toMap()[QStringLiteral("displayName")].toString().toHtmlEscaped());
 
-    aggregateString = aggregateString.trimmed();
-    if (aggregateString.endsWith(u',')) {
-        aggregateString.removeLast();
+        QString chunksText;
+        chunksText += chunks.takeFirst();
+        if (chunks.size() > 0) {
+            while (chunks.size() > 1) {
+                chunksText += i18nc("[action 1], [action 2 and/or action 3]", ", ");
+                chunksText += chunks.takeFirst();
+            }
+            chunksText +=
+                uniqueAuthors.length() > 1 ? i18nc("[action 1, action 2] or [action 3]", " or ") : i18nc("[action 1, action 2] and [action 3]", " and ");
+            chunksText += chunks.takeFirst();
+        }
+        return i18nc(
+            "userText (%1) is either a Matrix username if a single user sent all the states or n users if they were sent by multiple users."
+            "chunksText (%2) is a list of comma separated actions for each of the state events in the group.",
+            "<style>a {text-decoration: none;}</style>%1 %2",
+            userText,
+            chunksText);
+    } else {
+        return {};
     }
-    return aggregateString;
 }
 
 QVariantList MessageFilterModel::stateEventsList(int sourceRow) const

src/models/notificationsmodel.cpp

@@ -121,11 +121,12 @@ 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);
                 beginInsertRows({}, m_notifications.length(), m_notifications.length());
                 m_notifications += Notification{
                     .roomId = notification.roomId,
                     .text = room->member(authorId).htmlSafeDisplayName() + (roomEvent->is<StateEvent>() ? QStringLiteral(" ") : QStringLiteral(": "))
-                        + EventHandler::plainBody(dynamic_cast<NeoChatRoom *>(room), roomEvent, true),
+                        + eventHandler.getPlainBody(true),
                     .authorName = room->member(authorId).htmlSafeDisplayName(),
                     .authorAvatar = authorAvatar,
                     .eventId = roomEvent->id(),

src/models/permissionsmodel.cpp

@@ -2,40 +2,20 @@
 // SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
 
 #include "permissionsmodel.h"
+#include "powerlevel.h"
 
 #include <Quotient/events/roompowerlevelsevent.h>
 
 #include <KLazyLocalizedString>
 
-#include "powerlevel.h"
-
-using namespace Qt::Literals::StringLiterals;
-
-namespace
-{
-constexpr auto UsersDefaultKey = "users_default"_L1;
-constexpr auto StateDefaultKey = "state_default"_L1;
-constexpr auto EventsDefaultKey = "events_default"_L1;
-
-constexpr auto InviteKey = "invite"_L1;
-constexpr auto KickKey = "kick"_L1;
-constexpr auto BanKey = "ban"_L1;
-constexpr auto RedactKey = "redact"_L1;
-
 static const QStringList defaultPermissions = {
-    UsersDefaultKey,
-    StateDefaultKey,
-    EventsDefaultKey,
-};
-
-static const QStringList basicPermissions = {
-    InviteKey,
-    KickKey,
-    BanKey,
-    RedactKey,
-};
-
-static const QStringList knownPermissions = {
+    QStringLiteral("users_default"),
+    QStringLiteral("state_default"),
+    QStringLiteral("events_default"),
+    QStringLiteral("invite"),
+    QStringLiteral("kick"),
+    QStringLiteral("ban"),
+    QStringLiteral("redact"),
     QStringLiteral("m.reaction"),
     QStringLiteral("m.room.redaction"),
     QStringLiteral("m.room.power_levels"),
@@ -53,14 +33,14 @@ static const QStringList knownPermissions = {
 };
 
 // Alternate name text for default permissions.
-static const QHash<QString, KLazyLocalizedString> permissionNames = {
-    {UsersDefaultKey, kli18nc("Room permission type", "Default user power level")},
-    {StateDefaultKey, kli18nc("Room permission type", "Default power level to set the room state")},
-    {EventsDefaultKey, kli18nc("Room permission type", "Default power level to send messages")},
-    {InviteKey, kli18nc("Room permission type", "Invite users")},
-    {KickKey, kli18nc("Room permission type", "Kick users")},
-    {BanKey, kli18nc("Room permission type", "Ban users")},
-    {RedactKey, kli18nc("Room permission type", "Remove messages sent by other users")},
+static const QHash<QString, KLazyLocalizedString> defaultPermissionNames = {
+    {QStringLiteral("users_default"), kli18nc("Room permission type", "Default user power level")},
+    {QStringLiteral("state_default"), kli18nc("Room permission type", "Default power level to set the room state")},
+    {QStringLiteral("events_default"), kli18nc("Room permission type", "Default power level to send messages")},
+    {QStringLiteral("invite"), kli18nc("Room permission type", "Invite users")},
+    {QStringLiteral("kick"), kli18nc("Room permission type", "Kick users")},
+    {QStringLiteral("ban"), kli18nc("Room permission type", "Ban users")},
+    {QStringLiteral("redact"), kli18nc("Room permission type", "Remove messages sent by other users")},
     {QStringLiteral("m.reaction"), kli18nc("Room permission type", "Send reactions")},
     {QStringLiteral("m.room.redaction"), kli18nc("Room permission type", "Remove their own messages")},
     {QStringLiteral("m.room.power_levels"), kli18nc("Room permission type", "Change user permissions")},
@@ -78,10 +58,10 @@ static const QHash<QString, KLazyLocalizedString> permissionNames = {
 };
 
 // Subtitles for the default values.
-static const QHash<QString, KLazyLocalizedString> permissionSubtitles = {
-    {UsersDefaultKey, kli18nc("Room permission type", "This is the power level for all new users when joining the room")},
-    {StateDefaultKey, kli18nc("Room permission type", "This is used for all state events that do not have their own entry here")},
-    {EventsDefaultKey, kli18nc("Room permission type", "This is used for all message events that do not have their own entry here")},
+static const QHash<QString, KLazyLocalizedString> defaultSubtitles = {
+    {QStringLiteral("users_default"), kli18nc("Room permission type", "This is the power level for all new users when joining the room")},
+    {QStringLiteral("state_default"), kli18nc("Room permission type", "This is used for all state events that do not have their own entry here")},
+    {QStringLiteral("events_default"), kli18nc("Room permission type", "This is used for all message events that do not have their own entry here")},
 };
 
 // Permissions that should use the event default.
@@ -90,7 +70,6 @@ static const QStringList eventPermissions = {
     QStringLiteral("m.reaction"),
     QStringLiteral("m.room.redaction"),
 };
-};
 
 PermissionsModel::PermissionsModel(QObject *parent)
     : QAbstractListModel(parent)
@@ -130,8 +109,6 @@ void PermissionsModel::initializeModel()
     }
 
     m_permissions.append(defaultPermissions);
-    m_permissions.append(basicPermissions);
-    m_permissions.append(knownPermissions);
 
     for (const auto &event : currentPowerLevelEvent->events().keys()) {
         if (!m_permissions.contains(event)) {
@@ -154,17 +131,17 @@ QVariant PermissionsModel::data(const QModelIndex &index, int role) const
 
     const auto permission = m_permissions.value(index.row());
     if (role == NameRole) {
-        if (permissionNames.keys().contains(permission)) {
-            return permissionNames.value(permission).toString();
+        if (defaultPermissionNames.keys().contains(permission)) {
+            return defaultPermissionNames.value(permission).toString();
         }
         return permission;
     }
     if (role == SubtitleRole) {
-        if (knownPermissions.contains(permission) && permissionNames.keys().contains(permission)) {
+        if (permission.startsWith(QLatin1String("m.")) && defaultPermissionNames.keys().contains(permission)) {
             return permission;
         }
-        if (permissionSubtitles.contains(permission)) {
-            return permissionSubtitles.value(permission).toString();
+        if (defaultSubtitles.contains(permission)) {
+            return defaultSubtitles.value(permission).toString();
         }
         return QString();
     }
@@ -189,10 +166,11 @@ QVariant PermissionsModel::data(const QModelIndex &index, int role) const
         return QString();
     }
     if (role == IsDefaultValueRole) {
-        return defaultPermissions.contains(permission);
+        return permission.contains(QLatin1String("default"));
     }
     if (role == IsBasicPermissionRole) {
-        return basicPermissions.contains(permission);
+        return permission == QStringLiteral("invite") || permission == QStringLiteral("kick") || permission == QStringLiteral("ban")
+            || permission == QStringLiteral("redact");
     }
     return {};
 }
@@ -223,19 +201,19 @@ std::optional<int> PermissionsModel::powerLevel(const QString &permission) const
     }
 
     if (const auto currentPowerLevelEvent = m_room->currentState().get<Quotient::RoomPowerLevelsEvent>()) {
-        if (permission == BanKey) {
+        if (permission == QStringLiteral("ban")) {
             return currentPowerLevelEvent->ban();
-        } else if (permission == KickKey) {
+        } else if (permission == QStringLiteral("kick")) {
             return currentPowerLevelEvent->kick();
-        } else if (permission == InviteKey) {
+        } else if (permission == QStringLiteral("invite")) {
             return currentPowerLevelEvent->invite();
-        } else if (permission == RedactKey) {
+        } else if (permission == QStringLiteral("redact")) {
             return currentPowerLevelEvent->redact();
-        } else if (permission == UsersDefaultKey) {
+        } else if (permission == QStringLiteral("users_default")) {
             return currentPowerLevelEvent->usersDefault();
-        } else if (permission == StateDefaultKey) {
+        } else if (permission == QStringLiteral("state_default")) {
             return currentPowerLevelEvent->stateDefault();
-        } else if (permission == EventsDefaultKey) {
+        } else if (permission == QStringLiteral("events_default")) {
             return currentPowerLevelEvent->eventsDefault();
         } else if (eventPermissions.contains(permission)) {
             return currentPowerLevelEvent->powerLevelForEvent(permission);
@@ -263,9 +241,6 @@ void PermissionsModel::setPowerLevel(const QString &permission, const int &newPo
         auto powerLevelContent = currentPowerLevelEvent->contentJson();
         if (powerLevelContent.contains(permission)) {
             powerLevelContent[permission] = clampPowerLevel;
-            // Deal with the case where a default or basic permission is missing from the event content erroneously.
-        } else if (defaultPermissions.contains(permission) || basicPermissions.contains(permission)) {
-            powerLevelContent[permission] = clampPowerLevel;
         } else {
             auto eventPowerLevels = powerLevelContent[QLatin1String("events")].toObject();
             eventPowerLevels[permission] = clampPowerLevel;

src/models/pushrulemodel.cpp

@@ -11,6 +11,7 @@
 #include <Quotient/jobs/basejob.h>
 
 #include "neochatconfig.h"
+#include "neochatconnection.h"
 
 #include <KLazyLocalizedString>
 

src/models/reactionmodel.cpp

@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
 
 #include "reactionmodel.h"
+#include "neochatroom.h"
 #include "utils.h"
 
 #include <QDebug>
@@ -9,6 +10,8 @@
 
 #include <KLocalizedString>
 
+#include <Quotient/roommember.h>
+
 ReactionModel::ReactionModel(const Quotient::RoomMessageEvent *event, NeoChatRoom *room)
     : QAbstractListModel(nullptr)
     , m_room(room)

src/models/roomlistmodel.cpp

@@ -245,7 +245,8 @@ QVariant RoomListModel::data(const QModelIndex &index, int role) const
         if (room->lastEvent() == nullptr || room->lastEventIsSpoiler()) {
             return QString();
         }
-        return EventHandler::subtitleText(room, room->lastEvent());
+        EventHandler eventHandler(room, room->lastEvent());
+        return eventHandler.subtitleText();
     }
     if (role == AvatarImageRole) {
         return room->avatar(128);

src/models/roomlistmodel.h

@@ -6,6 +6,8 @@
 #include <QAbstractListModel>
 #include <QQmlEngine>
 
+#include "enums/neochatroomtype.h"
+
 class NeoChatRoom;
 
 namespace Quotient