Work

Don't store RoomMember objects in the reaction model just grab them everytime incase the state event is replaced.

.craft.ini

@@ -2,6 +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

.flatpak-manifest.json

@@ -2,7 +2,7 @@
     "id": "org.kde.neochat",
     "branch": "master",
     "runtime": "org.kde.Platform",
-    "runtime-version": "6.7",
+    "runtime-version": "6.6",
     "sdk": "org.kde.Sdk",
     "command": "neochat",
     "tags": [

.gitlab-ci.yml

@@ -5,12 +5,11 @@ include:
   - project: sysadmin/ci-utilities
     file:
       - /gitlab-templates/reuse-lint.yml
-      - /gitlab-templates/android-qt6.yml
-      - /gitlab-templates/linux-qt6.yml
-      - /gitlab-templates/windows-qt6.yml
+#      - /gitlab-templates/android-qt6.yml
+#      - /gitlab-templates/linux-qt6.yml
+#      - /gitlab-templates/windows-qt6.yml
 #      - /gitlab-templates/freebsd-qt6.yml
       - /gitlab-templates/flatpak.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
+#      - /gitlab-templates/craft-android-qt6-apks.yml
+#      - /gitlab-templates/craft-appimage-qt6.yml
+#      - /gitlab-templates/craft-windows-x86-64-qt6.yml

.kde-ci.yml

@@ -40,4 +40,4 @@ Dependencies:
 
 Options:
   per-test-timeout: 90
-  require-passing-tests-on: [ 'Linux', 'Android', 'FreeBSD' ]
+  require-passing-tests-on: [ '@all' ]

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_MINOR "07")
 set(RELEASE_SERVICE_VERSION_MICRO "70")
 set(RELEASE_SERVICE_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE_VERSION_MINOR}.${RELEASE_SERVICE_VERSION_MICRO}")
 
 project(NeoChat VERSION ${RELEASE_SERVICE_VERSION})
 
-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)
@@ -38,7 +38,6 @@ include(KDEGitCommitHooks)
 include(ECMCheckOutboundLicense)
 include(ECMQtDeclareLoggingCategory)
 include(ECMAddAndroidApk)
-include(ECMQmlModule)
 if (NOT ANDROID)
     include(KDEClangFormat)
 endif()
@@ -60,9 +59,7 @@ set_package_properties(Qt6 PROPERTIES
     PURPOSE "Basic application components"
 )
 
-if (QT_KNOWN_POLICY_QTP0004)
-qt_policy(SET QTP0004 NEW)
-endif ()
+qt_policy(SET QTP0001 NEW)
 
 find_package(KF6 ${KF_MIN_VERSION} COMPONENTS Kirigami I18n Notifications Config CoreAddons Sonnet ItemModels ColorScheme)
 set_package_properties(KF6 PROPERTIES
@@ -105,7 +102,7 @@ if (NOT ANDROID AND NOT WIN32 AND NOT APPLE)
     find_package(KF6DBusAddons ${KF_MIN_VERSION} REQUIRED)
 endif()
 
-find_package(QuotientQt6 0.8.2)
+find_package(QuotientQt6 0.7)
 set_package_properties(QuotientQt6 PROPERTIES
     TYPE REQUIRED
     DESCRIPTION "Qt wrapper around Matrix API"

README.md

@@ -38,8 +38,8 @@ Due to the nature of the Matrix specification development NeoChat also supports
 
 Details where to find stable releases for NeoChat can be found on its [homepage](https://apps.kde.org/neochat).
 
-Nightly builds for Linux and Windows can be downloaded from [cdn.kde.org](https://cdn.kde.org/ci-builds/network/neochat/).
-Nightly builds for Android are available from [KDE's nightly F-Droid repository](https://community.kde.org/Android/F-Droid).
+Nightly builds for linux and windows can be downloaded from [cdn.kde.org](https://cdn.kde.org/ci-builds/network/neochat/).
+Nightly builds for android are available from [KDE's nightly F-Droid repository](https://community.kde.org/Android/F-Droid).
 Nightly Flatpaks are available from [KDE's nightly Flatpak repository](https://userbase.kde.org/Tutorials/Flatpak).
 
 ## Building NeoChat

autotests/chatbarcachetest.cpp

@@ -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"));

autotests/data/test-eventhandler-sync.json

@@ -25,7 +25,7 @@
         "content": {
           "user_ids": [
             "@alice:matrix.org",
-            "@bob:kde.org"
+            "@bob:example.com"
           ]
         },
         "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
@@ -47,7 +47,7 @@
         "content": {
           "$1532735824654:example.org": {
             "m.read": {
-              "@bob:kde.org": {
+              "@bob:example.com": {
                 "ts": 1436451550453
               }
             }
@@ -67,18 +67,6 @@
         },
         "type": "m.receipt"
       },
-      {
-        "content": {
-          "$1532735824654:example.org": {
-            "m.read": {
-              "@tim2:example.com": {
-                "ts": 1436451550454
-              }
-            }
-          }
-        },
-        "type": "m.receipt"
-      },
       {
         "content": {
           "$1532735824654:example.org": {
@@ -148,22 +136,6 @@
           "age": 1234
         }
       },
-      {
-        "content": {
-          "avatar_url": "mxc://example.org/SEsfnsuifSDFSSEF",
-          "displayname": "Bob",
-          "membership": "join"
-        },
-        "event_id": "$143273582443PhrSn:example.org",
-        "origin_server_ts": 1432735824653,
-        "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
-        "sender": "bob:kde.org",
-        "state_key": "@bob:kde.org",
-        "type": "m.room.member",
-        "unsigned": {
-          "age": 1234
-        }
-      },
       {
         "content": {
           "displayname": "Look\nat\nme\nI\nput\nnewlines\nin\nmy\ndisplay name",
@@ -184,7 +156,7 @@
   "summary": {
     "m.heroes": [
       "@alice:example.com",
-      "@bob:kde.org"
+      "@bob:example.com"
     ],
     "m.invited_member_count": 0,
     "m.joined_member_count": 2

autotests/data/test-reactionmodel-sync.json

@@ -130,23 +130,7 @@
         "origin_server_ts": 1432735824653,
         "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
         "sender": "@example:example.org",
-        "state_key": "@alice:matrix.org",
-        "type": "m.room.member",
-        "unsigned": {
-          "age": 1234
-        }
-      },
-      {
-        "content": {
-          "avatar_url": "mxc://example.org/SEsfnsuifSDFSSEF",
-          "displayname": "Bob",
-          "membership": "join"
-        },
-        "event_id": "$143273582443PhrSn:example.org",
-        "origin_server_ts": 1432735824653,
-        "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
-        "sender": "bob:example.org",
-        "state_key": "@bob:example.org",
+        "state_key": "@alice:example.org",
         "type": "m.room.member",
         "unsigned": {
           "age": 1234

autotests/eventhandlertest.cpp

@@ -29,11 +29,15 @@ private:
     Connection *connection = nullptr;
     TestUtils::TestRoom *room = nullptr;
 
+    EventHandler emptyHandler = EventHandler(nullptr, nullptr);
+
 private Q_SLOTS:
     void initTestCase();
 
     void eventId();
     void nullEventId();
+    void author();
+    void nullAuthor();
     void authorDisplayName();
     void nullAuthorDisplayName();
     void singleLineSidplayName();
@@ -41,6 +45,7 @@ private Q_SLOTS:
     void time();
     void nullTime();
     void timeString();
+    void nullTimeString();
     void highlighted();
     void nullHighlighted();
     void hidden();
@@ -62,10 +67,16 @@ private Q_SLOTS:
     void nullReplyId();
     void replyAuthor();
     void nullReplyAuthor();
+    void replyBody();
+    void nullReplyBody();
+    void replyMediaInfo();
+    void nullReplyMediaInfo();
     void thread();
     void nullThread();
     void location();
     void nullLocation();
+    void readMarkers();
+    void nullReadMarkers();
 };
 
 void EventHandlerTest::initTestCase()
@@ -76,136 +87,182 @@ 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::author()
+{
+    auto event = room->messageEvents().at(0).get();
+    auto author = room->member(event->senderId());
+    EventHandler eventHandler(room, event);
+
+    auto eventHandlerAuthor = eventHandler.getAuthor();
+
+    QCOMPARE(eventHandlerAuthor.isLocalMember(), author.id() == room->localMember().id());
+    QCOMPARE(eventHandlerAuthor.id(), author.id());
+    QCOMPARE(eventHandlerAuthor.displayName(), author.displayName());
+    QCOMPARE(eventHandlerAuthor.avatarUrl(), author.avatarUrl());
+    QCOMPARE(eventHandlerAuthor.avatarMediaId(), author.avatarMediaId());
+    QCOMPARE(eventHandlerAuthor.color(), author.color());
+}
+
+void EventHandlerTest::nullAuthor()
+{
+    QTest::ignoreMessage(QtWarningMsg, "getAuthor called with m_room set to nullptr.");
+    QCOMPARE(emptyHandler.getAuthor(), RoomMember());
+
+    EventHandler noEventHandler(room, nullptr);
+    QTest::ignoreMessage(QtWarningMsg, "getAuthor called with m_event set to nullptr. Returning empty user.");
+    QCOMPARE(noEventHandler.getAuthor(), RoomMember());
 }
 
 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")));
+}
+
+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()
@@ -225,45 +282,54 @@ void EventHandlerTest::genericBody()
     QFETCH(int, eventNum);
     QFETCH(QString, output);
 
-    QCOMPARE(EventHandler::genericBody(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 event set to nullptr.");
-    QCOMPARE(EventHandler::genericBody(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)));
@@ -283,42 +349,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());
@@ -327,58 +404,175 @@ 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());
+}
+
+void EventHandlerTest::readMarkers()
+{
+    EventHandler eventHandler(room, room->messageEvents().at(0).get());
+    QCOMPARE(eventHandler.hasReadMarkers(), true);
+
+    auto readMarkers = eventHandler.getReadMarkers();
+
+    QCOMPARE(readMarkers.size(), 1);
+    QCOMPARE(readMarkers[0].id(), QStringLiteral("@alice:example.org"));
+
+    QCOMPARE(eventHandler.getNumberExcessReadMarkers(), QString());
+    QCOMPARE(eventHandler.getReadMarkersString(), QStringLiteral("1 user: Alice Margatroid"));
+
+    EventHandler eventHandler2(room, room->messageEvents().at(2).get());
+    QCOMPARE(eventHandler2.hasReadMarkers(), true);
+
+    readMarkers = eventHandler2.getReadMarkers();
+
+    QCOMPARE(readMarkers.size(), 5);
+
+    QCOMPARE(eventHandler2.getNumberExcessReadMarkers(), QStringLiteral("+ 1"));
+    // There are no guarantees on the order of the users it will be different every time so don't match the whole string.
+    QCOMPARE(eventHandler2.getReadMarkersString().startsWith(QStringLiteral("6 users:")), true);
+}
+
+void EventHandlerTest::nullReadMarkers()
+{
+    QTest::ignoreMessage(QtWarningMsg, "hasReadMarkers called with m_room set to nullptr.");
+    QCOMPARE(emptyHandler.hasReadMarkers(), false);
+
+    QTest::ignoreMessage(QtWarningMsg, "getReadMarkers called with m_room set to nullptr.");
+    QCOMPARE(emptyHandler.getReadMarkers(), QList<Quotient::RoomMember>());
+
+    QTest::ignoreMessage(QtWarningMsg, "getNumberExcessReadMarkers called with m_room set to nullptr.");
+    QCOMPARE(emptyHandler.getNumberExcessReadMarkers(), QString());
+
+    QTest::ignoreMessage(QtWarningMsg, "getReadMarkersString called with m_room set to nullptr.");
+    QCOMPARE(emptyHandler.getReadMarkersString(), QString());
+
+    EventHandler noEventHandler(room, nullptr);
+
+    QTest::ignoreMessage(QtWarningMsg, "hasReadMarkers called with m_event set to nullptr.");
+    QCOMPARE(noEventHandler.hasReadMarkers(), false);
+
+    QTest::ignoreMessage(QtWarningMsg, "getReadMarkers called with m_event set to nullptr.");
+    QCOMPARE(noEventHandler.getReadMarkers(), QList<Quotient::RoomMember>());
+
+    QTest::ignoreMessage(QtWarningMsg, "getNumberExcessReadMarkers called with m_event set to nullptr.");
+    QCOMPARE(noEventHandler.getNumberExcessReadMarkers(), QString());
+
+    QTest::ignoreMessage(QtWarningMsg, "getReadMarkersString called with m_event set to nullptr.");
+    QCOMPARE(noEventHandler.getReadMarkersString(), QString());
 }
 
 QTEST_MAIN(EventHandlerTest)

autotests/reactionmodeltest.cpp

@@ -52,7 +52,7 @@ void ReactionModelTest::basicReaction()
     QCOMPARE(model.data(model.index(0), ReactionModel::TextContentRole), QStringLiteral("<span style=\"font-family: 'emoji';\">👍</span>"));
     QCOMPARE(model.data(model.index(0), ReactionModel::ReactionRole), QStringLiteral("👍"));
     QCOMPARE(model.data(model.index(0), ReactionModel::ToolTipRole),
-             QStringLiteral("Alice Margatroid reacted with <span style=\"font-family: 'emoji';\">👍</span>"));
+             QStringLiteral("@alice:matrix.org reacted with <span style=\"font-family: 'emoji';\">👍</span>"));
     QCOMPARE(model.data(model.index(0), ReactionModel::HasLocalMember), false);
 }
 
@@ -63,7 +63,7 @@ void ReactionModelTest::newReaction()
 
     QCOMPARE(model->rowCount(), 1);
     QCOMPARE(model->data(model->index(0), ReactionModel::ToolTipRole),
-             QStringLiteral("Alice Margatroid reacted with <span style=\"font-family: 'emoji';\">👍</span>"));
+             QStringLiteral("@alice:matrix.org reacted with <span style=\"font-family: 'emoji';\">👍</span>"));
 
     QSignalSpy spy(model, SIGNAL(modelReset()));
 
@@ -72,7 +72,7 @@ void ReactionModelTest::newReaction()
     QCOMPARE(spy.count(), 2); // Once for each of the 2 new reactions.
     QCOMPARE(model->data(model->index(1), ReactionModel::ReactionRole), QStringLiteral("😆"));
     QCOMPARE(model->data(model->index(0), ReactionModel::ToolTipRole),
-             QStringLiteral("Alice Margatroid and Bob reacted with <span style=\"font-family: 'emoji';\">👍</span>"));
+             QStringLiteral("@alice:matrix.org and @bob:example.org reacted with <span style=\"font-family: 'emoji';\">👍</span>"));
 
     delete model;
 }

autotests/texthandlertest.cpp

@@ -46,7 +46,6 @@ private Q_SLOTS:
     void sendCustomEmojiCode_data();
     void sendCustomEmojiCode();
 
-    void receiveSpacelessSelfClosingTag();
     void receiveStripReply();
     void receivePlainTextIn();
 
@@ -253,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(
@@ -288,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()
@@ -463,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);
 
@@ -479,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()
@@ -556,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

@@ -25,7 +25,6 @@
   <name xml:lang="fi">NeoChat</name>
   <name xml:lang="fr">NeoChat</name>
   <name xml:lang="gl">NeoChat</name>
-  <name xml:lang="he">NeoChat</name>
   <name xml:lang="hu">NeoChat</name>
   <name xml:lang="ia">Neochat</name>
   <name xml:lang="id">NeoChat</name>
@@ -62,7 +61,6 @@
   <summary xml:lang="fi">Keskustelu ystäviesi kanssa Matrixissa</summary>
   <summary xml:lang="fr">Discuter avec vos ami(e)s sur le réseau Matrix</summary>
   <summary xml:lang="gl">Charle coas súas amizades en Matrix.</summary>
-  <summary xml:lang="he">התכתבות עם החברים שלך ב־matrix</summary>
   <summary xml:lang="hu">Csevegjen barátaival a matrixon</summary>
   <summary xml:lang="ia">Starta Conversation con tu amicos sur matrix</summary>
   <summary xml:lang="it">Conversa con i tuoi contatti su matrix</summary>
@@ -82,27 +80,21 @@
   <summary xml:lang="zh-TW">在 Matrix 上與您的朋友聊天</summary>
   <description>
     <p>NeoChat is a chat app that lets you take full advantage of the Matrix network. It provides you with a secure way to send text messages, videos and audio files to your family, colleagues and friends.</p>
-    <p xml:lang="ar">نيوتشات هو تطبيق دردشة يتيح لك الاستفادة الكاملة من شبكة Matrix. فهو يوفر لك طريقة آمنة لإرسال الرسائل النصية ومقاطع الفيديو والملفات الصوتية إلى عائلتك وزملائك وأصدقائك.</p>
     <p xml:lang="ca">El NeoChat és una aplicació de xat que us permet aprofitar plenament la xarxa Matrix. Proporciona una manera segura d'enviar missatges de text, vídeos i arxius d'àudio a la vostra família, companys i amics.</p>
     <p xml:lang="ca-valencia">NeoChat és una aplicació de xat que us permet aprofitar plenament la xarxa Matrix. Proporciona una manera segura d'enviar missatges de text, vídeos i arxius d'àudio a la vostra família, companys i amics.</p>
     <p xml:lang="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>
     <p xml:lang="eu">NeoChat, Matrix sarearen abantaila guztiei probetsua ateratzeko aukera ematen dizun berriketa aplikaizo bat da. Zure familiari, kideei eta lagunei testu mezuak, bideoak eta audio fitxategiak era seguruan bidaltzeko aukera ematen dizu.</p>
-    <p xml:lang="fi">NeoChat on keskustelusovellus, jolla Matrix-verkosta saa täyden hyödyn. Se tarjoaa salatun kanavan lähettää perheelle, työkavereille ja ystäville tekstiviestejä sekä video- ja äänitiedostoja.</p>
     <p xml:lang="fr">NeoChat est une application de discussions vous permettant de profiter pleinement du réseau Matrix. Elle vous offre un moyen sécurisé d'envoyer des messages de texte, des vidéos et des fichiers audio à votre famille, vos collègues et vos ami(e)s.</p>
-    <p xml:lang="gl">NeoChat é unha aplicación de conversa que lle permite usar todas as funcionalidades da rede Matrix. Fornece unha forma segura de enviar mensaxes de texto e ficheiros de vídeo e son a familiares, amizades ou no traballo.</p>
-    <p xml:lang="he">NeoChat הוא יישום התכתבות שמאפשר לך לנצל את רשת Matrix במלואה. הוא מספק דרך מאובטחת לשליחת הודעות כתובות, סרטונים וקובצי שמע למשפחה, לעמיתים לעבודה ולחברים.</p>
     <p xml:lang="hu">A NeoChat egy olyan csevegőalkalmazás, amellyel teljes mértékben kihasználhatja a Matrix hálózatot. Biztonságos módot biztosít szöveges üzenetek, videók és hangfájlok küldéséhez családtagjainak, kollégáinak és barátainak.</p>
     <p xml:lang="ia">NeoChat es un app de conversation que te permitte prender avantage plen del rete Matrix. Il te forni un modo secur de inviar messages de texto, videos e files audio a tui familia, collegas e amicos.</p>
     <p xml:lang="it">NeoChat è un'applicazione di chat che ti consente di sfruttare appieno la rete Matrix. Ti fornisce un modo sicuro per inviare messaggi di testo, video e file audio a familiari, colleghi e amici.</p>
     <p xml:lang="ka">NeoChat ჩატის აპია, რომელიც საშუალება გაძლევთ, Matrix-ის ქსელის საშუალებები ბოლომდე გამოიყენოთ. ის გაძლევთ უსაფრთხო გზას, გააგზავნოთ ტექსტური შეტყობინებები, ვიდეოებ და აუდიოფაილები თქვენს ოჯახთან, კოლეგებთან და მეგობრებთან.</p>
     <p xml:lang="lv">„NeoChat“ ir tērzēšanas programma, kas ļauj pilnvērtīgi izmantot „Matrix“ tīklu. Tā sniedz drošu veidu teksta ziņu, video un audio sūtīšanai ģimenes locekļiem, kolēģiem un draugiem.</p>
     <p xml:lang="nl">NeoChat is een chat-toepassing die u het volledige voordeel van het Matrix-netwerk laat genieten. Het levert u op een veilige manier tekstberichten, video's en geluidsbestanden naar uw familie, collega's en vrienden te verzenden.</p>
-    <p xml:lang="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="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>
     <p xml:lang="uk">NeoChat є програмою для спілкування, за допомогою якої ви можете скористатися усіма перевагами мережі Matrix. За її допомогою ви можете безпечно надсилати текстові повідомлення, відео та звукові файли вашим родичам, колегам та друзям.</p>
     <p xml:lang="x-test">xxNeoChat is a chat app that lets you take full advantage of the Matrix network. It provides you with a secure way to send text messages, videos and audio files to your family, colleagues and friends.xx</p>
@@ -118,9 +110,8 @@
     <p xml:lang="fi">NeoChat pyrkii olemaan Matrix-määritelmän täysominaisuuksinen sovellus, joten se tukee kaikkea nykyisessä vakaassa määritelmässä muutamaa huomattavaa poikkeusta lukuun ottamatta (VoIP, säikeet ja jotkin piirteet päästä päähän -salauksessa). Joitakin pienempiäkin puutteita on Matrix-määritelmän jatkuvan kehityksen vuoksi, mutta lopputavoitteena on tarjota määritelmän täysi tuki.</p>
     <p xml:lang="fr">L'objectif de NeoChat est d'être une application complète pour le protocole Matrix. En tant que tel, tout dans la spécification stable actuelle avec les exceptions notables de VoIP, les processus et certains aspects du chiffrement de bout en bout sont pris en charge. Il y a quelques autres petites omissions en raison du fait que la spécification du protocole Matrix est en constante évolution. Cependant, l'objectif reste de fournir un soutien éventuel pour l'ensemble de la spécification.</p>
     <p xml:lang="gl">NeoChat pretende ser unha aplicación completa para a especificación de Matrix. Coas excepcións de VoIP, conversas fiadas e algúns aspectos da cifraxe de extremo a extremo, a versión estábel segue as especificacións. Existen algunhas outras pequenas omisións debido ao feito de que Matrix está en continua evolución pero a intención é implementar a especificación completa.</p>
-    <p xml:lang="he">NeoChat מתיימר להיות יישום עתיר יכולות לפי מפרט Matrix. כיוון שזה ייעודו, כל מה שבמפרט היציב עם חריגות משמעותיות כגון VoIP, שרשורים ועוד מגוון היבטים של הצפנה מקצה לקצה נתמכים גם הם. יש מספר השמטות קטן עקב העובדה שהמפרט של Matrix ממשיך להתפתח אך המטרה היא להמשיך לספק תמיכה בסופו של דבר לכל המפרט.</p>
     <p xml:lang="hu">A NeoChat célja, hogy a Matrix specifikációnak megfelelő teljes funkcionalitású alkalmazás legyen. Mint ilyen, a jelenlegi stabil specifikáció támogatott a VoIP, a szálak és a végpontok közötti titkosítás egyes elemeinek kivételével. Van még néhány kisebb hiányosság annak köszönhetően, hogy a Matrix specifikáció folyamatosan fejlődik, de végső cél a teljes specifikáció megvalósítása.</p>
-    <p xml:lang="ia">NeoChat aspira a esser un application plenmente eminente per le specification de Matrix. Tal como omne cosas in le specification currentemente stabile con le exceptiones notabile de VOIP, threads e alcun aspectos del cryptation End-to-End es supportate. Il ha ltere pauc omissiones, debite al facto que le specification de Matrix es in evolution constante ma le aspiration remane a fornir supporto eventual per le integre specification.</p>
+    <p xml:lang="ia">NeoChat aspira a esser un application plenemente eminente per le specification de Matrix. Tal como omne cosas in le specification currentemente stabile con le exceptiones notabile de VOIP, threads e alcun aspectos del cryptation End-to-End es supportate. Il ha ltere pauc omissiones, debite al facto que le specification de Matrix es in evolution constante ma le aspiration remane a fornir supporto eventual per le integre specification.</p>
     <p xml:lang="it">NeoChat mira ad essere un'applicazione completa per le specifiche Matrix. Pertanto, sono supportati tutti gli elementi dell'attuale specifica stabile con le notevoli eccezioni di VoIP, conversazioni e alcuni aspetti della cifratura end-to-end. Ci sono alcune altre piccole omissioni dovute al fatto che le specifiche Matrix sono in continua evoluzione, ma l'obiettivo rimane quello di fornire un eventuale supporto per l'intera specifica.</p>
     <p xml:lang="ka">NeoChat მიზნად ისახავს Matrix სპეციფიკაციის სრული განხორციელება ჰქონდეს. როგორც ასეთი, ყველაფერი მიმდინარე სპეციფიკაციიდან, VoIP-ის, ძაფებისა და გამჭოლი დაშიფვრის ზოგიერთი ასპექტის გარდა, მხარდაჭერილია. შეძლება ასევე იყოს მცირე ლაფსუსებიც იმის გამო, რომ Matrix-ის სპეციფიკაცია მუდმივად ვითარდება, მაგრამ ჩვენი მიზანი მისი სრული მხარდაჭერაა.</p>
     <p xml:lang="ko">NeoChat은 Matrix 표준을 따르는 프로그램을 목표로 합니다. 현재 안정 버전의 표준에서 제공하는 기능의 대부분을 지원하며, VoIP, 스레드, 일부 종단간 암호화와 같은 기능은 아직 지원하지 않습니다. Matrix 표준은 계속하여 진화 중이기 때문에 일부 기능이 빠져 있을 수도 있지만 장기적으로는 전체 표준을 지원하는 것이 목표입니다.</p>
@@ -147,7 +138,6 @@
     <p xml:lang="fi">Matrix-määritelmän kehittyessä NeoChat tukee myös monia epävakaita ominaisuuksia. Tällä hetkellä näitä ovat:</p>
     <p xml:lang="fr">En raison de la nature du développement des spécifications du protocole Matrix, NeoChat prend également en charge de nombreuses fonctionnalités instables. Actuellement, ce sont :</p>
     <p xml:lang="gl">Debido á natureza do desenvolvemento da especificación de Matrix, NeoChat tamén inclúe varias funcionalidades non estábeis:</p>
-    <p xml:lang="he">מטבע הדברים, הפיתוח של NeoChat תומך במגוון יכולות מפוקפקות כתלות בהתפתחות המפרט הטכני של Matrix. היכולות האלה הן:</p>
     <p xml:lang="hu">A Matrix specifikáció fejlesztésének jellegéből adódóan a NeoChat számos instabil funkciót is támogat. Jelenleg a következőket:</p>
     <p xml:lang="ia">Debite al natura del disveloppamento de specification de Matrix NeoChat tamben supporta numerose characteristicas instabile. Currentemente istes es:</p>
     <p xml:lang="it">A causa della natura dello sviluppo delle specifiche Matrix, NeoChat supporta anche numerose funzionalità instabili. Attualmente queste sono:</p>
@@ -178,7 +168,6 @@
       <li xml:lang="fi">Kyselyt – MSC3381</li>
       <li xml:lang="fr">Sondages - MSC3381</li>
       <li xml:lang="gl">Enquisas — MSC3381</li>
-      <li xml:lang="he">סקרים - MSC3381</li>
       <li xml:lang="hu">Szavazások - MSC3381</li>
       <li xml:lang="ia">Inquestas - MSC3381</li>
       <li xml:lang="it">Sondaggi - MSC3381</li>
@@ -207,7 +196,6 @@
       <li xml:lang="fi">Tarrapakkaukset – MSC2545</li>
       <li xml:lang="fr">Paquets d'auto-collants - MSC2545</li>
       <li xml:lang="gl">Paquetes de adhesivos — MSC2545</li>
-      <li xml:lang="he">חבילות מדבקות - MSC2545</li>
       <li xml:lang="hu">Matricacsomagok - MSC2545</li>
       <li xml:lang="ia">Etiquetta gummate (sticker) -MSC2545</li>
       <li xml:lang="it">Pacchetti di adesivi - MSC2545</li>
@@ -222,7 +210,7 @@
       <li xml:lang="sl">Sticker Packs - MSC2545</li>
       <li xml:lang="sv">Sticker Packs - MSC2545</li>
       <li xml:lang="ta">ஒட்டி தொகுப்புகள் - MSC2545</li>
-      <li xml:lang="tr">Çıkartma Paketleri — MSC2545</li>
+      <li xml:lang="tr">Yapışkan Paketleri — MSC2545</li>
       <li xml:lang="uk">Пакунки наліпок - MSC2545</li>
       <li xml:lang="x-test">xxSticker Packs - MSC2545xx</li>
       <li xml:lang="zh-TW">貼圖包 - MSC2545</li>
@@ -237,7 +225,6 @@
       <li xml:lang="fi">Sijaintitapahtumat – MSC3488</li>
       <li xml:lang="fr">Événements de lieu - MSC3488</li>
       <li xml:lang="gl">Localización de eventos — MSC3488</li>
-      <li xml:lang="he">אירועי מקום - MSC3488</li>
       <li xml:lang="hu">Események helyadatai - MSC3488</li>
       <li xml:lang="ia">Eventos de Location - MSC3488</li>
       <li xml:lang="it">Località eventi - MSC3488</li>
@@ -301,7 +288,6 @@
       <caption xml:lang="fi">Päänäkymä, jossa huoneluettelo, keskustelu ja huoneen tiedot</caption>
       <caption xml:lang="fr">Vue principale avec la liste des salons ainsi que des informations sur les salons et forums de discussions</caption>
       <caption xml:lang="gl">Vista principal coa lista de salas, a charla, e información da sala.</caption>
-      <caption xml:lang="he">תצוגה ראשית עם רשימת חדרים, צ׳אט ופרטי חדר</caption>
       <caption xml:lang="hu">A fő nézet a szobalistával, csevegéssel és szobainformációkkal</caption>
       <caption xml:lang="ia">Vista principal con lista de sala, chat e information de sala</caption>
       <caption xml:lang="it">Vista principale con elenco delle stanze, chat e informazioni sulla stanza</caption>
@@ -324,27 +310,21 @@
     <screenshot type="default">
       <image>https://cdn.kde.org/screenshots/neochat/spaces.png</image>
       <caption>Discover new communities with Matrix Spaces</caption>
-      <caption xml:lang="ar">اكتشف مجتمعات جديدة مع فضاءات ماتركس</caption>
       <caption xml:lang="ca">Descobriu comunitats noves amb els espais de Matrix</caption>
       <caption xml:lang="ca-valencia">Descobriu comunitats noves amb els espais de Matrix</caption>
       <caption xml:lang="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>
       <caption xml:lang="eu">Ezagutu komunitate berriak Matrixeko Tokiak erabiliz</caption>
-      <caption xml:lang="fi">Löydä uusia yhteisöjä Matrix Spacesillä</caption>
       <caption xml:lang="fr">Découvrez de nouvelles communautés avec les espaces sous Matrix</caption>
-      <caption xml:lang="gl">Descubra novas comunidades dos espazos de Matrix.</caption>
-      <caption xml:lang="he">אפשר להיחשף לקהילות חדשות דרך Matrix Spaces</caption>
       <caption xml:lang="hu">Fedezzen fel új közösségeket a Matrix Terek segítségével</caption>
       <caption xml:lang="ia">Discoperi nove communitate con Matrix Spaces (Spatios de Matrix)</caption>
       <caption xml:lang="it">Scopri nuove comunità con Matrix Spaces</caption>
       <caption xml:lang="ka">აღმოაჩინეთ ახალი საზოგადოებები Matrix Spaces-თან ერთად</caption>
       <caption xml:lang="lv">Atklājiet jaunas kopienas ar „Matrix“ telpām</caption>
       <caption xml:lang="nl">Ontdek nieuwe gemeenschappen met Matrix-ruimten</caption>
-      <caption xml:lang="nn">Oppdag nye fellesskap med Matrix Spaces</caption>
       <caption xml:lang="pl">Odkrywaj nowe społeczności w Przestrzeniach Matriksa</caption>
       <caption xml:lang="sl">Odkrijte nove skupnosti z Matrix Spaces</caption>
-      <caption xml:lang="sv">Upptäck nya gemenskaper med Matrix Spaces</caption>
       <caption xml:lang="tr">Matrix Alanlar ile yeni topluluklar keşfedin</caption>
       <caption xml:lang="uk">Пошук нових спільнот за допомогою Matrix Spaces</caption>
       <caption xml:lang="x-test">xxDiscover new communities with Matrix Spacesxx</caption>
@@ -370,7 +350,6 @@
       <caption xml:lang="fi">Päänäkymä, jossa huoneluettelo, keskustelu ja huoneen tiedot</caption>
       <caption xml:lang="fr">Vue principale avec la liste des salons ainsi que des informations sur les salons et forums de discussions</caption>
       <caption xml:lang="gl">Vista principal coa lista de salas, a charla, e información da sala.</caption>
-      <caption xml:lang="he">תצוגה ראשית עם רשימת חדרים, צ׳אט ופרטי חדר</caption>
       <caption xml:lang="hu">A fő nézet a szobalistával, csevegéssel és szobainformációkkal</caption>
       <caption xml:lang="ia">Vista principal con lista de sala, chat e information de sala</caption>
       <caption xml:lang="it">Vista principale con elenco delle stanze, chat e informazioni sulla stanza</caption>
@@ -404,7 +383,6 @@
       <caption xml:lang="fi">Kirjautumisnäkymä</caption>
       <caption xml:lang="fr">Écran de connexion</caption>
       <caption xml:lang="gl">Pantalla de identificación.</caption>
-      <caption xml:lang="he">מסך כניסה</caption>
       <caption xml:lang="hu">Bejelentkező képernyő</caption>
       <caption xml:lang="ia">Schermo de accesso</caption>
       <caption xml:lang="it">Schermata di accesso</caption>
@@ -429,10 +407,6 @@
     <content_attribute id="social-chat">intense</content_attribute>
   </content_rating>
   <releases>
-    <release version="24.08.1" date="2024-09-12"/>
-    <release version="24.08.0" date="2024-08-22"/>
-    <release version="24.05.2" date="2024-07-04"/>
-    <release version="24.05.1" date="2024-06-13"/>
     <release version="24.05.0" date="2024-05-23"/>
     <release version="24.02.2" date="2024-04-11"/>
     <release version="24.02.1" date="2024-03-21"/>

org.kde.neochat.desktop

@@ -18,7 +18,6 @@ Name[eu]=NeoChat
 Name[fi]=NeoChat
 Name[fr]=NeoChat
 Name[gl]=NeoChat
-Name[he]=NeoChat
 Name[hu]=NeoChat
 Name[ia]=Neochat
 Name[id]=NeoChat
@@ -60,7 +59,6 @@ GenericName[eu]=Matrix bezeroa
 GenericName[fi]=Matrix-asiakas
 GenericName[fr]=Client « Matrix »
 GenericName[gl]=Cliente de Matrix
-GenericName[he]=לקוח Matrix
 GenericName[hu]=Matrix kliens
 GenericName[ia]=Cliente de Matrice
 GenericName[id]=Klien Matrix
@@ -101,7 +99,6 @@ Comment[eu]=Matrix protokolorako bezeroa
 Comment[fi]=Asiakas Matrix-yhteyskäytännölle
 Comment[fr]=Client pour le protocole « Matrix »
 Comment[gl]=Cliente para o protocolo Matrix.
-Comment[he]=לקוח לפרוטוקול Matrix
 Comment[hu]=Kliens a Matrix protokollhoz
 Comment[ia]=Cliente per le protocollo de Matrix
 Comment[id]=Klien untuk protokol Matrix

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

@@ -77,7 +77,7 @@ SPDX-License-Identifier: CC-BY-SA-4.0
 ></term>
   <listitem>
     <para
->L'URI de Matrix per a un usuari o una sala. P. ex. matrix:u/usuari:example.org o matrix:r/root:example.org. Això farà que el NeoChat intenti obrir la sala o conversa indicada. </para>
+>L'URI de Matrix per a un usuari o una sala. P. ex. matrix:u/usuari:exemple.org o matrix:r/root:exemple.org. Això farà que el NeoChat intenti obrir la sala o conversa indicada. </para>
   </listitem>
   </varlistentry>
 </variablelist>

src/CMakeLists.txt

@@ -134,8 +134,6 @@ add_library(neochat STATIC
     jobs/neochatdeletedevicejob.h
     jobs/neochatchangepasswordjob.cpp
     jobs/neochatchangepasswordjob.h
-    jobs/neochatgetcommonroomsjob.cpp
-    jobs/neochatgetcommonroomsjob.h
     mediasizehelper.cpp
     mediasizehelper.h
     eventhandler.cpp
@@ -186,21 +184,13 @@ add_library(neochat STATIC
     enums/powerlevel.h
     models/permissionsmodel.cpp
     models/permissionsmodel.h
-    threepidbindhelper.cpp
-    threepidbindhelper.h
-    models/readmarkermodel.cpp
-    models/readmarkermodel.h
-    neochatroommember.cpp
-    neochatroommember.h
-    models/threadmodel.cpp
-    models/threadmodel.h
 )
 
 set_source_files_properties(qml/OsmLocationPlugin.qml PROPERTIES
     QT_QML_SINGLETON_TYPE TRUE
 )
 
-ecm_add_qml_module(neochat URI org.kde.neochat GENERATE_PLUGIN_SOURCE
+qt_add_qml_module(neochat URI org.kde.neochat NO_PLUGIN
     OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/src/org/kde/neochat
     QML_FILES
         qml/Main.qml
@@ -243,7 +233,10 @@ ecm_add_qml_module(neochat URI org.kde.neochat GENERATE_PLUGIN_SOURCE
         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,17 +280,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
-    IMPORTS
-        org.kde.neochat.timeline
-        org.kde.neochat.settings
-        org.kde.neochat.devtools
-        org.kde.neochat.login
-        org.kde.neochat.chatbar
 )
 
 add_subdirectory(settings)
@@ -426,7 +408,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)

src/actionshandler.cpp

@@ -56,7 +56,7 @@ void ActionsHandler::handleMessageEvent(ChatBarCache *chatBarCache)
 
     QString handledText = chatBarCache->text();
     handledText = handleMentions(handledText, chatBarCache->mentions());
-    handleMessage(chatBarCache->text(), handledText, chatBarCache);
+    handleMessage(m_room->mainCache()->text(), handledText, chatBarCache);
 }
 
 QString ActionsHandler::handleMentions(QString handledText, QList<Mention> *mentions)

src/chatbar/AttachDialog.qml

@@ -13,15 +13,13 @@ import org.kde.neochat
 QQC2.Popup {
     id: root
 
-    padding: Kirigami.Units.largeSpacing
+    padding: 16
 
     signal chosen(string path)
 
     contentItem: RowLayout {
-
-        spacing: Kirigami.Units.smallSpacing
-
         QQC2.ToolButton {
+            Layout.preferredWidth: 160
             Layout.fillHeight: true
 
             icon.name: 'mail-attachment'
@@ -30,7 +28,7 @@ QQC2.Popup {
 
             onClicked: {
                 root.close();
-                var fileDialog = openFileDialog.createObject(QQC2.Overlay.overlay);
+                var fileDialog = openFileDialog.createObject(QQC2.ApplicationWindow.overlay);
                 fileDialog.chosen.connect(path => root.chosen(path));
                 fileDialog.open();
             }
@@ -39,8 +37,11 @@ QQC2.Popup {
         Kirigami.Separator {}
 
         QQC2.ToolButton {
+            Layout.preferredWidth: 160
             Layout.fillHeight: true
 
+            padding: 16
+
             icon.name: 'insert-image'
             text: i18n("Clipboard image")
             onClicked: {

src/chatbar/CMakeLists.txt

@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: BSD-2-Clause
 
 qt_add_library(chatbar STATIC)
-ecm_add_qml_module(chatbar GENERATE_PLUGIN_SOURCE
+qt_add_qml_module(chatbar
     URI org.kde.neochat.chatbar
     OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/src/org/kde/neochat/chatbar
     QML_FILES

src/chatbar/ChatBar.qml

@@ -115,7 +115,7 @@ QQC2.Control {
             displayHint: QQC2.AbstractButton.IconOnly
 
             onTriggered: {
-                locationChooser.createObject(QQC2.Overlay.overlay, {
+                locationChooser.createObject(QQC2.ApplicationWindow.overlay, {
                     room: root.currentRoom
                 }).open();
             }
@@ -219,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();
@@ -353,8 +353,8 @@ 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
     }
@@ -364,7 +364,7 @@ QQC2.Control {
         ReplyPane {
             userName: _private.chatBarCache.relationUser.displayName
             userColor: _private.chatBarCache.relationUser.color
-            userAvatar: _private.chatBarCache.relationUser.avatarUrl
+            userAvatar: _private.chatBarCache.relationUser.avatarSource
             text: _private.chatBarCache.relationMessage
 
             onCancel: {
@@ -395,7 +395,7 @@ QQC2.Control {
             repeatTimer.stop();
             root.currentRoom.markAllMessagesAsRead();
             textField.clear();
-            _private.chatBarCache.clearRelations();
+            _private.chatBarCache.replyId = "";
             messageSent();
         }
 

src/chatbarcache.cpp

@@ -119,7 +119,8 @@ QString ChatBarCache::relationMessage() const
     }
 
     if (auto event = room->findInTimeline(m_relationId); event != room->historyEdge()) {
-        return EventHandler::markdownBody(&**event);
+        EventHandler eventhandler(room, &**event);
+        return eventhandler.getMarkdownBody();
     }
     return {};
 }
@@ -139,8 +140,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
@@ -160,16 +161,6 @@ void ChatBarCache::setAttachmentPath(const QString &attachmentPath)
     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();
-    Q_EMIT relationIdChanged(oldEventId, m_relationId);
-    Q_EMIT threadIdChanged(oldThreadId, m_threadId);
-    Q_EMIT attachmentPathChanged();
-}
-
 QList<Mention> *ChatBarCache::mentions()
 {
     return &m_mentions;

src/chatbarcache.h

@@ -33,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
@@ -43,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
 {
@@ -165,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.
      */
@@ -195,7 +188,7 @@ public:
 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:

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,11 +13,13 @@
 
 #include <signal.h>
 
+#include <Quotient/accountregistry.h>
 #include <Quotient/csapi/notifications.h>
 #include <Quotient/qt_connection_util.h>
 #include <Quotient/settings.h>
 
 #include "neochatconfig.h"
+#include "neochatconnection.h"
 #include "neochatroom.h"
 #include "notificationsmanager.h"
 #include "proxycontroller.h"
@@ -62,11 +64,7 @@ Controller::Controller(QObject *parent)
         });
     } else {
         auto c = new NeoChatConnection(this);
-#if Quotient_VERSION_MINOR > 8
-        c->assumeIdentity(QStringLiteral("@user:localhost:1234"), QStringLiteral("device_1234"), QStringLiteral("token_1234"));
-#else
         c->assumeIdentity(QStringLiteral("@user:localhost:1234"), QStringLiteral("token_1234"));
-#endif
         connect(c, &Connection::connected, this, [c, this]() {
             m_accountRegistry.add(c);
             c->syncLoop();
@@ -105,16 +103,14 @@ Controller::Controller(QObject *parent)
     connect(&m_accountRegistry, &AccountRegistry::accountCountChanged, this, [this]() {
         if (m_accountRegistry.size() > oldAccountCount) {
             auto connection = dynamic_cast<NeoChatConnection *>(m_accountRegistry.accounts()[m_accountRegistry.size() - 1]);
-            connect(
-                connection,
-                &NeoChatConnection::syncDone,
-                this,
-                [this, connection] {
-                    if (!m_endpoint.isEmpty()) {
-                        connection->setupPushNotifications(m_endpoint);
-                    }
-                },
-                Qt::SingleShotConnection);
+            connect(connection, &NeoChatConnection::syncDone, this, [connection]() {
+                NotificationsManager::instance().handleNotifications(connection);
+            });
+            connectSingleShot(connection, &NeoChatConnection::syncDone, this, [this, connection] {
+                if (!m_endpoint.isEmpty()) {
+                    connection->setupPushNotifications(m_endpoint);
+                }
+            });
         }
         oldAccountCount = m_accountRegistry.size();
     });
@@ -204,33 +200,15 @@ void Controller::invokeLogin()
                 m_connectionsLoading[accountId] = connection;
                 connect(connection, &NeoChatConnection::connected, this, [this, connection, accountId] {
                     connection->loadState();
-                    if (connection->allRooms().size() == 0 || connection->allRooms()[0]->currentState().get<RoomCreateEvent>()) {
-                        addConnection(connection);
-                        m_accountsLoading.removeAll(connection->userId());
-                        m_connectionsLoading.remove(accountId);
-                        Q_EMIT accountsLoadingChanged();
-                    } else {
-                        connect(
-                            connection->allRooms()[0],
-                            &Room::baseStateLoaded,
-                            this,
-                            [this, connection, accountId]() {
-                                addConnection(connection);
-                                m_accountsLoading.removeAll(connection->userId());
-                                m_connectionsLoading.remove(accountId);
-                                Q_EMIT accountsLoadingChanged();
-                            },
-                            Qt::SingleShotConnection);
-                    }
+                    addConnection(connection);
+                    m_accountsLoading.removeAll(connection->userId());
+                    m_connectionsLoading.remove(accountId);
+                    Q_EMIT accountsLoadingChanged();
                 });
                 connect(connection, &NeoChatConnection::networkError, this, [this](const QString &error, const QString &, int, int) {
                     Q_EMIT errorOccured(i18n("Network Error: %1", error), {});
                 });
-#if Quotient_VERSION_MINOR > 8
-                connection->assumeIdentity(account.userId(), account.deviceId(), accessToken);
-#else
                 connection->assumeIdentity(account.userId(), accessToken);
-#endif
             });
         }
     }
@@ -271,19 +249,23 @@ QKeychain::ReadPasswordJob *Controller::loadAccessTokenFromKeyChain(const QStrin
     return job;
 }
 
-void Controller::saveAccessTokenToKeyChain(const QString &userId, const QByteArray &accessToken)
+bool Controller::saveAccessTokenToKeyChain(const QString &userId, const QByteArray &accessToken)
 {
     qDebug() << "Save the access token to the keychain for " << userId;
-    auto job = new QKeychain::WritePasswordJob(qAppName());
-    job->setAutoDelete(true);
-    job->setKey(userId);
-    job->setBinaryData(accessToken);
-    connect(job, &QKeychain::WritePasswordJob::finished, this, [job]() {
-        if (job->error()) {
-            qWarning() << "Could not save access token to the keychain: " << qPrintable(job->errorString());
-        }
-    });
-    job->start();
+    QKeychain::WritePasswordJob job(qAppName());
+    job.setAutoDelete(false);
+    job.setKey(userId);
+    job.setBinaryData(accessToken);
+    QEventLoop loop;
+    QKeychain::WritePasswordJob::connect(&job, &QKeychain::Job::finished, &loop, &QEventLoop::quit);
+    job.start();
+    loop.exec();
+
+    if (job.error()) {
+        qWarning() << "Could not save access token to the keychain: " << qPrintable(job.errorString());
+        return false;
+    }
+    return true;
 }
 
 bool Controller::supportSystemTray() const
@@ -408,6 +390,8 @@ QString Controller::loadFileContent(const QString &path) const
     return QString::fromLatin1(file.readAll());
 }
 
+#include "moc_controller.cpp"
+
 void Controller::setTestMode(bool test)
 {
     testMode = test;
@@ -423,30 +407,11 @@ void Controller::removeConnection(const QString &userId)
     }
 }
 
-bool Controller::csSupported() const
+void Controller::saveFileContent(const QString &path, const QByteArray &data) const
 {
-#if Quotient_VERSION_MINOR > 8
-    return true;
-#else
-    return false;
-#endif
+    QUrl url(path);
+    QFile file(url.toLocalFile());
+    file.open(QFile::WriteOnly);
+    file.write(data);
+    file.close();
 }
-
-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

@@ -50,19 +50,7 @@ class Controller : public QObject
 
     Q_PROPERTY(QStringList accountsLoading MEMBER m_accountsLoading NOTIFY accountsLoadingChanged)
 
-    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 *)
     {
@@ -86,7 +74,7 @@ public:
     /**
      * @brief Save an access token to the keychain for the given account.
      */
-    void saveAccessTokenToKeyChain(const QString &userId, const QByteArray &accessToken);
+    bool saveAccessTokenToKeyChain(const QString &userId, const QByteArray &accessToken);
 
     [[nodiscard]] bool supportSystemTray() const;
 
@@ -99,6 +87,7 @@ public:
     static void listenForNotifications();
 
     Q_INVOKABLE QString loadFileContent(const QString &path) const;
+    Q_INVOKABLE void saveFileContent(const QString &path, const QByteArray &data) const;
 
     Quotient::AccountRegistry &accounts();
 
@@ -106,19 +95,6 @@ public:
 
     Q_INVOKABLE void removeConnection(const QString &userId);
 
-    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);
 
@@ -127,11 +103,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;
 
 private Q_SLOTS:
     void invokeLogin();
@@ -144,5 +122,4 @@ Q_SIGNALS:
     void connectionDropped(NeoChatConnection *connection);
     void activeConnectionChanged(NeoChatConnection *connection);
     void accountsLoadingChanged();
-    void showMessage(MessageType messageType, const QString &message);
 };

src/devtools/CMakeLists.txt

@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: BSD-2-Clause
 
 qt_add_library(devtools STATIC)
-ecm_add_qml_module(devtools GENERATE_PLUGIN_SOURCE
+qt_add_qml_module(devtools
     URI org.kde.neochat.devtools
     OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/src/org/kde/neochat/devtools
     QML_FILES

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/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

@@ -33,7 +33,6 @@ public:
      *       a room message.
      */
     enum Type {
-        Author, /**< The message sender and time. */
         Text, /**< A text message. */
         Image, /**< A message that is an image. */
         Audio, /**< A message that is an audio recording. */
@@ -48,11 +47,11 @@ public:
         LiveLocation, /**< The initial event of a shared live location (i.e., the place where this is supposed to be shown in the timeline). */
         Encrypted, /**< An encrypted message that cannot be decrypted. */
         Reply, /**< A component to show a replied-to message. */
+        ReplyLoad, /**< A loading dialog for a reply. */
         LinkPreview, /**< A preview of a URL in the message. */
         LinkPreviewLoad, /**< A loading dialog for a link preview. */
-        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. */
     };
     Q_ENUM(Type);

src/enums/powerlevel.cpp

@@ -105,5 +105,3 @@ QHash<int, QByteArray> PowerLevelModel::roleNames() const
 {
     return {{NameRole, "name"}, {ValueRole, "value"}};
 }
-
-#include "moc_powerlevel.cpp"

src/eventhandler.cpp

@@ -5,17 +5,16 @@
 
 #include <QMovie>
 
-#include <KFormat>
 #include <KLocalizedString>
 
+#include <Quotient/eventitem.h>
 #include <Quotient/events/encryptionevent.h>
-#include <Quotient/events/event.h>
 #include <Quotient/events/reactionevent.h>
 #include <Quotient/events/redactionevent.h>
 #include <Quotient/events/roomavatarevent.h>
 #include <Quotient/events/roomcanonicalaliasevent.h>
-#include <Quotient/events/roomevent.h>
 #include <Quotient/events/roommemberevent.h>
+#include <Quotient/events/roommessageevent.h>
 #include <Quotient/events/roompowerlevelsevent.h>
 #include <Quotient/events/simplestateevents.h>
 #include <Quotient/events/stickerevent.h>
@@ -26,6 +25,9 @@
 #include "events/locationbeaconevent.h"
 #include "events/pollevent.h"
 #include "events/widgetevent.h"
+#include "linkpreviewer.h"
+#include "messagecomponenttype.h"
+#include "models/reactionmodel.h"
 #include "neochatconfig.h"
 #include "neochatroom.h"
 #include "texthandler.h"
@@ -33,52 +35,82 @@
 
 using namespace Quotient;
 
-QString EventHandler::id(const Quotient::RoomEvent *event)
+EventHandler::EventHandler(const NeoChatRoom *room, const RoomEvent *event)
+    : m_room(room)
+    , m_event(event)
 {
-    if (event == nullptr) {
-        qCWarning(EventHandling) << "id called with event set to nullptr.";
-        return {};
-    }
-
-    return !event->id().isEmpty() ? event->id() : event->transactionId();
 }
 
-QString EventHandler::authorDisplayName(const NeoChatRoom *room, const Quotient::RoomEvent *event, bool isPending)
+QString EventHandler::getId() const
 {
-    if (room == nullptr) {
-        qCWarning(EventHandling) << "authorDisplayName called with room set to nullptr.";
-        return {};
-    }
-    if (event == nullptr) {
-        qCWarning(EventHandling) << "authorDisplayName called with event set to nullptr.";
+    if (m_event == nullptr) {
+        qCWarning(EventHandling) << "getId called with m_event set to nullptr.";
         return {};
     }
 
-    if (is<RoomMemberEvent>(*event) && !event->unsignedJson()[QStringLiteral("prev_content")][QStringLiteral("displayname")].isNull()
-        && event->stateKey() == event->senderId()) {
-        auto previousDisplayName = event->unsignedJson()[QStringLiteral("prev_content")][QStringLiteral("displayname")].toString().toHtmlEscaped();
+    return !m_event->id().isEmpty() ? m_event->id() : m_event->transactionId();
+}
+
+MessageComponentType::Type EventHandler::messageComponentType() const
+{
+    if (m_event == nullptr) {
+        qCWarning(EventHandling) << "messageComponentType called with m_event set to nullptr.";
+        return MessageComponentType::Other;
+    }
+
+    return MessageComponentType::typeForEvent(*m_event);
+}
+
+Quotient::RoomMember EventHandler::getAuthor(bool isPending) const
+{
+    if (m_room == nullptr) {
+        qCWarning(EventHandling) << "getAuthor called with m_room set to nullptr.";
+        return {};
+    }
+    if (m_event == nullptr) {
+        qCWarning(EventHandling) << "getAuthor called with m_event set to nullptr. Returning empty user.";
+        return {};
+    }
+
+    return isPending ? m_room->localMember() : m_room->member(m_event->senderId());
+}
+
+QString EventHandler::getAuthorDisplayName(bool isPending) const
+{
+    if (m_room == nullptr) {
+        qCWarning(EventHandling) << "getAuthorDisplayName called with m_room set to nullptr.";
+        return {};
+    }
+    if (m_event == nullptr) {
+        qCWarning(EventHandling) << "getAuthorDisplayName called with m_event set to nullptr.";
+        return {};
+    }
+
+    if (is<RoomMemberEvent>(*m_event) && !m_event->unsignedJson()[QStringLiteral("prev_content")][QStringLiteral("displayname")].isNull()
+        && m_event->stateKey() == m_event->senderId()) {
+        auto previousDisplayName = m_event->unsignedJson()[QStringLiteral("prev_content")][QStringLiteral("displayname")].toString().toHtmlEscaped();
         if (previousDisplayName.isEmpty()) {
-            previousDisplayName = event->senderId();
+            previousDisplayName = m_event->senderId();
         }
         return previousDisplayName;
     } else {
-        const auto author = isPending ? room->localMember() : room->member(event->senderId());
+        const auto author = isPending ? m_room->localMember() : m_room->member(m_event->senderId());
         return author.htmlSafeDisplayName();
     }
 }
 
-QString EventHandler::singleLineAuthorDisplayname(const NeoChatRoom *room, const Quotient::RoomEvent *event, bool isPending)
+QString EventHandler::singleLineAuthorDisplayname(bool isPending) const
 {
-    if (room == nullptr) {
-        qCWarning(EventHandling) << "singleLineAuthorDisplayname called with room set to nullptr.";
+    if (m_room == nullptr) {
+        qCWarning(EventHandling) << "getAuthorDisplayName called with m_room set to nullptr.";
         return {};
     }
-    if (event == nullptr) {
-        qCWarning(EventHandling) << "singleLineAuthorDisplayname called with event set to nullptr.";
+    if (m_event == nullptr) {
+        qCWarning(EventHandling) << "getAuthorDisplayName called with m_event set to nullptr.";
         return {};
     }
 
-    const auto author = isPending ? room->localMember() : room->member(event->senderId());
+    const auto author = isPending ? m_room->localMember() : m_room->member(m_event->senderId());
     auto displayName = author.displayName();
     displayName.replace(QStringLiteral("<br>\n"), QStringLiteral(" "));
     displayName.replace(QStringLiteral("<br>"), QStringLiteral(" "));
@@ -89,10 +121,10 @@ QString EventHandler::singleLineAuthorDisplayname(const NeoChatRoom *room, const
     return displayName;
 }
 
-QDateTime EventHandler::time(const Quotient::RoomEvent *event, bool isPending, QDateTime lastUpdated)
+QDateTime EventHandler::getTime(bool isPending, QDateTime lastUpdated) const
 {
-    if (event == nullptr) {
-        qCWarning(EventHandling) << "time called with event set to nullptr.";
+    if (m_event == nullptr) {
+        qCWarning(EventHandling) << "getTime called with m_event set to nullptr.";
         return {};
     }
     if (isPending && lastUpdated == QDateTime()) {
@@ -100,16 +132,24 @@ QDateTime EventHandler::time(const Quotient::RoomEvent *event, bool isPending, Q
         return {};
     }
 
-    return isPending ? lastUpdated : event->originTimestamp();
+    return isPending ? lastUpdated : m_event->originTimestamp();
 }
 
-QString EventHandler::timeString(const Quotient::RoomEvent *event, bool relative, QLocale::FormatType format, bool isPending, QDateTime lastUpdated)
+QString EventHandler::getTimeString(bool relative, QLocale::FormatType format, bool isPending, QDateTime lastUpdated) const
 {
-    auto ts = time(event, isPending, lastUpdated);
+    if (m_event == nullptr) {
+        qCWarning(EventHandling) << "getTimeString called with m_event set to nullptr.";
+        return {};
+    }
+    if (isPending && lastUpdated == QDateTime()) {
+        qCWarning(EventHandling) << "a value must be provided for lastUpdated for a pending event.";
+        return {};
+    }
+
+    auto ts = getTime(isPending, lastUpdated);
     if (ts.isValid()) {
         if (relative) {
-            KFormat formatter;
-            return formatter.formatRelativeDate(ts.toLocalTime().date(), format);
+            return m_format.formatRelativeDate(ts.toLocalTime().date(), format);
         } else {
             return QLocale().toString(ts.toLocalTime().time(), format);
         }
@@ -117,45 +157,39 @@ QString EventHandler::timeString(const Quotient::RoomEvent *event, bool relative
     return {};
 }
 
-QString EventHandler::timeString(const Quotient::RoomEvent *event, const QString &format, bool isPending, const QDateTime &lastUpdated)
+bool EventHandler::isHighlighted()
 {
-    return time(event, isPending, lastUpdated).toLocalTime().toString(format);
+    if (m_room == nullptr) {
+        qCWarning(EventHandling) << "isHighlighted called with m_room set to nullptr.";
+        return false;
+    }
+    if (m_event == nullptr) {
+        qCWarning(EventHandling) << "isHighlighted called with m_event set to nullptr.";
+        return false;
+    }
+
+    return !m_room->isDirectChat() && m_room->isEventHighlighted(m_event);
 }
 
-bool EventHandler::isHighlighted(const NeoChatRoom *room, const Quotient::RoomEvent *event)
+bool EventHandler::isHidden()
 {
-    if (room == nullptr) {
-        qCWarning(EventHandling) << "isHighlighted called with room set to nullptr.";
+    if (m_room == nullptr) {
+        qCWarning(EventHandling) << "isHidden called with m_room set to nullptr.";
         return false;
     }
-    if (event == nullptr) {
-        qCWarning(EventHandling) << "isHighlighted called with event set to nullptr.";
+    if (m_event == nullptr) {
+        qCWarning(EventHandling) << "isHidden called with m_event set to nullptr.";
         return false;
     }
 
-    return !room->isDirectChat() && room->isEventHighlighted(event);
-}
-
-bool EventHandler::isHidden(const NeoChatRoom *room, const Quotient::RoomEvent *event)
-{
-    if (room == nullptr) {
-        qCWarning(EventHandling) << "isHidden called with room set to nullptr.";
-        return false;
-    }
-    if (event == nullptr) {
-        qCWarning(EventHandling) << "isHidden called with event set to nullptr.";
-        return false;
-    }
-
-    if (event->isStateEvent() && !NeoChatConfig::self()->showStateEvent()) {
+    if (m_event->isStateEvent() && !NeoChatConfig::self()->showStateEvent()) {
         return true;
     }
 
-    if (auto roomMemberEvent = eventCast<const RoomMemberEvent>(event)) {
+    if (auto roomMemberEvent = eventCast<const RoomMemberEvent>(m_event)) {
         if ((roomMemberEvent->isJoin() || roomMemberEvent->isLeave()) && !NeoChatConfig::self()->showLeaveJoinEvent()) {
             return true;
-        } else if (roomMemberEvent->isRename() && roomMemberEvent->prevContent() && roomMemberEvent->prevContent()->membership == roomMemberEvent->membership()
-                   && !NeoChatConfig::self()->showRename()) {
+        } else if (roomMemberEvent->isRename() && !roomMemberEvent->isJoin() && !roomMemberEvent->isLeave() && !NeoChatConfig::self()->showRename()) {
             return true;
         } else if (roomMemberEvent->isAvatarUpdate() && !roomMemberEvent->isJoin() && !roomMemberEvent->isLeave()
                    && !NeoChatConfig::self()->showAvatarUpdate()) {
@@ -163,33 +197,33 @@ bool EventHandler::isHidden(const NeoChatRoom *room, const Quotient::RoomEvent *
         }
     }
 
-    if (event->isStateEvent() && eventCast<const StateEvent>(event)->repeatsState()) {
+    if (m_event->isStateEvent() && eventCast<const StateEvent>(m_event)->repeatsState()) {
         return true;
     }
 
     // isReplacement?
-    if (auto e = eventCast<const RoomMessageEvent>(event)) {
+    if (auto e = eventCast<const RoomMessageEvent>(m_event)) {
         if (!e->replacedEvent().isEmpty()) {
             return true;
         }
     }
 
-    if (is<RedactionEvent>(*event) || is<ReactionEvent>(*event)) {
+    if (is<RedactionEvent>(*m_event) || is<ReactionEvent>(*m_event)) {
         return true;
     }
 
-    if (auto e = eventCast<const RoomMessageEvent>(event)) {
+    if (auto e = eventCast<const RoomMessageEvent>(m_event)) {
         if (!e->replacedEvent().isEmpty() && e->replacedEvent() != e->id()) {
             return true;
         }
     }
 
-    if (room->connection()->isIgnored(event->senderId())) {
+    if (m_room->connection()->isIgnored(m_event->senderId())) {
         return true;
     }
 
     // hide ending live location beacons
-    if (event->isStateEvent() && event->matrixType() == "org.matrix.msc3672.beacon_info"_ls && !event->contentJson()["live"_ls].toBool()) {
+    if (m_event->isStateEvent() && m_event->matrixType() == "org.matrix.msc3672.beacon_info"_ls && !m_event->contentJson()["live"_ls].toBool()) {
         return true;
     }
 
@@ -207,19 +241,17 @@ Qt::TextFormat EventHandler::messageBodyInputFormat(const Quotient::RoomMessageE
 
 QString EventHandler::rawMessageBody(const Quotient::RoomMessageEvent &event)
 {
-    QString body;
-
     if (event.hasFileContent()) {
-        // if filename is given or body is equal to filename,
-        // then body is a caption
-        QString filename = event.content()->fileInfo()->originalName;
-        QString body = event.plainBody();
-        if (filename.isEmpty() || filename == body) {
-            return QString();
+        auto fileCaption = event.content()->fileInfo()->originalName;
+        if (fileCaption.isEmpty()) {
+            fileCaption = event.plainBody();
+        } else if (event.content()->fileInfo()->originalName != event.plainBody()) {
+            fileCaption = event.plainBody() + " | "_ls + fileCaption;
         }
-        return body;
+        return fileCaption;
     }
 
+    QString body;
     if (event.hasTextContent() && event.content()) {
         body = static_cast<const EventContent::TextContent *>(event.content())->body;
     } else {
@@ -228,52 +260,44 @@ QString EventHandler::rawMessageBody(const Quotient::RoomMessageEvent &event)
     return body;
 }
 
-QString EventHandler::richBody(const NeoChatRoom *room, const Quotient::RoomEvent *event, bool stripNewlines)
+QString EventHandler::getRichBody(bool stripNewlines) const
 {
-    if (room == nullptr) {
-        qCWarning(EventHandling) << "richBody called with room set to nullptr.";
+    if (m_event == nullptr) {
+        qCWarning(EventHandling) << "getRichBody called with m_event set to nullptr.";
         return {};
     }
-    if (event == nullptr) {
-        qCWarning(EventHandling) << "richBody called with event set to nullptr.";
-        return {};
-    }
-    return getBody(room, event, Qt::RichText, stripNewlines);
+    return getBody(m_event, Qt::RichText, stripNewlines);
 }
 
-QString EventHandler::plainBody(const NeoChatRoom *room, const Quotient::RoomEvent *event, bool stripNewlines)
+QString EventHandler::getPlainBody(bool stripNewlines) const
 {
-    if (room == nullptr) {
-        qCWarning(EventHandling) << "plainBody called with room set to nullptr.";
+    if (m_event == nullptr) {
+        qCWarning(EventHandling) << "getPlainBody called with m_event set to nullptr.";
         return {};
     }
-    if (event == nullptr) {
-        qCWarning(EventHandling) << "plainBody called with event set to nullptr.";
-        return {};
-    }
-    return getBody(room, event, Qt::PlainText, stripNewlines);
+    return getBody(m_event, Qt::PlainText, stripNewlines);
 }
 
-QString EventHandler::markdownBody(const Quotient::RoomEvent *event)
+QString EventHandler::getMarkdownBody() const
 {
-    if (event == nullptr) {
-        qCWarning(EventHandling) << "markdownBody called with event set to nullptr.";
+    if (m_event == nullptr) {
+        qCWarning(EventHandling) << "getMarkdownBody called with m_event set to nullptr.";
         return {};
     }
 
-    if (!event->is<RoomMessageEvent>()) {
-        qCWarning(EventHandling) << "markdownBody called when event isn't a RoomMessageEvent.";
+    if (!m_event->is<RoomMessageEvent>()) {
+        qCWarning(EventHandling) << "getMarkdownBody called when m_event isn't a RoomMessageEvent.";
         return {};
     }
 
-    const auto roomMessageEvent = eventCast<const RoomMessageEvent>(event);
+    const auto roomMessageEvent = eventCast<const RoomMessageEvent>(m_event);
 
     QString plainBody = roomMessageEvent->plainBody();
     plainBody.remove(TextRegex::removeReply);
     return plainBody;
 }
 
-QString EventHandler::getBody(const NeoChatRoom *room, const Quotient::RoomEvent *event, Qt::TextFormat format, bool stripNewlines)
+QString EventHandler::getBody(const Quotient::RoomEvent *event, Qt::TextFormat format, bool stripNewlines) const
 {
     if (event->isRedacted()) {
         auto reason = event->redactedBecause()->reason();
@@ -284,27 +308,24 @@ QString EventHandler::getBody(const NeoChatRoom *room, const Quotient::RoomEvent
 
     return switchOnType(
         *event,
-        [room, format, stripNewlines](const RoomMessageEvent &event) {
-            return getMessageBody(room, event, format, stripNewlines);
+        [this, format, stripNewlines](const RoomMessageEvent &event) {
+            return getMessageBody(event, format, stripNewlines);
         },
         [](const StickerEvent &e) {
             return e.body();
         },
-        [room, prettyPrint](const RoomMemberEvent &e) {
+        [this, prettyPrint](const RoomMemberEvent &e) {
             // FIXME: Rewind to the name that was at the time of this event
-            auto subjectName = room->member(e.userId()).htmlSafeDisplayName();
+            auto subjectName = m_room->member(e.userId()).htmlSafeDisplayName();
             if (e.membership() == Membership::Leave) {
                 if (e.prevContent() && e.prevContent()->displayName) {
-                    subjectName = sanitized(*e.prevContent()->displayName);
-                    if (prettyPrint) {
-                        subjectName = subjectName.toHtmlEscaped();
-                    }
+                    subjectName = sanitized(*e.prevContent()->displayName).toHtmlEscaped();
                 }
             }
 
             if (prettyPrint) {
                 subjectName = QStringLiteral("<a href=\"https://matrix.to/#/%1\" style=\"color: %2\">%3</a>")
-                                  .arg(e.userId(), room->member(e.userId()).color().name(), subjectName);
+                                  .arg(e.userId(), m_room->member(e.userId()).color().name(), subjectName);
             }
 
             // The below code assumes senderName output in AuthorRole
@@ -367,13 +388,9 @@ QString EventHandler::getBody(const NeoChatRoom *room, const Quotient::RoomEvent
                 if (e.prevContent() && e.prevContent()->membership == Membership::Ban) {
                     return (e.senderId() != e.userId()) ? i18n("unbanned %1", subjectName) : i18n("self-unbanned");
                 }
-                if (e.senderId() == e.userId()) {
-                    return i18n("left the room");
-                }
-                if (const auto &reason = e.contentJson()["reason"_ls].toString().toHtmlEscaped(); !reason.isEmpty()) {
-                    return i18n("has put %1 out of the room: %2", subjectName, reason);
-                }
-                return i18n("has put %1 out of the room", subjectName);
+                return (e.senderId() != e.userId())
+                    ? i18n("has put %1 out of the room: %2", subjectName, e.contentJson()["reason"_ls].toString().toHtmlEscaped())
+                    : i18n("left the room");
             case Membership::Ban:
                 if (e.senderId() != e.userId()) {
                     if (e.reason().isEmpty()) {
@@ -444,7 +461,7 @@ QString EventHandler::getBody(const NeoChatRoom *room, const Quotient::RoomEvent
         i18n("Unknown event"));
 }
 
-QString EventHandler::getMessageBody(const NeoChatRoom *room, const RoomMessageEvent &event, Qt::TextFormat format, bool stripNewlines)
+QString EventHandler::getMessageBody(const RoomMessageEvent &event, Qt::TextFormat format, bool stripNewlines) const
 {
     TextHandler textHandler;
 
@@ -476,24 +493,24 @@ QString EventHandler::getMessageBody(const NeoChatRoom *room, const RoomMessageE
     }
 
     if (format == Qt::RichText) {
-        return textHandler.handleRecieveRichText(inputFormat, room, &event, stripNewlines, event.isReplaced());
+        return textHandler.handleRecieveRichText(inputFormat, m_room, &event, stripNewlines, event.isReplaced());
     } else {
         return textHandler.handleRecievePlainText(inputFormat, stripNewlines);
     }
 }
 
-QString EventHandler::genericBody(const Quotient::RoomEvent *event)
+QString EventHandler::getGenericBody() const
 {
-    if (event == nullptr) {
-        qCWarning(EventHandling) << "genericBody called with event set to nullptr.";
+    if (m_event == nullptr) {
+        qCWarning(EventHandling) << "getGenericBody called with m_event set to nullptr.";
         return {};
     }
-    if (event->isRedacted()) {
+    if (m_event->isRedacted()) {
         return i18n("<i>[This message was deleted]</i>");
     }
 
     return switchOnType(
-        *event,
+        *m_event,
         [](const RoomMessageEvent &e) {
             Q_UNUSED(e)
             return i18n("sent a message");
@@ -613,68 +630,53 @@ QString EventHandler::genericBody(const Quotient::RoomEvent *event)
         i18n("Unknown event"));
 }
 
-QString EventHandler::subtitleText(const NeoChatRoom *room, const Quotient::RoomEvent *event)
+QString EventHandler::subtitleText() const
 {
-    if (room == nullptr) {
-        qCWarning(EventHandling) << "subtitleText called with room set to nullptr.";
+    if (m_event == nullptr) {
+        qCWarning(EventHandling) << "subtitleText called with m_event set to nullptr.";
         return {};
     }
-    if (event == nullptr) {
-        qCWarning(EventHandling) << "subtitleText called with event set to nullptr.";
-        return {};
-    }
-    return singleLineAuthorDisplayname(room, event) + (event->isStateEvent() ? QLatin1String(" ") : QLatin1String(": ")) + plainBody(room, event, true);
+    return singleLineAuthorDisplayname() + (m_event->isStateEvent() ? QLatin1String(" ") : QLatin1String(": ")) + getPlainBody(true);
 }
 
-QVariantMap EventHandler::mediaInfo(const NeoChatRoom *room, const Quotient::RoomEvent *event)
+QVariantMap EventHandler::getMediaInfo() const
 {
-    if (room == nullptr) {
-        qCWarning(EventHandling) << "mediaInfo called with room set to nullptr.";
+    if (m_room == nullptr) {
+        qCWarning(EventHandling) << "getMediaInfo called with m_room set to nullptr.";
         return {};
     }
-    if (event == nullptr) {
-        qCWarning(EventHandling) << "mediaInfo called with event set to nullptr.";
+    if (m_event == nullptr) {
+        qCWarning(EventHandling) << "getMediaInfo called with m_event set to nullptr.";
         return {};
     }
-    return getMediaInfoForEvent(room, event);
+    return getMediaInfoForEvent(m_event);
 }
 
-QVariantMap EventHandler::getMediaInfoForEvent(const NeoChatRoom *room, const Quotient::RoomEvent *event)
+QVariantMap EventHandler::getMediaInfoForEvent(const Quotient::RoomEvent *event) const
 {
     QString eventId = event->id();
 
     // Get the file info for the event.
+    const EventContent::FileInfo *fileInfo;
+    bool isSticker = false;
     if (event->is<RoomMessageEvent>()) {
         auto roomMessageEvent = eventCast<const RoomMessageEvent>(event);
         if (!roomMessageEvent->hasFileContent()) {
             return {};
         }
-
-        const EventContent::FileInfo *fileInfo;
         fileInfo = roomMessageEvent->content()->fileInfo();
-        QVariantMap mediaInfo = getMediaInfoFromFileInfo(room, fileInfo, eventId, false, false);
-        // if filename isn't specifically given, it is in body
-        // https://spec.matrix.org/latest/client-server-api/#mfile
-        mediaInfo["filename"_ls] = (fileInfo->originalName.isEmpty()) ? roomMessageEvent->plainBody() : fileInfo->originalName;
-
-        return mediaInfo;
     } else if (event->is<StickerEvent>()) {
-        const EventContent::FileInfo *fileInfo;
-
         auto stickerEvent = eventCast<const StickerEvent>(event);
         fileInfo = &stickerEvent->image();
-
-        return getMediaInfoFromFileInfo(room, fileInfo, eventId, false, true);
+        isSticker = true;
     } else {
         return {};
     }
+
+    return getMediaInfoFromFileInfo(fileInfo, eventId, false, isSticker);
 }
 
-QVariantMap EventHandler::getMediaInfoFromFileInfo(const NeoChatRoom *room,
-                                                   const EventContent::FileInfo *fileInfo,
-                                                   const QString &eventId,
-                                                   bool isThumbnail,
-                                                   bool isSticker)
+QVariantMap EventHandler::getMediaInfoFromFileInfo(const EventContent::FileInfo *fileInfo, const QString &eventId, bool isThumbnail, bool isSticker) const
 {
     QVariantMap mediaInfo;
 
@@ -682,7 +684,7 @@ QVariantMap EventHandler::getMediaInfoFromFileInfo(const NeoChatRoom *room,
     if (!fileInfo->url().isValid() || fileInfo->url().scheme() != QStringLiteral("mxc") || eventId.isEmpty()) {
         mediaInfo["source"_ls] = QUrl();
     } else {
-        QUrl source = room->makeMediaUrl(eventId, fileInfo->url());
+        QUrl source = m_room->makeMediaUrl(eventId, fileInfo->url());
 
         if (source.isValid()) {
             mediaInfo["source"_ls] = source;
@@ -714,7 +716,7 @@ QVariantMap EventHandler::getMediaInfoFromFileInfo(const NeoChatRoom *room,
 
             if (!isThumbnail) {
                 QVariantMap tempInfo;
-                auto thumbnailInfo = getMediaInfoFromFileInfo(room, castInfo->thumbnailInfo(), eventId, true);
+                auto thumbnailInfo = getMediaInfoFromFileInfo(castInfo->thumbnailInfo(), eventId, true);
                 if (thumbnailInfo["source"_ls].toUrl().scheme() == "mxc"_ls) {
                     tempInfo = thumbnailInfo;
                 } else {
@@ -737,7 +739,7 @@ QVariantMap EventHandler::getMediaInfoFromFileInfo(const NeoChatRoom *room,
 
             if (!isThumbnail) {
                 QVariantMap tempInfo;
-                auto thumbnailInfo = getMediaInfoFromFileInfo(room, castInfo->thumbnailInfo(), eventId, true);
+                auto thumbnailInfo = getMediaInfoFromFileInfo(castInfo->thumbnailInfo(), eventId, true);
                 if (thumbnailInfo["source"_ls].toUrl().scheme() == "mxc"_ls) {
                     tempInfo = thumbnailInfo;
                 } else {
@@ -761,89 +763,156 @@ QVariantMap EventHandler::getMediaInfoFromFileInfo(const NeoChatRoom *room,
     return mediaInfo;
 }
 
-bool EventHandler::hasReply(const Quotient::RoomEvent *event, bool showFallbacks)
+bool EventHandler::hasReply() const
 {
-    if (event == nullptr) {
-        qCWarning(EventHandling) << "hasReply called with event set to nullptr.";
+    if (m_event == nullptr) {
+        qCWarning(EventHandling) << "hasReply called with m_event set to nullptr.";
         return false;
     }
-
-    const auto relations = event->contentPart<QJsonObject>("m.relates_to"_ls);
-    if (!relations.isEmpty()) {
-        const bool hasReplyRelation = relations.contains("m.in_reply_to"_ls);
-        bool isFallingBack = relations["is_falling_back"_ls].toBool();
-        return hasReplyRelation && (showFallbacks ? true : !isFallingBack);
-    }
-    return false;
+    return !m_event->contentJson()["m.relates_to"_ls].toObject()["m.in_reply_to"_ls].toObject()["event_id"_ls].toString().isEmpty();
 }
 
-QString EventHandler::replyId(const Quotient::RoomEvent *event)
+QString EventHandler::getReplyId() const
 {
-    if (event == nullptr) {
-        qCWarning(EventHandling) << "replyId called with event set to nullptr.";
+    if (m_event == nullptr) {
+        qCWarning(EventHandling) << "getReplyId called with m_event set to nullptr.";
         return {};
     }
-    return event->contentJson()["m.relates_to"_ls].toObject()["m.in_reply_to"_ls].toObject()["event_id"_ls].toString();
+    return m_event->contentJson()["m.relates_to"_ls].toObject()["m.in_reply_to"_ls].toObject()["event_id"_ls].toString();
 }
 
-Quotient::RoomMember EventHandler::replyAuthor(const NeoChatRoom *room, const Quotient::RoomEvent *event)
+MessageComponentType::Type EventHandler::replyMessageComponentType() const
 {
-    if (room == nullptr) {
-        qCWarning(EventHandling) << "replyAuthor called with room set to nullptr.";
+    if (m_room == nullptr) {
+        qCWarning(EventHandling) << "replyMessageComponentType called with m_room set to nullptr.";
+        return MessageComponentType::Other;
+    }
+    if (m_event == nullptr) {
+        qCWarning(EventHandling) << "replyMessageComponentType called with m_event set to nullptr.";
+        return MessageComponentType::Other;
+    }
+
+    auto replyEvent = m_room->getReplyForEvent(*m_event);
+    if (replyEvent == nullptr) {
+        return MessageComponentType::Other;
+    }
+    return MessageComponentType::typeForEvent(*replyEvent);
+}
+
+Quotient::RoomMember EventHandler::getReplyAuthor() const
+{
+    if (m_room == nullptr) {
+        qCWarning(EventHandling) << "getReplyAuthor called with m_room set to nullptr.";
         return {};
     }
-    if (event == nullptr) {
-        qCWarning(EventHandling) << "replyAuthor called with event set to nullptr. Returning empty user.";
+    if (m_event == nullptr) {
+        qCWarning(EventHandling) << "getReplyAuthor called with m_event set to nullptr. Returning empty user.";
         return {};
     }
 
-    if (auto replyPtr = room->getReplyForEvent(*event)) {
-        return room->member(replyPtr->senderId());
+    if (auto replyPtr = m_room->getReplyForEvent(*m_event)) {
+        return m_room->member(replyPtr->senderId());
     } else {
-        return room->member(QString());
+        return m_room->member(QString());
     }
 }
 
-bool EventHandler::isThreaded(const Quotient::RoomEvent *event)
+QString EventHandler::getReplyRichBody(bool stripNewlines) const
 {
-    if (event == nullptr) {
-        qCWarning(EventHandling) << "isThreaded called with event set to nullptr.";
+    if (m_room == nullptr) {
+        qCWarning(EventHandling) << "getReplyRichBody called with m_room set to nullptr.";
+        return {};
+    }
+    if (m_event == nullptr) {
+        qCWarning(EventHandling) << "getReplyRichBody called with m_event set to nullptr.";
+        return {};
+    }
+
+    auto replyEvent = m_room->getReplyForEvent(*m_event);
+    if (replyEvent == nullptr) {
+        return {};
+    }
+
+    return getBody(replyEvent, Qt::RichText, stripNewlines);
+}
+
+QString EventHandler::getReplyPlainBody(bool stripNewlines) const
+{
+    if (m_room == nullptr) {
+        qCWarning(EventHandling) << "getReplyPlainBody called with m_room set to nullptr.";
+        return {};
+    }
+    if (m_event == nullptr) {
+        qCWarning(EventHandling) << "getReplyPlainBody called with m_event set to nullptr.";
+        return {};
+    }
+
+    auto replyEvent = m_room->getReplyForEvent(*m_event);
+    if (replyEvent == nullptr) {
+        return {};
+    }
+
+    return getBody(replyEvent, Qt::PlainText, stripNewlines);
+}
+
+QVariantMap EventHandler::getReplyMediaInfo() const
+{
+    if (m_room == nullptr) {
+        qCWarning(EventHandling) << "getReplyMediaInfo called with m_room set to nullptr.";
+        return {};
+    }
+    if (m_event == nullptr) {
+        qCWarning(EventHandling) << "getReplyMediaInfo called with m_event set to nullptr.";
+        return {};
+    }
+
+    auto replyPtr = m_room->getReplyForEvent(*m_event);
+    if (!replyPtr) {
+        return {};
+    }
+    return getMediaInfoForEvent(replyPtr);
+}
+
+bool EventHandler::isThreaded() const
+{
+    if (m_event == nullptr) {
+        qCWarning(EventHandling) << "isThreaded called with m_event set to nullptr.";
         return false;
     }
 
-    return (event->contentPart<QJsonObject>("m.relates_to"_ls).contains("rel_type"_ls)
-            && event->contentPart<QJsonObject>("m.relates_to"_ls)["rel_type"_ls].toString() == "m.thread"_ls)
-        || (!event->unsignedPart<QJsonObject>("m.relations"_ls).isEmpty() && event->unsignedPart<QJsonObject>("m.relations"_ls).contains("m.thread"_ls));
+    return (m_event->contentPart<QJsonObject>("m.relates_to"_ls).contains("rel_type"_ls)
+            && m_event->contentPart<QJsonObject>("m.relates_to"_ls)["rel_type"_ls].toString() == "m.thread"_ls)
+        || (!m_event->unsignedPart<QJsonObject>("m.relations"_ls).isEmpty() && m_event->unsignedPart<QJsonObject>("m.relations"_ls).contains("m.thread"_ls));
 }
 
-QString EventHandler::threadRoot(const Quotient::RoomEvent *event)
+QString EventHandler::threadRoot() const
 {
-    if (event == nullptr) {
-        qCWarning(EventHandling) << "threadRoot called with event set to nullptr.";
+    if (m_event == nullptr) {
+        qCWarning(EventHandling) << "threadRoot called with m_event set to nullptr.";
         return {};
     }
 
     // Get the thread root ID from m.relates_to if it exists.
-    if (event->contentPart<QJsonObject>("m.relates_to"_ls).contains("rel_type"_ls)
-        && event->contentPart<QJsonObject>("m.relates_to"_ls)["rel_type"_ls].toString() == "m.thread"_ls) {
-        return event->contentPart<QJsonObject>("m.relates_to"_ls)["event_id"_ls].toString();
+    if (m_event->contentPart<QJsonObject>("m.relates_to"_ls).contains("rel_type"_ls)
+        && m_event->contentPart<QJsonObject>("m.relates_to"_ls)["rel_type"_ls].toString() == "m.thread"_ls) {
+        return m_event->contentPart<QJsonObject>("m.relates_to"_ls)["event_id"_ls].toString();
     }
     // For thread root events they have an m.relations in the unsigned part with a m.thread object.
     // If so return the event ID as it is the root.
-    if (!event->unsignedPart<QJsonObject>("m.relations"_ls).isEmpty() && event->unsignedPart<QJsonObject>("m.relations"_ls).contains("m.thread"_ls)) {
-        return id(event);
+    if (!m_event->unsignedPart<QJsonObject>("m.relations"_ls).isEmpty() && m_event->unsignedPart<QJsonObject>("m.relations"_ls).contains("m.thread"_ls)) {
+        return getId();
     }
     return {};
 }
 
-float EventHandler::latitude(const Quotient::RoomEvent *event)
+float EventHandler::getLatitude() const
 {
-    if (event == nullptr) {
-        qCWarning(EventHandling) << "latitude called with event set to nullptr.";
+    if (m_event == nullptr) {
+        qCWarning(EventHandling) << "getLatitude called with m_event set to nullptr.";
         return -100.0;
     }
 
-    const auto geoUri = event->contentJson()["geo_uri"_ls].toString();
+    const auto geoUri = m_event->contentJson()["geo_uri"_ls].toString();
     if (geoUri.isEmpty()) {
         return -100.0; // latitude runs from -90deg to +90deg so -100 is out of range.
     }
@@ -851,14 +920,14 @@ float EventHandler::latitude(const Quotient::RoomEvent *event)
     return latitude.toFloat();
 }
 
-float EventHandler::longitude(const Quotient::RoomEvent *event)
+float EventHandler::getLongitude() const
 {
-    if (event == nullptr) {
-        qCWarning(EventHandling) << "longitude called with event set to nullptr.";
+    if (m_event == nullptr) {
+        qCWarning(EventHandling) << "getLongitude called with m_event set to nullptr.";
         return -200.0;
     }
 
-    const auto geoUri = event->contentJson()["geo_uri"_ls].toString();
+    const auto geoUri = m_event->contentJson()["geo_uri"_ls].toString();
     if (geoUri.isEmpty()) {
         return -200.0; // longitude runs from -180deg to +180deg so -200 is out of range.
     }
@@ -866,18 +935,116 @@ float EventHandler::longitude(const Quotient::RoomEvent *event)
     return latitude.toFloat();
 }
 
-QString EventHandler::locationAssetType(const Quotient::RoomEvent *event)
+QString EventHandler::getLocationAssetType() const
 {
-    if (event == nullptr) {
-        qCWarning(EventHandling) << "locationAssetType called with event set to nullptr.";
+    if (m_event == nullptr) {
+        qCWarning(EventHandling) << "getLocationAssetType called with m_event set to nullptr.";
         return {};
     }
 
-    const auto assetType = event->contentJson()["org.matrix.msc3488.asset"_ls].toObject()["type"_ls].toString();
+    const auto assetType = m_event->contentJson()["org.matrix.msc3488.asset"_ls].toObject()["type"_ls].toString();
     if (assetType.isEmpty()) {
         return {};
     }
     return assetType;
 }
 
+bool EventHandler::hasReadMarkers() const
+{
+    if (m_room == nullptr) {
+        qCWarning(EventHandling) << "hasReadMarkers called with m_room set to nullptr.";
+        return false;
+    }
+    if (m_event == nullptr) {
+        qCWarning(EventHandling) << "hasReadMarkers called with m_event set to nullptr.";
+        return false;
+    }
+
+    auto userIds = m_room->userIdsAtEvent(m_event->id());
+    userIds.remove(m_room->localMember().id());
+    return userIds.size() > 0;
+}
+
+QList<Quotient::RoomMember> EventHandler::getReadMarkers(int maxMarkers) const
+{
+    if (m_room == nullptr) {
+        qCWarning(EventHandling) << "getReadMarkers called with m_room set to nullptr.";
+        return {};
+    }
+    if (m_event == nullptr) {
+        qCWarning(EventHandling) << "getReadMarkers called with m_event set to nullptr.";
+        return {};
+    }
+
+    auto userIds_temp = m_room->userIdsAtEvent(m_event->id());
+    userIds_temp.remove(m_room->localMember().id());
+
+    auto userIds = userIds_temp.values();
+    if (userIds.count() > maxMarkers) {
+        userIds = userIds.mid(0, maxMarkers);
+    }
+
+    QList<Quotient::RoomMember> users;
+    users.reserve(userIds.size());
+    for (const auto &userId : userIds) {
+        users += m_room->member(userId);
+    }
+
+    return users;
+}
+
+QString EventHandler::getNumberExcessReadMarkers(int maxMarkers) const
+{
+    if (m_room == nullptr) {
+        qCWarning(EventHandling) << "getNumberExcessReadMarkers called with m_room set to nullptr.";
+        return {};
+    }
+    if (m_event == nullptr) {
+        qCWarning(EventHandling) << "getNumberExcessReadMarkers called with m_event set to nullptr.";
+        return {};
+    }
+
+    auto userIds = m_room->userIdsAtEvent(m_event->id());
+    userIds.remove(m_room->localMember().id());
+
+    if (userIds.count() > maxMarkers) {
+        return QStringLiteral("+ ") + QString::number(userIds.count() - maxMarkers);
+    } else {
+        return QString();
+    }
+}
+
+QString EventHandler::getReadMarkersString() const
+{
+    if (m_room == nullptr) {
+        qCWarning(EventHandling) << "getReadMarkersString called with m_room set to nullptr.";
+        return {};
+    }
+    if (m_event == nullptr) {
+        qCWarning(EventHandling) << "getReadMarkersString called with m_event set to nullptr.";
+        return {};
+    }
+
+    auto userIds = m_room->userIdsAtEvent(m_event->id());
+    userIds.remove(m_room->localMember().id());
+
+    /**
+     * The string ends up in the form
+     * "x users: user1DisplayName, user2DisplayName, etc."
+     */
+    QString readMarkersString = i18np("1 user: ", "%1 users: ", userIds.size());
+    for (const auto &userId : userIds) {
+        auto member = m_room->member(userId);
+        QString displayName;
+        if (member.isEmpty()) {
+            displayName = i18nc("A member who is not in the room has been requested.", "unknown member");
+        } else {
+            displayName = member.displayName();
+        }
+        readMarkersString += displayName + i18nc("list separator", ", ");
+    }
+    readMarkersString.chop(2);
+    return readMarkersString;
+}
+
 #include "moc_eventhandler.cpp"

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,19 +38,40 @@ 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 author of the event in context of the room.
+     *
+     * An empty Quotient::RoomMember will be returned if the EventHandler hasn't had
+     * the room or event initialised.
+     *
+     * @param isPending if the event is pending, i.e. has not been confirmed by
+     *                  the server.
+     *
+     * @return a Quotient::RoomMember object for the user.
+     *
+     * @sa Quotient::RoomMember
+     */
+    Quotient::RoomMember getAuthor(bool isPending = false) const;
 
     /**
      * @brief Get the display name of the event author.
      *
-     * This method is special in that it will return
+     * This method is separate from getAuthor() and special in that it will return
      * the old display name of the author if the current event is one that caused it
      * to change. This allows for scenarios where the UI wishes to notify that a
      * user's display name has changed and what it changed from.
@@ -56,7 +79,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 +90,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 +111,14 @@ 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 = {});
-
-    /**
-     * @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(bool relative, QLocale::FormatType format = QLocale::ShortFormat, bool isPending = false, QDateTime lastUpdated = {}) const;
 
     /**
      * @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 +127,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 +159,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 +175,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 +195,9 @@ public:
      * E.g. For a message the text will be:
      *      "sent a message"
      *
-     * @sa richBody(), plainBody()
+     * @sa getRichBody(), getPlainBody()
      */
-    static QString genericBody(const Quotient::RoomEvent *event);
+    QString getGenericBody() const;
 
     /**
      * @brief Output a string for the event to be used as  a RoomList subtitle.
@@ -200,7 +205,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 +223,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 +253,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 +327,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,21 +335,60 @@ 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;
+
+    /**
+     * @brief Whether the event has any read marker for other users.
+     */
+    bool hasReadMarkers() const;
+
+    /**
+     * @brief Returns a list of user read marker for the event.
+     *
+     * @param maxMarkers the maximum number of users to return. Usually the number
+     *                   of user read makers shown is limited to not clutter the UI.
+     *                   This needs to be the same as used in getNumberExcessReadMarkers
+     *                   so that the markers line up with the number displayed, i.e.
+     *                   the number of users shown plus the excess number will be
+     *                   the total number of other user read markers at an event.
+     */
+    QList<Quotient::RoomMember> getReadMarkers(int maxMarkers = 5) const;
+
+    /**
+     * @brief Returns the number of excess user read markers for the event.
+     *
+     * This returns a string in the form "+ x" ready for use in the UI.
+     *
+     * @param maxMarkers the maximum number of markers shown in the UI. This needs to
+     *                   be the same as used in getReadMarkers so that the value lines
+     *                   up with the number displayed, i.e. the number of users shown
+     *                   plus the excess number will be the total number of other user
+     *                   read markers at an event.
+     */
+    QString getNumberExcessReadMarkers(int maxMarkers = 5) const;
+
+    /**
+     * @brief Returns a string with the names of the read markers at the event.
+     *
+     * This is in the form "x users: name 1, name 2, ...".
+     */
+    QString getReadMarkersString() 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,
-                                                const Quotient::EventContent::FileInfo *fileInfo,
-                                                const QString &eventId,
-                                                bool isThumbnail = false,
-                                                bool isSticker = false);
+    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(const Quotient::EventContent::FileInfo *fileInfo, const QString &eventId, bool isThumbnail = false, bool isSticker = false) const;
 };

src/events/imagepackevent.cpp

@@ -3,7 +3,6 @@
 
 #include "imagepackevent.h"
 #include <QJsonObject>
-#include <Quotient/omittable.h>
 
 using namespace Quotient;
 
@@ -11,10 +10,10 @@ ImagePackEventContent::ImagePackEventContent(const QJsonObject &json)
 {
     if (json.contains(QStringLiteral("pack"))) {
         pack = ImagePackEventContent::Pack{
-            fromJson<Omittable<QString>>(json["pack"_ls].toObject()["display_name"_ls]),
-            fromJson<Omittable<QUrl>>(json["pack"_ls].toObject()["avatar_url"_ls]),
-            fromJson<Omittable<QStringList>>(json["pack"_ls].toObject()["usage"_ls]),
-            fromJson<Omittable<QString>>(json["pack"_ls].toObject()["attribution"_ls]),
+            fromJson<std::optional<QString>>(json["pack"_ls].toObject()["display_name"_ls]),
+            fromJson<std::optional<QUrl>>(json["pack"_ls].toObject()["avatar_url"_ls]),
+            fromJson<std::optional<QStringList>>(json["pack"_ls].toObject()["usage"_ls]),
+            fromJson<std::optional<QString>>(json["pack"_ls].toObject()["attribution"_ls]),
         };
     } else {
         pack = std::nullopt;
@@ -31,9 +30,9 @@ ImagePackEventContent::ImagePackEventContent(const QJsonObject &json)
         images += ImagePackImage{
             k,
             fromJson<QUrl>(json["images"_ls][k]["url"_ls].toString()),
-            fromJson<Omittable<QString>>(json["images"_ls][k]["body"_ls]),
+            fromJson<std::optional<QString>>(json["images"_ls][k]["body"_ls]),
             info,
-            fromJson<Omittable<QStringList>>(json["images"_ls][k]["usage"_ls]),
+            fromJson<std::optional<QStringList>>(json["images"_ls][k]["usage"_ls]),
         };
     }
 }

src/fakerunner.cpp

@@ -14,15 +14,12 @@ Q_SCRIPTABLE RemoteActions FakeRunner::Actions()
 
 Q_SCRIPTABLE RemoteMatches FakeRunner::Match(const QString &searchTerm)
 {
-    Q_UNUSED(searchTerm);
     QCoreApplication::quit();
     return {};
 }
 
 Q_SCRIPTABLE void FakeRunner::Run(const QString &id, const QString &actionId)
 {
-    Q_UNUSED(id);
-    Q_UNUSED(actionId);
     QCoreApplication::quit();
 }
 

src/foreigntypes.h

@@ -7,16 +7,25 @@
 
 #include <Quotient/accountregistry.h>
 #include <Quotient/e2ee/sssshandler.h>
-#include <Quotient/keyverificationsession.h>
-#include <Quotient/roommember.h>
-
-#if Quotient_VERSION_MINOR > 8
 #include <Quotient/keyimport.h>
-#endif
+#include <Quotient/keyverificationsession.h>
 
 #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)
@@ -43,11 +52,9 @@ struct ForeignSSSSHandler {
     QML_NAMED_ELEMENT(SSSSHandler)
 };
 
-#if Quotient_VERSION_MINOR > 8
 struct ForeignKeyImport {
     Q_GADGET
-    QML_SINGLETON
     QML_FOREIGN(Quotient::KeyImport)
     QML_NAMED_ELEMENT(KeyImport)
+    QML_SINGLETON
 };
-#endif

src/identityserverhelper.cpp

@@ -33,6 +33,43 @@ void IdentityServerHelper::setConnection(NeoChatConnection *connection)
 
     m_connection = connection;
     Q_EMIT connectionChanged();
+    Q_EMIT currentServerChanged();
+
+    connect(m_connection, &NeoChatConnection::accountDataChanged, this, [this](const QString &type) {
+        if (type == QLatin1String("m.identity_server")) {
+            Q_EMIT currentServerChanged();
+        }
+    });
+}
+
+QString IdentityServerHelper::currentServer() const
+{
+    if (m_connection == nullptr) {
+        return {};
+    }
+
+    if (!m_connection->hasAccountData(QLatin1String("m.identity_server"))) {
+        return i18nc("@info", "No identity server configured");
+    }
+
+    const auto url = m_connection->accountData(QLatin1String("m.identity_server"))->contentPart<QUrl>(QLatin1String("base_url"));
+    if (!url.isEmpty()) {
+        return url.toString();
+    }
+    return i18nc("@info", "No identity server configured");
+}
+
+bool IdentityServerHelper::hasCurrentServer() const
+{
+    if (m_connection == nullptr && !m_connection->hasAccountData(QLatin1String("m.identity_server"))) {
+        return false;
+    }
+
+    const auto url = m_connection->accountData(QLatin1String("m.identity_server"))->contentPart<QUrl>(QLatin1String("base_url"));
+    if (!url.isEmpty()) {
+        return true;
+    }
+    return false;
 }
 
 QString IdentityServerHelper::url() const
@@ -63,7 +100,7 @@ void IdentityServerHelper::checkUrl()
         m_idServerCheckRequest.clear();
     }
 
-    if (m_url == m_connection->identityServer().toString()) {
+    if (m_url == currentServer()) {
         m_status = Match;
         Q_EMIT statusChanged();
         return;
@@ -97,7 +134,7 @@ void IdentityServerHelper::checkUrl()
 
 void IdentityServerHelper::setIdentityServer()
 {
-    if (m_url == m_connection->identityServer().toString()) {
+    if (m_url == currentServer()) {
         return;
     }
 
@@ -108,12 +145,10 @@ void IdentityServerHelper::setIdentityServer()
 
 void IdentityServerHelper::clearIdentityServer()
 {
-    if (m_connection->identityServer().isEmpty()) {
+    if (currentServer().isEmpty()) {
         return;
     }
     m_connection->setAccountData(QLatin1String("m.identity_server"), {{QLatin1String("base_url"), QString()}});
     m_status = Ready;
     Q_EMIT statusChanged();
 }
-
-#include "moc_identityserverhelper.cpp"

src/identityserverhelper.h

@@ -26,6 +26,16 @@ class IdentityServerHelper : public QObject
      */
     Q_PROPERTY(NeoChatConnection *connection READ connection WRITE setConnection NOTIFY connectionChanged)
 
+    /**
+     * @brief The current identity server.
+     */
+    Q_PROPERTY(QString currentServer READ currentServer NOTIFY currentServerChanged)
+
+    /**
+     * @brief Whether an identity server is currently configured.
+     */
+    Q_PROPERTY(bool hasCurrentServer READ hasCurrentServer NOTIFY currentServerChanged)
+
     /**
      * @brief The URL for the desired server.
      */
@@ -54,6 +64,10 @@ public:
     [[nodiscard]] NeoChatConnection *connection() const;
     void setConnection(NeoChatConnection *connection);
 
+    [[nodiscard]] QString currentServer() const;
+
+    [[nodiscard]] bool hasCurrentServer() const;
+
     [[nodiscard]] QString url() const;
     void setUrl(const QString &url);
 
@@ -73,6 +87,7 @@ public:
 
 Q_SIGNALS:
     void connectionChanged();
+    void currentServerChanged();
     void urlChanged();
     void statusChanged();
 

src/jobs/neochatadd3pidjob.h

@@ -9,5 +9,5 @@
 class NeochatAdd3PIdJob : public Quotient::BaseJob
 {
 public:
-    explicit NeochatAdd3PIdJob(const QString &clientSecret, const QString &sid, const Quotient::Omittable<QJsonObject> &auth = {});
+    explicit NeochatAdd3PIdJob(const QString &clientSecret, const QString &sid, const Quotient::Omittable<QJsonObject> &auth = Quotient::none);
 };

src/jobs/neochatchangepasswordjob.cpp

@@ -5,7 +5,7 @@
 
 using namespace Quotient;
 
-NeochatChangePasswordJob::NeochatChangePasswordJob(const QString &newPassword, bool logoutDevices, const Omittable<QJsonObject> &auth)
+NeochatChangePasswordJob::NeochatChangePasswordJob(const QString &newPassword, bool logoutDevices, const std::optional<QJsonObject> &auth)
     : BaseJob(HttpVerb::Post, QStringLiteral("ChangePasswordJob"), "/_matrix/client/r0/account/password")
 {
     QJsonObject _data;

src/jobs/neochatchangepasswordjob.h

@@ -5,10 +5,8 @@
 
 #include <Quotient/jobs/basejob.h>
 
-#include <Quotient/omittable.h>
-
 class NeochatChangePasswordJob : public Quotient::BaseJob
 {
 public:
-    explicit NeochatChangePasswordJob(const QString &newPassword, bool logoutDevices, const Quotient::Omittable<QJsonObject> &auth = {});
+    explicit NeochatChangePasswordJob(const QString &newPassword, bool logoutDevices, const std::optional<QJsonObject> &auth = std::nullopt);
 };

src/jobs/neochatdeactivateaccountjob.cpp

@@ -5,7 +5,7 @@
 
 using namespace Quotient;
 
-NeoChatDeactivateAccountJob::NeoChatDeactivateAccountJob(const Omittable<QJsonObject> &auth)
+NeoChatDeactivateAccountJob::NeoChatDeactivateAccountJob(const std::optional<QJsonObject> &auth)
     : BaseJob(HttpVerb::Post, QStringLiteral("DisableDeviceJob"), "_matrix/client/v3/account/deactivate")
 {
     QJsonObject data;

src/jobs/neochatdeactivateaccountjob.h

@@ -4,10 +4,9 @@
 #pragma once
 
 #include <Quotient/jobs/basejob.h>
-#include <Quotient/omittable.h>
 
 class NeoChatDeactivateAccountJob : public Quotient::BaseJob
 {
 public:
-    explicit NeoChatDeactivateAccountJob(const Quotient::Omittable<QJsonObject> &auth = {});
+    explicit NeoChatDeactivateAccountJob(const std::optional<QJsonObject> &auth = std::nullopt);
 };

src/jobs/neochatdeletedevicejob.cpp

@@ -5,7 +5,7 @@
 
 using namespace Quotient;
 
-NeochatDeleteDeviceJob::NeochatDeleteDeviceJob(const QString &deviceId, const Omittable<QJsonObject> &auth)
+NeochatDeleteDeviceJob::NeochatDeleteDeviceJob(const QString &deviceId, const std::optional<QJsonObject> &auth)
     : BaseJob(HttpVerb::Delete, QStringLiteral("DeleteDeviceJob"), QStringLiteral("/_matrix/client/r0/devices/%1").arg(deviceId).toLatin1())
 {
     QJsonObject _data;

src/jobs/neochatdeletedevicejob.h

@@ -4,10 +4,9 @@
 #pragma once
 
 #include <Quotient/jobs/basejob.h>
-#include <Quotient/omittable.h>
 
 class NeochatDeleteDeviceJob : public Quotient::BaseJob
 {
 public:
-    explicit NeochatDeleteDeviceJob(const QString &deviceId, const Quotient::Omittable<QJsonObject> &auth = {});
+    explicit NeochatDeleteDeviceJob(const QString &deviceId, const std::optional<QJsonObject> &auth = std::nullopt);
 };

src/jobs/neochatgetcommonroomsjob.cpp

@@ -1,14 +0,0 @@
-// SPDX-FileCopyrightText: 2024 Joshua Goins <josh@redstrate.com>
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "neochatgetcommonroomsjob.h"
-
-using namespace Quotient;
-
-NeochatGetCommonRoomsJob::NeochatGetCommonRoomsJob(const QString &userId)
-    : BaseJob(HttpVerb::Get,
-              QStringLiteral("GetCommonRoomsJob"),
-              QStringLiteral("/_matrix/client/unstable/uk.half-shot.msc2666/user/mutual_rooms").toLatin1(),
-              QUrlQuery({{QStringLiteral("user_id"), userId}}))
-{
-}

src/jobs/neochatgetcommonroomsjob.h

@@ -1,14 +0,0 @@
-// SPDX-FileCopyrightText: 2024 Joshua Goins <josh@redstrate.com>
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include <Quotient/jobs/basejob.h>
-#include <Quotient/omittable.h>
-
-// TODO: Upstream to libQuotient
-class NeochatGetCommonRoomsJob : public Quotient::BaseJob
-{
-public:
-    explicit NeochatGetCommonRoomsJob(const QString &userId);
-};

src/locationhelper.cpp

@@ -40,7 +40,7 @@ float LocationHelper::zoomToFit(const QRectF &r, float mapWidth, float mapHeight
     const auto zy = std::log2((mapHeight / (p2.y() - p1.y())));
     const auto z = std::min(zx, zy);
 
-    return z;
+    return std::clamp(z, 5.0, 18.0);
 }
 
 #include "moc_locationhelper.cpp"

src/login.cpp

@@ -54,19 +54,14 @@ void LoginHelper::init()
             m_connection = new NeoChatConnection();
         }
         m_connection->resolveServer(m_matrixId);
-        connect(
-            m_connection.get(),
-            &Connection::loginFlowsChanged,
-            this,
-            [this]() {
-                setHomeserverReachable(true);
-                m_testing = false;
-                Q_EMIT testingChanged();
-                m_supportsSso = m_connection->supportsSso();
-                m_supportsPassword = m_connection->supportsPasswordAuth();
-                Q_EMIT loginFlowsChanged();
-            },
-            Qt::SingleShotConnection);
+        connectSingleShot(m_connection.get(), &Connection::loginFlowsChanged, this, [this]() {
+            setHomeserverReachable(true);
+            m_testing = false;
+            Q_EMIT testingChanged();
+            m_supportsSso = m_connection->supportsSso();
+            m_supportsPassword = m_connection->supportsPasswordAuth();
+            Q_EMIT loginFlowsChanged();
+        });
     });
     connect(m_connection, &Connection::connected, this, [this] {
         Q_EMIT connected();
@@ -78,7 +73,9 @@ void LoginHelper::init()
         account.setHomeserver(m_connection->homeserver());
         account.setDeviceId(m_connection->deviceId());
         account.setDeviceName(m_deviceName);
-        Controller::instance().saveAccessTokenToKeyChain(account.userId(), m_connection->accessToken());
+        if (!Controller::instance().saveAccessTokenToKeyChain(account.userId(), m_connection->accessToken())) {
+            qWarning() << "Couldn't save access token";
+        }
         account.sync();
         Controller::instance().addConnection(m_connection);
         Controller::instance().setActiveConnection(m_connection);
@@ -103,14 +100,9 @@ void LoginHelper::init()
         Q_EMIT Controller::instance().errorOccured(i18n("Network Error"), std::move(error));
     });
 
-    connect(
-        m_connection.get(),
-        &Connection::syncDone,
-        this,
-        [this]() {
-            Q_EMIT loaded();
-        },
-        Qt::SingleShotConnection);
+    connectSingleShot(m_connection.get(), &Connection::syncDone, this, [this]() {
+        Q_EMIT loaded();
+    });
 }
 
 void LoginHelper::setHomeserverReachable(bool reachable)
@@ -190,16 +182,11 @@ QUrl LoginHelper::ssoUrl() const
 void LoginHelper::loginWithSso()
 {
     m_connection->resolveServer(m_matrixId);
-    connect(
-        m_connection.get(),
-        &Connection::loginFlowsChanged,
-        this,
-        [this]() {
-            SsoSession *session = m_connection->prepareForSso(m_deviceName);
-            m_ssoUrl = session->ssoUrl();
-            Q_EMIT ssoUrlChanged();
-        },
-        Qt::SingleShotConnection);
+    connectSingleShot(m_connection.get(), &Connection::loginFlowsChanged, this, [this]() {
+        SsoSession *session = m_connection->prepareForSso(m_deviceName);
+        m_ssoUrl = session->ssoUrl();
+        Q_EMIT ssoUrlChanged();
+    });
 }
 
 bool LoginHelper::testing() const

src/login/CMakeLists.txt

@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: BSD-2-Clause
 
 qt_add_library(login STATIC)
-ecm_add_qml_module(login GENERATE_PLUGIN_SOURCE
+qt_add_qml_module(login
     URI org.kde.neochat.login
     OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/src/org/kde/neochat/login
     QML_FILES

src/login/Loading.qml

@@ -13,7 +13,7 @@ LoginStep {
     id: root
 
     FormCard.FormTextDelegate {
-        text: i18n("Please wait while your messages are loaded from the server. This might take a little while.")
+        text: i18n("Please wait. This might take a little while.")
     }
     FormCard.AbstractFormDelegate {
         contentItem: QQC2.BusyIndicator {}

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", "Remove 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 onErrorOccured(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"
-                    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"
-                    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

@@ -148,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"));
@@ -185,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"));
@@ -304,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/models/actionsmodel.cpp

@@ -4,7 +4,6 @@
 #include "actionsmodel.h"
 
 #include "chatbarcache.h"
-#include "controller.h"
 #include "neochatconnection.h"
 #include "neochatroom.h"
 #include "roommanager.h"
@@ -24,15 +23,14 @@ QStringList rainbowColors{"#ff2b00"_ls, "#ff5500"_ls, "#ff8000"_ls, "#ffaa00"_ls
 
 auto leaveRoomLambda = [](const QString &text, NeoChatRoom *room, ChatBarCache *) {
     if (text.isEmpty()) {
-        Q_EMIT Controller::instance().showMessage(Controller::Info, i18n("Leaving this room."));
+        Q_EMIT room->showMessage(NeoChatRoom::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 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));
+            Q_EMIT room->showMessage(NeoChatRoom::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);
@@ -40,10 +38,10 @@ auto leaveRoomLambda = [](const QString &text, NeoChatRoom *room, ChatBarCache *
             leaving = room->connection()->roomByAlias(text);
         }
         if (leaving) {
-            Q_EMIT Controller::instance().showMessage(Controller::Info, i18nc("Leaving room <roomname>.", "Leaving room %1.", text));
+            Q_EMIT room->showMessage(NeoChatRoom::Info, i18nc("Leaving room <roomname>.", "Leaving room %1.", text));
             room->connection()->leaveRoom(leaving);
         } else {
-            Q_EMIT Controller::instance().showMessage(Controller::Info, i18nc("Room <roomname> not found", "Room %1 not found.", text));
+            Q_EMIT room->showMessage(NeoChatRoom::Info, i18nc("Room <roomname> not found", "Room %1 not found.", text));
         }
     }
     return QString();
@@ -51,7 +49,7 @@ auto leaveRoomLambda = [](const QString &text, NeoChatRoom *room, ChatBarCache *
 
 auto roomNickLambda = [](const QString &text, NeoChatRoom *room, ChatBarCache *) {
     if (text.isEmpty()) {
-        Q_EMIT Controller::instance().showMessage(Controller::Error, i18n("No new nickname provided, no changes will happen."));
+        Q_EMIT room->showMessage(NeoChatRoom::Error, i18n("No new nickname provided, no changes will happen."));
     } else {
         room->connection()->user()->rename(text, room);
     }
@@ -193,31 +191,28 @@ 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 Controller::instance().showMessage(Controller::Error,
-                                                          i18nc("'<text>' does not look like a matrix id.", "'%1' does not look like a matrix id.", text));
+                Q_EMIT room->showMessage(NeoChatRoom::Error, i18nc("'<text>' does not look like a matrix id.", "'%1' does not look like a matrix id.", text));
                 return QString();
             }
             const RoomMemberEvent *roomMemberEvent = room->currentState().get<RoomMemberEvent>(text);
             if (roomMemberEvent && roomMemberEvent->membership() == Membership::Invite) {
-                Q_EMIT Controller::instance().showMessage(Controller::Info,
-                                                          i18nc("<user> is already invited to this room.", "%1 is already invited to this room.", text));
+                Q_EMIT room->showMessage(NeoChatRoom::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 Controller::instance().showMessage(Controller::Info, i18nc("<user> is banned from this room.", "%1 is banned from this room.", text));
+                Q_EMIT room->showMessage(NeoChatRoom::Info, i18nc("<user> is banned from this room.", "%1 is banned from this room.", text));
                 return QString();
             }
             if (room->localMember().id() == text) {
-                Q_EMIT Controller::instance().showMessage(Controller::Positive, i18n("You are already in this room."));
+                Q_EMIT room->showMessage(NeoChatRoom::Positive, i18n("You are already in this room."));
                 return QString();
             }
-            if (room->joinedMemberIds().contains(text)) {
-                Q_EMIT Controller::instance().showMessage(Controller::Info, i18nc("<user> is already in this room.", "%1 is already in this room.", text));
+            if (room->members().contains(room->member(text))) {
+                Q_EMIT room->showMessage(NeoChatRoom::Info, i18nc("<user> is already in this room.", "%1 is already in this room.", text));
                 return QString();
             }
             room->inviteToRoom(text);
-            Q_EMIT Controller::instance().showMessage(Controller::Positive,
-                                                      i18nc("<username> was invited into this room", "%1 was invited into this room", text));
+            Q_EMIT room->showMessage(NeoChatRoom::Positive, i18nc("<username> was invited into this room", "%1 was invited into this room", text));
             return QString();
         },
         false,
@@ -231,9 +226,8 @@ QList<ActionsModel::Action> actions{
             QRegularExpression roomRegex(QStringLiteral(R"(^[#!][^:]+:\w(?:\w|\.|-)*\.\w+(?::\d{1,5})?)"));
             auto regexMatch = roomRegex.match(text);
             if (!regexMatch.hasMatch()) {
-                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));
+                Q_EMIT room->showMessage(NeoChatRoom::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);
@@ -241,7 +235,7 @@ QList<ActionsModel::Action> actions{
                 RoomManager::instance().resolveResource(targetRoom->id());
                 return QString();
             }
-            Q_EMIT Controller::instance().showMessage(Controller::Info, i18nc("Joining room <roomname>.", "Joining room %1.", text));
+            Q_EMIT room->showMessage(NeoChatRoom::Info, i18nc("Joining room <roomname>.", "Joining room %1.", text));
             RoomManager::instance().resolveResource(text, "join"_ls);
             return QString();
         },
@@ -258,9 +252,8 @@ QList<ActionsModel::Action> actions{
             QRegularExpression roomRegex(QStringLiteral(R"(^[#!][^:]+:\w(?:\w|\.|-)*\.\w+(?::\d{1,5})?)"));
             auto regexMatch = roomRegex.match(roomName);
             if (!regexMatch.hasMatch()) {
-                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));
+                Q_EMIT room->showMessage(NeoChatRoom::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);
@@ -268,7 +261,7 @@ QList<ActionsModel::Action> actions{
                 RoomManager::instance().resolveResource(targetRoom->id());
                 return QString();
             }
-            Q_EMIT Controller::instance().showMessage(Controller::Info, i18nc("Knocking room <roomname>.", "Knocking room %1.", text));
+            Q_EMIT room->showMessage(NeoChatRoom::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) {
@@ -289,16 +282,15 @@ QList<ActionsModel::Action> actions{
             QRegularExpression roomRegex(QStringLiteral(R"(^[#!][^:]+:\w(?:\w|\.|-)*\.\w+(?::\d{1,5})?)"));
             auto regexMatch = roomRegex.match(text);
             if (!regexMatch.hasMatch()) {
-                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));
+                Q_EMIT room->showMessage(NeoChatRoom::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 Controller::instance().showMessage(Controller::Info, i18nc("You are already in room <roomname>.", "You are already in room %1.", text));
+                Q_EMIT room->showMessage(NeoChatRoom::Info, i18nc("You are already in room <roomname>.", "You are already in room %1.", text));
                 return QString();
             }
-            Q_EMIT Controller::instance().showMessage(Controller::Info, i18nc("Joining room <roomname>.", "Joining room %1.", text));
+            Q_EMIT room->showMessage(NeoChatRoom::Info, i18nc("Joining room <roomname>.", "Joining room %1.", text));
             RoomManager::instance().resolveResource(text, "join"_ls);
             return QString();
         },
@@ -327,7 +319,7 @@ QList<ActionsModel::Action> actions{
         QStringLiteral("nick"),
         [](const QString &text, NeoChatRoom *room, ChatBarCache *) {
             if (text.isEmpty()) {
-                Q_EMIT Controller::instance().showMessage(Controller::Error, i18n("No new nickname provided, no changes will happen."));
+                Q_EMIT room->showMessage(NeoChatRoom::Error, i18n("No new nickname provided, no changes will happen."));
             } else {
                 room->connection()->user()->rename(text);
             }
@@ -361,17 +353,15 @@ 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 Controller::instance().showMessage(Controller::Error,
-                                                          i18nc("'<text>' does not look like a matrix id.", "'%1' does not look like a matrix id.", text));
+                Q_EMIT room->showMessage(NeoChatRoom::Error, i18nc("'<text>' does not look like a matrix id.", "'%1' does not look like a matrix id.", text));
                 return QString();
             }
             if (room->connection()->ignoredUsers().contains(text)) {
-                Q_EMIT Controller::instance().showMessage(Controller::Info, i18nc("<username> is already ignored.", "%1 is already ignored.", text));
+                Q_EMIT room->showMessage(NeoChatRoom::Info, i18nc("<username> is already ignored.", "%1 is already ignored.", text));
                 return QString();
             }
             room->connection()->addToIgnoredUsers(text);
-            Q_EMIT Controller::instance().showMessage(Controller::Positive, i18nc("<username> is now ignored", "%1 is now ignored.", text));
-
+            Q_EMIT room->showMessage(NeoChatRoom::Positive, i18nc("<username> is now ignored", "%1 is now ignored.", text));
             return QString();
         },
         false,
@@ -386,16 +376,15 @@ 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 Controller::instance().showMessage(Controller::Error,
-                                                          i18nc("'<text>' does not look like a matrix id.", "'%1' does not look like a matrix id.", text));
+                Q_EMIT room->showMessage(NeoChatRoom::Error, i18nc("'<text>' does not look like a matrix id.", "'%1' does not look like a matrix id.", text));
                 return QString();
             }
             if (!room->connection()->ignoredUsers().contains(text)) {
-                Q_EMIT Controller::instance().showMessage(Controller::Info, i18nc("<username> is not ignored.", "%1 is not ignored.", text));
+                Q_EMIT room->showMessage(NeoChatRoom::Info, i18nc("<username> is not ignored.", "%1 is not ignored.", text));
                 return QString();
             }
             room->connection()->removeFromIgnoredUsers(text);
-            Q_EMIT Controller::instance().showMessage(Controller::Positive, i18nc("<username> is no longer ignored.", "%1 is no longer ignored.", text));
+            Q_EMIT room->showMessage(NeoChatRoom::Positive, i18nc("<username> is no longer ignored.", "%1 is no longer ignored.", text));
             return QString();
         },
         false,
@@ -431,14 +420,12 @@ 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 Controller::instance().showMessage(Controller::Error,
-                                                          i18nc("'<text>' does not look like a matrix id.", "'%1' does not look like a matrix id.", text));
+                Q_EMIT room->showMessage(NeoChatRoom::Error, i18nc("'<text>' does not look like a matrix id.", "'%1' does not look like a matrix id.", text));
                 return QString();
             }
             auto state = room->currentState().get<RoomMemberEvent>(parts[0]);
             if (state && state->membership() == Membership::Ban) {
-                Q_EMIT Controller::instance().showMessage(Controller::Info,
-                                                          i18nc("<user> is already banned from this room.", "%1 is already banned from this room.", text));
+                Q_EMIT room->showMessage(NeoChatRoom::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>();
@@ -446,18 +433,17 @@ QList<ActionsModel::Action> actions{
                 return QString();
             }
             if (plEvent->ban() > plEvent->powerLevelForUser(room->localMember().id())) {
-                Q_EMIT Controller::instance().showMessage(Controller::Error, i18n("You are not allowed to ban users from this room."));
+                Q_EMIT room->showMessage(NeoChatRoom::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 Controller::instance().showMessage(
-                    Controller::Error,
+                Q_EMIT room->showMessage(
+                    NeoChatRoom::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 Controller::instance().showMessage(Controller::Positive,
-                                                      i18nc("<username> was banned from this room.", "%1 was banned from this room.", parts[0]));
+            Q_EMIT room->showMessage(NeoChatRoom::Positive, i18nc("<username> was banned from this room.", "%1 was banned from this room.", parts[0]));
             return QString();
         },
         false,
@@ -472,8 +458,7 @@ 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 Controller::instance().showMessage(Controller::Error,
-                                                          i18nc("'<text>' does not look like a matrix id.", "'%1' does not look like a matrix id.", text));
+                Q_EMIT room->showMessage(NeoChatRoom::Error, i18nc("'<text>' does not look like a matrix id.", "'%1' does not look like a matrix id.", text));
                 return QString();
             }
             auto plEvent = room->currentState().get<RoomPowerLevelsEvent>();
@@ -481,18 +466,16 @@ QList<ActionsModel::Action> actions{
                 return QString();
             }
             if (plEvent->ban() > plEvent->powerLevelForUser(room->localMember().id())) {
-                Q_EMIT Controller::instance().showMessage(Controller::Error, i18n("You are not allowed to unban users from this room."));
+                Q_EMIT room->showMessage(NeoChatRoom::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 Controller::instance().showMessage(Controller::Info,
-                                                          i18nc("<user> is not banned from this room.", "%1 is not banned from this room.", text));
+                Q_EMIT room->showMessage(NeoChatRoom::Info, i18nc("<user> is not banned from this room.", "%1 is not banned from this room.", text));
                 return QString();
             }
             room->unban(text);
-            Q_EMIT Controller::instance().showMessage(Controller::Positive,
-                                                      i18nc("<username> was unbanned from this room.", "%1 was unbanned from this room.", text));
+            Q_EMIT room->showMessage(NeoChatRoom::Positive, i18nc("<username> was unbanned from this room.", "%1 was unbanned from this room.", text));
 
             return QString();
         },
@@ -509,16 +492,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 Controller::instance().showMessage(Controller::Error,
-                                                          i18nc("'<text>' does not look like a matrix id.", "'%1' does not look like a matrix id.", parts[0]));
+                Q_EMIT room->showMessage(NeoChatRoom::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 Controller::instance().showMessage(Controller::Error, i18n("You cannot kick yourself from the room."));
+                Q_EMIT room->showMessage(NeoChatRoom::Error, i18n("You cannot kick yourself from the room."));
                 return QString();
             }
             if (!room->isMember(parts[0])) {
-                Q_EMIT Controller::instance().showMessage(Controller::Error, i18nc("<username> is not in this room", "%1 is not in this room.", parts[0]));
+                Q_EMIT room->showMessage(NeoChatRoom::Error, i18nc("<username> is not in this room", "%1 is not in this room.", parts[0]));
                 return QString();
             }
             auto plEvent = room->currentState().get<RoomPowerLevelsEvent>();
@@ -527,18 +510,17 @@ QList<ActionsModel::Action> actions{
             }
             auto kick = plEvent->kick();
             if (plEvent->powerLevelForUser(room->localMember().id()) < kick) {
-                Q_EMIT Controller::instance().showMessage(Controller::Error, i18n("You are not allowed to kick users from this room."));
+                Q_EMIT room->showMessage(NeoChatRoom::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 Controller::instance().showMessage(
-                    Controller::Error,
+                Q_EMIT room->showMessage(
+                    NeoChatRoom::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 Controller::instance().showMessage(Controller::Positive,
-                                                      i18nc("<username> was kicked from this room.", "%1 was kicked from this room.", parts[0]));
+            Q_EMIT room->showMessage(NeoChatRoom::Positive, i18nc("<username> was kicked from this room.", "%1 was kicked from this room.", parts[0]));
             return QString();
         },
         false,