GIT_SILENT Upgrade release service version to 24.11.90.

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

.craft.ini

@@ -2,7 +2,5 @@
 ; SPDX-License-Identifier: CC0-1.0
 
 [BlueprintSettings]
-kde/unreleased/kirigami-addons.version=master
-
 kde/applications/neochat.packageAppx=True
 libs/qt.qtMajorVersion=6

.kde-ci.yml

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

.reuse/dep5

@@ -0,0 +1,55 @@
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: NeoChat
+Upstream-Contact: Carl Schwan <carlschwan@kde.org>
+
+Files: 128-logo.png icons/* logo.png org.kde.neochat.svg org.kde.neochat.tray.svg android/res/drawable/neochat.png
+Copyright: 2020 Carson Black <uhhadd@gmail.com>
+License: LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL
+
+Files: android/res/drawable/splash.xml
+Copyright: 2020 Tobias Fella <tobias.fella@kde.org>
+License: BSD-2-Clause
+
+Files: .gitignore
+Copyright: None
+License: CC0-1.0
+
+Files: .gitlab/issue_templates/bug.md
+Copyright: 2021 Carl Schwan <carlschwan@kde.org>
+License: CC0-1.0
+
+Files: src/res.qrc src/res_android.qrc src/res_desktop.qrc
+Copyright: None
+License: CC0-1.0
+
+Files: cmake/Flatpak/99-noto-mono-color-emoji.conf
+Copyright: 2021 Carl Schwan <carlschwan@kde.org>
+License: BSD-2-Clause
+
+Files: src/neochatconfig.kcfg
+Copyright: 2020-2021 Carl Schwan <carlschwan@kde.org>, Tobias Fella <tobias.fella@kde.org>
+License: BSD-2-Clause
+
+Files: src/neochat.notifyrc
+Copyright: 2020 Tobias Fella <tobias.fella@kde.org>
+License: BSD-2-Clause
+
+Files: src/qml/confetti.png src/qml/glowdot.png
+Copyright: 2021 Alexey Andreyev <aa13q@ya.ru>
+License: CC0-1.0
+
+Files: .flatpak-manifest.json
+Copyright: 2020-2022 Tobias Fella <tobias.fella@kde.org>
+License: BSD-2-Clause
+
+Files: autotests/data/*
+Copyright: none
+License: CC0-1.0
+
+Files: appiumtests/data/*
+Copyright: 2023 Tobias Fella <tobias.fella@kde.org>
+License: CC0-1.0
+
+Files: src/purpose/purposeplugin.json
+Copyright: 2023 Tobias Fella <tobias.fella@kde.org>
+License: BSD-2-Clause

CMakeLists.txt

@@ -7,9 +7,9 @@
 cmake_minimum_required(VERSION 3.16)
 
 # KDE Applications version, managed by release script.
-set(RELEASE_SERVICE_VERSION_MAJOR "25")
-set(RELEASE_SERVICE_VERSION_MINOR "03")
-set(RELEASE_SERVICE_VERSION_MICRO "70")
+set(RELEASE_SERVICE_VERSION_MAJOR "24")
+set(RELEASE_SERVICE_VERSION_MINOR "11")
+set(RELEASE_SERVICE_VERSION_MICRO "90")
 set(RELEASE_SERVICE_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE_VERSION_MINOR}.${RELEASE_SERVICE_VERSION_MICRO}")
 
 project(NeoChat VERSION ${RELEASE_SERVICE_VERSION})

REUSE.toml

@@ -1,84 +0,0 @@
-# SPDX-FileCopyrightText: none
-# SPDX-License-Identifier: CC0-1.0
-
-version = 1
-SPDX-PackageName = "NeoChat"
-SPDX-PackageSupplier = "Carl Schwan <carlschwan@kde.org>"
-
-[[annotations]]
-path = ["128-logo.png", "icons/**", "logo.png", "org.kde.neochat.svg", "org.kde.neochat.tray.svg", "android/res/drawable/neochat.png", "android/neochat-playstore.png"]
-precedence = "aggregate"
-SPDX-FileCopyrightText = "2020 Carson Black <uhhadd@gmail.com>"
-SPDX-License-Identifier = "LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL"
-
-[[annotations]]
-path = "android/res/drawable/splash.xml"
-precedence = "aggregate"
-SPDX-FileCopyrightText = "2020 Tobias Fella <tobias.fella@kde.org>"
-SPDX-License-Identifier = "BSD-2-Clause"
-
-[[annotations]]
-path = ".gitignore"
-precedence = "aggregate"
-SPDX-FileCopyrightText = "None"
-SPDX-License-Identifier = "CC0-1.0"
-
-[[annotations]]
-path = ".gitlab/issue_templates/bug.md"
-precedence = "aggregate"
-SPDX-FileCopyrightText = "2021 Carl Schwan <carlschwan@kde.org>"
-SPDX-License-Identifier = "CC0-1.0"
-
-[[annotations]]
-path = ["src/res.qrc", "src/res_android.qrc", "src/res_desktop.qrc"]
-precedence = "aggregate"
-SPDX-FileCopyrightText = "None"
-SPDX-License-Identifier = "CC0-1.0"
-
-[[annotations]]
-path = "cmake/Flatpak/99-noto-mono-color-emoji.conf"
-precedence = "aggregate"
-SPDX-FileCopyrightText = "2021 Carl Schwan <carlschwan@kde.org>"
-SPDX-License-Identifier = "BSD-2-Clause"
-
-[[annotations]]
-path = "src/neochatconfig.kcfg"
-precedence = "aggregate"
-SPDX-FileCopyrightText = "2020-2021 Carl Schwan <carlschwan@kde.org>, Tobias Fella <tobias.fella@kde.org>"
-SPDX-License-Identifier = "BSD-2-Clause"
-
-[[annotations]]
-path = "src/neochat.notifyrc"
-precedence = "aggregate"
-SPDX-FileCopyrightText = "2020 Tobias Fella <tobias.fella@kde.org>"
-SPDX-License-Identifier = "BSD-2-Clause"
-
-[[annotations]]
-path = ["src/qml/confetti.png", "src/qml/glowdot.png"]
-precedence = "aggregate"
-SPDX-FileCopyrightText = "2021 Alexey Andreyev <aa13q@ya.ru>"
-SPDX-License-Identifier = "CC0-1.0"
-
-[[annotations]]
-path = ".flatpak-manifest.json"
-precedence = "aggregate"
-SPDX-FileCopyrightText = "2020-2022 Tobias Fella <tobias.fella@kde.org>"
-SPDX-License-Identifier = "BSD-2-Clause"
-
-[[annotations]]
-path = "autotests/data/**"
-precedence = "aggregate"
-SPDX-FileCopyrightText = "none"
-SPDX-License-Identifier = "CC0-1.0"
-
-[[annotations]]
-path = "appiumtests/data/**"
-precedence = "aggregate"
-SPDX-FileCopyrightText = "2023 Tobias Fella <tobias.fella@kde.org>"
-SPDX-License-Identifier = "CC0-1.0"
-
-[[annotations]]
-path = "src/purpose/purposeplugin.json"
-precedence = "aggregate"
-SPDX-FileCopyrightText = "2023 Tobias Fella <tobias.fella@kde.org>"
-SPDX-License-Identifier = "BSD-2-Clause"

android/build.gradle

@@ -12,7 +12,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.6.0'
+        classpath 'com.android.tools.build:gradle:7.4.1'
     }
 }
 

appiumtests/login-server.py

@@ -83,15 +83,6 @@ def create_room():
     next_sync_payload = "sync_response_new_room"
     return response
 
-@app.route("/_matrix/client/v3/publicRooms", methods=["POST"])
-def public_rooms():
-    if request.get_json()["filter"]["generic_search_term"] == "forbidden":
-        data = dict()
-        data["errcode"] = "M_FORBIDDEN"
-        data["error"] = "You are not allowed to search for this. Go to https://wikipedia.org for more information"
-        return data, 403
-    return dict()
-
 
 
 if __name__ == "__main__":

autotests/CMakeLists.txt

@@ -11,13 +11,11 @@ ecm_add_test(
     TEST_NAME neochatroomtest
 )
 
-if (NOT $ENV{KDE_CI})
-    ecm_add_test(
-        texthandlertest.cpp
-        LINK_LIBRARIES neochat Qt::Test
-        TEST_NAME texthandlertest
-    )
-endif()
+ecm_add_test(
+    texthandlertest.cpp
+    LINK_LIBRARIES neochat Qt::Test
+    TEST_NAME texthandlertest
+)
 
 ecm_add_test(
     delegatesizehelpertest.cpp
@@ -50,9 +48,9 @@ ecm_add_test(
 )
 
 ecm_add_test(
-    timelinemessagemodeltest.cpp
+    messageeventmodeltest.cpp
     LINK_LIBRARIES neochat Qt::Test
-    TEST_NAME timelinemessagemodeltest
+    TEST_NAME messageeventmodeltest
 )
 
 ecm_add_test(
@@ -84,9 +82,3 @@ ecm_add_test(
     LINK_LIBRARIES neochat Qt::Test
     TEST_NAME messagecontentmodeltest
 )
-
-ecm_add_test(
-    actionstest.cpp
-    LINK_LIBRARIES neochat Qt::Test
-    TEST_NAME actionstest
-)

autotests/actionstest.cpp

@@ -1,120 +0,0 @@
-// SPDX-FileCopyrightText: 2024 Tobias Fella <tobias.fella@kde.org>
-// SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
-
-#include <QObject>
-#include <QTest>
-#include <QSignalSpy>
-#include <QVariantList>
-
-#include "chatbarcache.h"
-#include "models/actionsmodel.h"
-
-#include "testutils.h"
-
-using namespace Quotient;
-
-//TODO: rainbow, rainbowme, plain, spoiler, me, join, knock, j, part, leave, nick, roomnick, myroomnick, ignore, unignore, react, ban, unban, kick
-
-class ActionsTest : public QObject
-{
-    Q_OBJECT
-
-private:
-    Connection *connection = nullptr;
-    TestUtils::TestRoom *room = nullptr;
-
-    void expectMessage(const QString &actionName, const QString &args, MessageType::Type type, const QString &message);
-
-private Q_SLOTS:
-    void initTestCase();
-    void testActions();
-    void testActions_data();
-    void testInvite();
-};
-
-void ActionsTest::initTestCase()
-{
-    connection = Connection::makeMockConnection(QStringLiteral("@bob:kde.org"));
-    room = new TestUtils::TestRoom(connection, QStringLiteral("#myroom:kde.org"), QLatin1String("test-min-sync.json"));
-}
-
-void ActionsTest::testActions_data()
-{
-    QTest::addColumn<QString>("command");
-    QTest::addColumn<std::optional<QString>>("resultText");
-    QTest::addColumn<std::optional<Quotient::RoomMessageEvent::MsgType>>("type");
-
-    QTest::newRow("shrug") << u"/shrug Hello"_s << std::make_optional(u"¯\\\\_(ツ)_/¯ Hello"_s)
-                           << std::make_optional(Quotient::RoomMessageEvent::MsgType::Text);
-    QTest::newRow("lenny") << u"/lenny Hello"_s << std::make_optional(u"( ͡° ͜ʖ ͡°) Hello"_s) << std::make_optional(Quotient::RoomMessageEvent::MsgType::Text);
-    QTest::newRow("tableflip") << u"/tableflip Hello"_s << std::make_optional(u"(╯°□°）╯︵ ┻━┻ Hello"_s)
-                               << std::make_optional(Quotient::RoomMessageEvent::MsgType::Text);
-    QTest::newRow("unflip") << u"/unflip Hello"_s << std::make_optional(u"┬──┬ ノ( ゜-゜ノ) Hello"_s)
-                            << std::make_optional(Quotient::RoomMessageEvent::MsgType::Text);
-    QTest::newRow("rainbow") << u"/rainbow Hello"_s << std::optional<QString>() << std::optional<Quotient::RoomMessageEvent::MsgType>();
-    QTest::newRow("rainbowme") << u"/rainbowme Hello"_s << std::optional<QString>() << std::optional<Quotient::RoomMessageEvent::MsgType>();
-    QTest::newRow("plain") << u"/plain <b>Hello</b>"_s << std::optional<QString>() << std::optional<Quotient::RoomMessageEvent::MsgType>();
-    QTest::newRow("spoiler") << u"/spoiler Hello"_s << std::optional<QString>() << std::optional<Quotient::RoomMessageEvent::MsgType>();
-    QTest::newRow("me") << u"/me Hello"_s << std::make_optional(u"Hello"_s) << std::make_optional(Quotient::RoomMessageEvent::MsgType::Emote);
-    QTest::newRow("notice") << u"/notice Hello"_s << std::make_optional(u"Hello"_s) << std::make_optional(Quotient::RoomMessageEvent::MsgType::Notice);
-    QTest::newRow("message") << u"Hello"_s << std::make_optional(u"Hello"_s) << std::make_optional(Quotient::RoomMessageEvent::MsgType::Text);
-    QTest::newRow("invite") << u"/invite @foo:example.com"_s << std::optional<QString>() << std::optional<Quotient::RoomMessageEvent::MsgType>();
-
-    //TODO: join, knock, j, part, leave, nick, roomnick, myroomnick, ignore, unignore, react, ban, unban, kick
-}
-
-void ActionsTest::testActions()
-{
-    QFETCH(QString, command);
-    QFETCH(std::optional<QString>, resultText);
-    QFETCH(std::optional<Quotient::RoomMessageEvent::MsgType>, type);
-
-    auto cache = new ChatBarCache();
-    cache->setText(command);
-    auto result = ActionsModel::handleAction(room, cache);
-    QCOMPARE(resultText, std::get<std::optional<QString>>(result));
-    QCOMPARE(type, std::get<std::optional<Quotient::RoomMessageEvent::MsgType>>(result));
-}
-
-static ActionsModel::Action findAction(const QString &name)
-{
-    for (const auto &action : ActionsModel::allActions()) {
-        if (action.prefix == name) {
-            return action;
-        }
-    }
-
-    return {};
-}
-
-void ActionsTest::expectMessage(const QString &actionName, const QString &args, MessageType::Type type, const QString &message)
-{
-    auto action = findAction(actionName);
-    QSignalSpy spy(room, &TestUtils::TestRoom::showMessage);
-    auto result = action.handle(args, room, nullptr);
-    auto expected = QVariantList {type, message};
-    auto signal = spy.takeFirst();
-    QCOMPARE(signal, expected);
-}
-
-void ActionsTest::testInvite()
-{
-    expectMessage(u"invite"_s, u"foo"_s, MessageType::Error, u"'foo' does not look like a matrix id."_s);
-    expectMessage(u"invite"_s, u"@invited:example.com"_s, MessageType::Information, u"@invited:example.com is already invited to this room."_s);
-    QCOMPARE(room->memberState(u"@invited:example.com"_s), Membership::Invite);
-    expectMessage(u"invite"_s, u"@banned:example.com"_s, MessageType::Information, u"@banned:example.com is banned from this room."_s);
-    QCOMPARE(room->memberState(u"@banned:example.com"_s), Membership::Ban);
-    expectMessage(u"invite"_s, connection->userId(), MessageType::Positive, u"You are already in this room."_s);
-    QCOMPARE(room->memberState(connection->userId()), Membership::Join);
-    expectMessage(u"invite"_s, u"@example:example.org"_s, MessageType::Information, u"@example:example.org is already in this room."_s);
-    QCOMPARE(room->memberState(u"@example:example.org"_s), Membership::Join);
-
-    QCOMPARE(room->memberState(u"@user:example.com"_s), Membership::Leave);
-    expectMessage(u"invite"_s, u"@user:example.com"_s, MessageType::Positive, u"@user:example.com was invited into this room."_s);
-
-    //TODO mock server, wait for invite state to change
-    //TODO QCOMPARE(room->memberState(u"@user:example.com"_s), Membership::Invite);
-}
-
-QTEST_MAIN(ActionsTest)
-#include "actionstest.moc"

autotests/chatbarcachetest.cpp

@@ -38,8 +38,8 @@ private Q_SLOTS:
 
 void ChatBarCacheTest::initTestCase()
 {
-    connection = Connection::makeMockConnection(u"@bob:kde.org"_s);
-    room = new TestUtils::TestRoom(connection, u"#myroom:kde.org"_s, "test-min-sync.json"_L1);
+    connection = Connection::makeMockConnection(QStringLiteral("@bob:kde.org"));
+    room = new TestUtils::TestRoom(connection, QStringLiteral("#myroom:kde.org"), QLatin1String("test-min-sync.json"));
 }
 
 void ChatBarCacheTest::empty()
@@ -59,7 +59,7 @@ void ChatBarCacheTest::empty()
 void ChatBarCacheTest::noRoom()
 {
     QScopedPointer<ChatBarCache> chatBarCache(new ChatBarCache());
-    chatBarCache->setReplyId(u"$153456789:example.org"_s);
+    chatBarCache->setReplyId(QLatin1String("$153456789:example.org"));
 
     // These should return empty even though a reply ID has been set because the
     // ChatBarCache has no parent.
@@ -75,7 +75,7 @@ void ChatBarCacheTest::badParent()
 {
     QScopedPointer<QObject> badParent(new QObject());
     QScopedPointer<ChatBarCache> chatBarCache(new ChatBarCache(badParent.get()));
-    chatBarCache->setReplyId(u"$153456789:example.org"_s);
+    chatBarCache->setReplyId(QLatin1String("$153456789:example.org"));
 
     // These should return empty even though a reply ID has been set because the
     // ChatBarCache has no parent.
@@ -90,17 +90,17 @@ void ChatBarCacheTest::badParent()
 void ChatBarCacheTest::reply()
 {
     QScopedPointer<ChatBarCache> chatBarCache(new ChatBarCache(room));
-    chatBarCache->setText(u"some text"_s);
-    chatBarCache->setAttachmentPath(u"some/path"_s);
-    chatBarCache->setReplyId(u"$153456789:example.org"_s);
+    chatBarCache->setText(QLatin1String("some text"));
+    chatBarCache->setAttachmentPath(QLatin1String("some/path"));
+    chatBarCache->setReplyId(QLatin1String("$153456789:example.org"));
 
-    QCOMPARE(chatBarCache->text(), u"some text"_s);
+    QCOMPARE(chatBarCache->text(), QLatin1String("some text"));
     QCOMPARE(chatBarCache->isReplying(), true);
-    QCOMPARE(chatBarCache->replyId(), u"$153456789:example.org"_s);
+    QCOMPARE(chatBarCache->replyId(), QLatin1String("$153456789:example.org"));
     QCOMPARE(chatBarCache->isEditing(), false);
     QCOMPARE(chatBarCache->editId(), QString());
-    QCOMPARE(chatBarCache->relationAuthor(), room->member(u"@example:example.org"_s));
-    QCOMPARE(chatBarCache->relationMessage(), u"This is an example\ntext message"_s);
+    QCOMPARE(chatBarCache->relationAuthor(), room->member(QLatin1String("@example:example.org")));
+    QCOMPARE(chatBarCache->relationMessage(), QLatin1String("This is an example\ntext message"));
     QCOMPARE(chatBarCache->attachmentPath(), QString());
 }
 
@@ -108,39 +108,39 @@ void ChatBarCacheTest::edit()
 {
     QScopedPointer<ChatBarCache> chatBarCache(new ChatBarCache(room));
 
-    chatBarCache->setText(u"some text"_s);
-    chatBarCache->setAttachmentPath(u"some/path"_s);
+    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(u"$153456789:example.org"_s));
+        QCOMPARE(newEventId, QString(QLatin1String("$153456789:example.org")));
     });
-    chatBarCache->setEditId(u"$153456789:example.org"_s);
+    chatBarCache->setEditId(QLatin1String("$153456789:example.org"));
 
-    QCOMPARE(chatBarCache->text(), u"some text"_s);
+    QCOMPARE(chatBarCache->text(), QLatin1String("some text"));
     QCOMPARE(chatBarCache->isReplying(), false);
     QCOMPARE(chatBarCache->replyId(), QString());
     QCOMPARE(chatBarCache->isEditing(), true);
-    QCOMPARE(chatBarCache->editId(), u"$153456789:example.org"_s);
-    QCOMPARE(chatBarCache->relationAuthor(), room->member(u"@example:example.org"_s));
-    QCOMPARE(chatBarCache->relationMessage(), u"This is an example\ntext message"_s);
+    QCOMPARE(chatBarCache->editId(), QLatin1String("$153456789:example.org"));
+    QCOMPARE(chatBarCache->relationAuthor(), room->member(QLatin1String("@example:example.org")));
+    QCOMPARE(chatBarCache->relationMessage(), QLatin1String("This is an example\ntext message"));
     QCOMPARE(chatBarCache->attachmentPath(), QString());
 }
 
 void ChatBarCacheTest::attachment()
 {
     QScopedPointer<ChatBarCache> chatBarCache(new ChatBarCache(room));
-    chatBarCache->setText(u"some text"_s);
-    chatBarCache->setEditId(u"$153456789:example.org"_s);
-    chatBarCache->setAttachmentPath(u"some/path"_s);
+    chatBarCache->setText(QLatin1String("some text"));
+    chatBarCache->setEditId(QLatin1String("$153456789:example.org"));
+    chatBarCache->setAttachmentPath(QLatin1String("some/path"));
 
-    QCOMPARE(chatBarCache->text(), u"some text"_s);
+    QCOMPARE(chatBarCache->text(), QLatin1String("some text"));
     QCOMPARE(chatBarCache->isReplying(), false);
     QCOMPARE(chatBarCache->replyId(), QString());
     QCOMPARE(chatBarCache->isEditing(), false);
     QCOMPARE(chatBarCache->editId(), QString());
     QCOMPARE(chatBarCache->relationAuthor(), room->member(QString()));
     QCOMPARE(chatBarCache->relationMessage(), QString());
-    QCOMPARE(chatBarCache->attachmentPath(), u"some/path"_s);
+    QCOMPARE(chatBarCache->attachmentPath(), QLatin1String("some/path"));
 }
 
 QTEST_MAIN(ChatBarCacheTest)

autotests/data/test-min-sync.json

@@ -49,51 +49,6 @@
         "unsigned": {
           "age": 1234
         }
-      },
-      {
-        "content": {
-          "displayname": "Bob",
-          "membership": "join"
-        },
-        "event_id": "$143273blorb3PhrSn: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": "Invited",
-          "membership": "invite"
-        },
-        "event_id": "$asdfpj443PhrSn:example.org",
-        "origin_server_ts": 1432735824653,
-        "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
-        "sender": "@example:example.org",
-        "state_key": "@invited:example.com",
-        "type": "m.room.member",
-        "unsigned": {
-          "age": 1234
-        }
-      },
-      {
-        "content": {
-          "displayname": "Banned",
-          "membership": "ban"
-        },
-        "event_id": "$asdfpj443PhrSnasfd:example.org",
-        "origin_server_ts": 1432735824653,
-        "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
-        "sender": "@banned:example.com",
-        "state_key": "@banned:example.com",
-        "type": "m.room.member",
-        "unsigned": {
-          "age": 1234
-        }
       }
     ]
   },
@@ -102,7 +57,7 @@
       "@alice:example.com",
       "@bob:example.com"
     ],
-    "m.invited_member_count": 1,
+    "m.invited_member_count": 0,
     "m.joined_member_count": 2
   },
   "timeline": {

autotests/eventhandlertest.cpp

@@ -11,8 +11,6 @@
 #include <Quotient/connection.h>
 #include <Quotient/quotient_common.h>
 #include <Quotient/syncdata.h>
-#include <qcbormap.h>
-#include <qtestcase.h>
 
 #include "linkpreviewer.h"
 #include "models/reactionmodel.h"
@@ -34,6 +32,8 @@ private:
 private Q_SLOTS:
     void initTestCase();
 
+    void eventId();
+    void nullEventId();
     void authorDisplayName();
     void nullAuthorDisplayName();
     void singleLineSidplayName();
@@ -56,21 +56,38 @@ private Q_SLOTS:
     void nullSubtitle();
     void mediaInfo();
     void nullMediaInfo();
+    void hasReply();
+    void nullHasReply();
+    void replyId();
+    void nullReplyId();
     void replyAuthor();
     void nullReplyAuthor();
+    void thread();
+    void nullThread();
     void location();
     void nullLocation();
 };
 
 void EventHandlerTest::initTestCase()
 {
-    connection = Connection::makeMockConnection(u"@bob:kde.org"_s);
-    room = new TestUtils::TestRoom(connection, u"#myroom:kde.org"_s, u"test-eventhandler-sync.json"_s);
+    connection = Connection::makeMockConnection(QStringLiteral("@bob:kde.org"));
+    room = new TestUtils::TestRoom(connection, QStringLiteral("#myroom:kde.org"), QLatin1String("test-eventhandler-sync.json"));
+}
+
+void EventHandlerTest::eventId()
+{
+    QCOMPARE(EventHandler::id(room->messageEvents().at(0).get()), QStringLiteral("$153456789:example.org"));
+}
+
+void EventHandlerTest::nullEventId()
+{
+    QTest::ignoreMessage(QtWarningMsg, "id called with event set to nullptr.");
+    QCOMPARE(EventHandler::id(nullptr), QString());
 }
 
 void EventHandlerTest::authorDisplayName()
 {
-    QCOMPARE(EventHandler::authorDisplayName(room, room->messageEvents().at(1).get()), u"before"_s);
+    QCOMPARE(EventHandler::authorDisplayName(room, room->messageEvents().at(1).get()), QStringLiteral("before"));
 }
 
 void EventHandlerTest::nullAuthorDisplayName()
@@ -84,7 +101,8 @@ void EventHandlerTest::nullAuthorDisplayName()
 
 void EventHandlerTest::singleLineSidplayName()
 {
-    QCOMPARE(EventHandler::singleLineAuthorDisplayname(room, room->messageEvents().at(11).get()), "Look at me I put newlines in my display name"_L1);
+    QCOMPARE(EventHandler::singleLineAuthorDisplayname(room, room->messageEvents().at(11).get()),
+             QStringLiteral("Look at me I put newlines in my display name"));
 }
 
 void EventHandlerTest::nullSingleLineDisplayName()
@@ -100,24 +118,17 @@ void EventHandlerTest::time()
 {
     const auto event = room->messageEvents().at(0).get();
 
-    QCOMPARE(EventHandler::time(room, event), QDateTime::fromMSecsSinceEpoch(1432735824654, QTimeZone(QTimeZone::UTC)));
-
-    const auto txID = room->postJson("m.room.message"_L1, event->fullJson());
-    QCOMPARE(room->pendingEvents().size(), 1);
-    const auto pendingIt = room->findPendingEvent(txID);
-    QCOMPARE(EventHandler::time(room, pendingIt->event(), true), pendingIt->lastUpdated());
-
-    room->discardMessage(txID);
-    QCOMPARE(room->pendingEvents().size(), 0);
+    QCOMPARE(EventHandler::time(event), QDateTime::fromMSecsSinceEpoch(1432735824654, Qt::UTC));
+    QCOMPARE(EventHandler::time(event, true, QDateTime::fromMSecsSinceEpoch(1234, Qt::UTC)), QDateTime::fromMSecsSinceEpoch(1234, Qt::UTC));
 }
 
 void EventHandlerTest::nullTime()
 {
-    QTest::ignoreMessage(QtWarningMsg, "time called with room set to nullptr.");
-    QCOMPARE(EventHandler::time(nullptr, nullptr), QDateTime());
-
     QTest::ignoreMessage(QtWarningMsg, "time called with event set to nullptr.");
-    QCOMPARE(EventHandler::time(room, nullptr), QDateTime());
+    QCOMPARE(EventHandler::time(nullptr), QDateTime());
+
+    QTest::ignoreMessage(QtWarningMsg, "a value must be provided for lastUpdated for a pending event.");
+    QCOMPARE(EventHandler::time(room->messageEvents().at(0).get(), true), QDateTime());
 }
 
 void EventHandlerTest::timeString()
@@ -126,27 +137,20 @@ void EventHandlerTest::timeString()
 
     KFormat format;
 
-    QCOMPARE(EventHandler::timeString(room, event, false),
-             QLocale().toString(QDateTime::fromMSecsSinceEpoch(1432735824654, QTimeZone(QTimeZone::UTC)).toLocalTime().time(), QLocale::ShortFormat));
-    QCOMPARE(EventHandler::timeString(room, event, true),
-             format.formatRelativeDate(QDateTime::fromMSecsSinceEpoch(1432735824654, QTimeZone(QTimeZone::UTC)).toLocalTime().date(), QLocale::ShortFormat));
-    QCOMPARE(EventHandler::timeString(room, event, u"hh:mm"_s), QDateTime::fromMSecsSinceEpoch(1432735824654, QTimeZone(QTimeZone::UTC)).toString(u"hh:mm"_s));
-
-    const auto txID = room->postJson("m.room.message"_L1, event->fullJson());
-    QCOMPARE(room->pendingEvents().size(), 1);
-    const auto pendingIt = room->findPendingEvent(txID);
-
-    QCOMPARE(EventHandler::timeString(room, pendingIt->event(), false, QLocale::ShortFormat, true),
-             QLocale().toString(pendingIt->lastUpdated().toLocalTime().time(), QLocale::ShortFormat));
-    QCOMPARE(EventHandler::timeString(room, pendingIt->event(), true, QLocale::ShortFormat, true),
-             format.formatRelativeDate(pendingIt->lastUpdated().toLocalTime().date(), QLocale::ShortFormat));
-    QCOMPARE(EventHandler::timeString(room, pendingIt->event(), false, QLocale::LongFormat, true),
-             QLocale().toString(pendingIt->lastUpdated().toLocalTime().time(), QLocale::LongFormat));
-    QCOMPARE(EventHandler::timeString(room, pendingIt->event(), true, QLocale::LongFormat, true),
-             format.formatRelativeDate(pendingIt->lastUpdated().toLocalTime().date(), QLocale::LongFormat));
-
-    room->discardMessage(txID);
-    QCOMPARE(room->pendingEvents().size(), 0);
+    QCOMPARE(EventHandler::timeString(event, false),
+             QLocale().toString(QDateTime::fromMSecsSinceEpoch(1432735824654, Qt::UTC).toLocalTime().time(), QLocale::ShortFormat));
+    QCOMPARE(EventHandler::timeString(event, 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)),
+             QLocale().toString(QDateTime::fromMSecsSinceEpoch(1690699214545, Qt::UTC).toLocalTime().time(), QLocale::ShortFormat));
+    QCOMPARE(EventHandler::timeString(event, 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)),
+             QLocale().toString(QDateTime::fromMSecsSinceEpoch(1690699214545, Qt::UTC).toLocalTime().time(), QLocale::LongFormat));
+    QCOMPARE(EventHandler::timeString(event, 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::highlighted()
@@ -183,10 +187,10 @@ void EventHandlerTest::body()
 {
     const auto event = room->messageEvents().at(0).get();
 
-    QCOMPARE(EventHandler::richBody(room, event), u"<b>This is an example<br>text message</b>"_s);
-    QCOMPARE(EventHandler::richBody(room, event, true), u"<b>This is an example text message</b>"_s);
-    QCOMPARE(EventHandler::plainBody(room, event), u"This is an example\ntext message"_s);
-    QCOMPARE(EventHandler::plainBody(room, event, true), u"This is an example text message"_s);
+    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"));
 }
 
 void EventHandlerTest::nullBody()
@@ -209,11 +213,13 @@ void EventHandlerTest::genericBody_data()
     QTest::addColumn<int>("eventNum");
     QTest::addColumn<QString>("output");
 
-    QTest::newRow("message") << 0 << u"<a href=\"https://matrix.to/#/@example:example.org\">after</a> sent a message"_s;
-    QTest::newRow("member") << 1 << u"<a href=\"https://matrix.to/#/@example:example.org\">after</a> changed their display name and updated their avatar"_s;
-    QTest::newRow("message 2") << 2 << u"<a href=\"https://matrix.to/#/@example:example.org\">after</a> sent a message"_s;
-    QTest::newRow("reaction") << 3 << u"Unknown event"_s;
-    QTest::newRow("video") << 4 << u"<a href=\"https://matrix.to/#/@example:example.org\">after</a> sent a message"_s;
+    QTest::newRow("message") << 0 << QStringLiteral("<a href=\"https://matrix.to/#/@example:example.org\">after</a> sent a message");
+    QTest::newRow("member") << 1
+                            << QStringLiteral(
+                                   "<a href=\"https://matrix.to/#/@example:example.org\">after</a> changed their display name and updated their avatar");
+    QTest::newRow("message 2") << 2 << QStringLiteral("<a href=\"https://matrix.to/#/@example:example.org\">after</a> sent a message");
+    QTest::newRow("reaction") << 3 << QStringLiteral("Unknown event");
+    QTest::newRow("video") << 4 << QStringLiteral("<a href=\"https://matrix.to/#/@example:example.org\">after</a> sent a message");
 }
 
 void EventHandlerTest::genericBody()
@@ -235,19 +241,19 @@ void EventHandlerTest::nullGenericBody()
 
 void EventHandlerTest::markdownBody()
 {
-    QCOMPARE(EventHandler::markdownBody(room->messageEvents().at(0).get()), u"This is an example\ntext message"_s);
+    QCOMPARE(EventHandler::markdownBody(room->messageEvents().at(0).get()), QStringLiteral("This is an example\ntext message"));
 }
 
 void EventHandlerTest::markdownBodyReply()
 {
-    QCOMPARE(EventHandler::markdownBody(room->messageEvents().at(5).get()), u"reply"_s);
+    QCOMPARE(EventHandler::markdownBody(room->messageEvents().at(5).get()), QStringLiteral("reply"));
 }
 
 void EventHandlerTest::subtitle()
 {
-    QCOMPARE(EventHandler::subtitleText(room, room->messageEvents().at(0).get()), u"after: This is an example text message"_s);
+    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()),
-             u"after: This is a highlight @bob:kde.org and this is a link https://kde.org"_s);
+             QStringLiteral("after: This is a highlight @bob:kde.org and this is a link https://kde.org"));
 }
 
 void EventHandlerTest::nullSubtitle()
@@ -263,21 +269,21 @@ void EventHandlerTest::mediaInfo()
 {
     auto event = room->messageEvents().at(4).get();
     auto mediaInfo = EventHandler::mediaInfo(room, event);
-    auto thumbnailInfo = mediaInfo["tempInfo"_L1].toMap();
+    auto thumbnailInfo = mediaInfo["tempInfo"_ls].toMap();
 
-    QCOMPARE(mediaInfo["source"_L1], room->makeMediaUrl(event->id(), QUrl("mxc://kde.org/1234567"_L1)));
-    QCOMPARE(mediaInfo["mimeType"_L1], u"video/mp4"_s);
-    QCOMPARE(mediaInfo["mimeIcon"_L1], u"video-mp4"_s);
-    QCOMPARE(mediaInfo["size"_L1], 62650636);
-    QCOMPARE(mediaInfo["duration"_L1], 10);
-    QCOMPARE(mediaInfo["width"_L1], 1920);
-    QCOMPARE(mediaInfo["height"_L1], 1080);
-    QCOMPARE(thumbnailInfo["source"_L1], room->makeMediaUrl(event->id(), QUrl("mxc://kde.org/2234567"_L1)));
-    QCOMPARE(thumbnailInfo["mimeType"_L1], u"image/jpeg"_s);
-    QCOMPARE(thumbnailInfo["mimeIcon"_L1], u"image-jpeg"_s);
-    QCOMPARE(thumbnailInfo["size"_L1], 382249);
-    QCOMPARE(thumbnailInfo["width"_L1], 800);
-    QCOMPARE(thumbnailInfo["height"_L1], 450);
+    QCOMPARE(mediaInfo["source"_ls], room->makeMediaUrl(event->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(event->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::nullMediaInfo()
@@ -289,6 +295,30 @@ void EventHandlerTest::nullMediaInfo()
     QCOMPARE(EventHandler::mediaInfo(room, nullptr), QVariantMap());
 }
 
+void EventHandlerTest::hasReply()
+{
+    QCOMPARE(EventHandler::hasReply(room->messageEvents().at(5).get()), true);
+    QCOMPARE(EventHandler::hasReply(room->messageEvents().at(0).get()), false);
+}
+
+void EventHandlerTest::nullHasReply()
+{
+    QTest::ignoreMessage(QtWarningMsg, "hasReply called with event set to nullptr.");
+    QCOMPARE(EventHandler::hasReply(nullptr), 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(""));
+}
+
+void EventHandlerTest::nullReplyId()
+{
+    QTest::ignoreMessage(QtWarningMsg, "replyId called with event set to nullptr.");
+    QCOMPARE(EventHandler::replyId(nullptr), QString());
+}
+
 void EventHandlerTest::replyAuthor()
 {
     auto replyEvent = room->messageEvents().at(0).get();
@@ -314,11 +344,34 @@ void EventHandlerTest::nullReplyAuthor()
     QCOMPARE(EventHandler::replyAuthor(room, nullptr), RoomMember());
 }
 
+void EventHandlerTest::thread()
+{
+    QCOMPARE(EventHandler::isThreaded(room->messageEvents().at(0).get()), false);
+    QCOMPARE(EventHandler::threadRoot(room->messageEvents().at(0).get()), 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"));
+
+    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"));
+}
+
+void EventHandlerTest::nullThread()
+{
+    QTest::ignoreMessage(QtWarningMsg, "isThreaded called with event set to nullptr.");
+    QCOMPARE(EventHandler::isThreaded(nullptr), false);
+
+    QTest::ignoreMessage(QtWarningMsg, "threadRoot called with event set to nullptr.");
+    QCOMPARE(EventHandler::threadRoot(nullptr), QString());
+}
+
 void EventHandlerTest::location()
 {
-    QCOMPARE(EventHandler::latitude(room->messageEvents().at(7).get()), u"51.7035"_s.toFloat());
-    QCOMPARE(EventHandler::longitude(room->messageEvents().at(7).get()), u"-1.14394"_s.toFloat());
-    QCOMPARE(EventHandler::locationAssetType(room->messageEvents().at(7).get()), u"m.pin"_s);
+    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"));
 }
 
 void EventHandlerTest::nullLocation()

autotests/linkpreviewertest.cpp

@@ -38,8 +38,8 @@ private Q_SLOTS:
 
 void LinkPreviewerTest::initTestCase()
 {
-    connection = Connection::makeMockConnection(u"@bob:example.org"_s);
-    room = new TestUtils::TestRoom(connection, u"!test:example.org"_s);
+    connection = Connection::makeMockConnection(QStringLiteral("@bob:example.org"));
+    room = new TestUtils::TestRoom(connection, QStringLiteral("!test:example.org"));
 }
 
 void LinkPreviewerTest::linkPreviewsMatch_data()
@@ -47,9 +47,9 @@ void LinkPreviewerTest::linkPreviewsMatch_data()
     QTest::addColumn<QString>("inputString");
     QTest::addColumn<QUrl>("testOutputLink");
 
-    QTest::newRow("plainHttps") << u"https://kde.org"_s << QUrl(u"https://kde.org"_s);
-    QTest::newRow("richHttps") << u"<a href=\"https://kde.org\">Rich Link</a>"_s << QUrl(u"https://kde.org"_s);
-    QTest::newRow("richHttpsLinkDescription") << u"<a href=\"https://kde.org\">https://kde.org</a>"_s << QUrl(u"https://kde.org"_s);
+    QTest::newRow("plainHttps") << QStringLiteral("https://kde.org") << QUrl("https://kde.org"_ls);
+    QTest::newRow("richHttps") << QStringLiteral("<a href=\"https://kde.org\">Rich Link</a>") << QUrl("https://kde.org"_ls);
+    QTest::newRow("richHttpsLinkDescription") << QStringLiteral("<a href=\"https://kde.org\">https://kde.org</a>") << QUrl("https://kde.org"_ls);
 }
 
 void LinkPreviewerTest::linkPreviewsMatch()
@@ -67,8 +67,8 @@ void LinkPreviewerTest::multipleLinkPreviewsMatch_data()
     QTest::addColumn<QString>("inputString");
     QTest::addColumn<QList<QUrl>>("testOutputLinks");
 
-    QTest::newRow("multipleHttps") << u"www.example.org https://kde.org"_s << QList{QUrl(u"www.example.org"_s), QUrl(u"https://kde.org"_s)};
-    QTest::newRow("multipleHttps1Invalid") << u"www.example.org mxc://example.org/SEsfnsuifSDFSSEF"_s << QList{QUrl(u"www.example.org"_s)};
+    QTest::newRow("multipleHttps") << QStringLiteral("www.example.org https://kde.org") << QList{QUrl("www.example.org"_ls), QUrl("https://kde.org"_ls)};
+    QTest::newRow("multipleHttps1Invalid") << QStringLiteral("www.example.org mxc://example.org/SEsfnsuifSDFSSEF") << QList{QUrl("www.example.org"_ls)};
 }
 
 void LinkPreviewerTest::multipleLinkPreviewsMatch()
@@ -85,9 +85,9 @@ void LinkPreviewerTest::linkPreviewsReject_data()
 {
     QTest::addColumn<QString>("inputString");
 
-    QTest::newRow("mxc") << u"mxc://example.org/SEsfnsuifSDFSSEF"_s;
-    QTest::newRow("matrixTo") << u"https://matrix.to/#/@alice:example.org"_s;
-    QTest::newRow("noSpace") << u"testhttps://kde.org"_s;
+    QTest::newRow("mxc") << QStringLiteral("mxc://example.org/SEsfnsuifSDFSSEF");
+    QTest::newRow("matrixTo") << QStringLiteral("https://matrix.to/#/@alice:example.org");
+    QTest::newRow("noSpace") << QStringLiteral("testhttps://kde.org");
 }
 
 void LinkPreviewerTest::linkPreviewsReject()

autotests/messagecontentmodeltest.cpp

@@ -32,25 +32,25 @@ private Q_SLOTS:
 
 void MessageContentModelTest::initTestCase()
 {
-    connection = Connection::makeMockConnection(u"@bob:kde.org"_s);
+    connection = Connection::makeMockConnection(QStringLiteral("@bob:kde.org"));
 }
 
 void MessageContentModelTest::missingEvent()
 {
-    auto room = new TestUtils::TestRoom(connection, u"#firstRoom:kde.org"_s);
-    auto model1 = MessageContentModel(room, u"$153456789:example.org"_s);
+    auto room = new TestUtils::TestRoom(connection, QStringLiteral("#firstRoom:kde.org"));
+    auto model1 = MessageContentModel(room, "$153456789:example.org"_L1);
 
     QCOMPARE(model1.rowCount(), 1);
     QCOMPARE(model1.data(model1.index(0), MessageContentModel::ComponentTypeRole), MessageComponentType::Loading);
-    QCOMPARE(model1.data(model1.index(0), MessageContentModel::DisplayRole), u"Loading"_s);
+    QCOMPARE(model1.data(model1.index(0), MessageContentModel::DisplayRole), "Loading"_L1);
 
-    auto model2 = MessageContentModel(room, u"$153456789:example.org"_s, true);
+    auto model2 = MessageContentModel(room, "$153456789:example.org"_L1, true);
 
     QCOMPARE(model2.rowCount(), 1);
     QCOMPARE(model2.data(model2.index(0), MessageContentModel::ComponentTypeRole), MessageComponentType::Loading);
-    QCOMPARE(model2.data(model2.index(0), MessageContentModel::DisplayRole), u"Loading reply"_s);
+    QCOMPARE(model2.data(model2.index(0), MessageContentModel::DisplayRole), "Loading reply"_L1);
 
-    room->syncNewEvents(u"test-min-sync.json"_s);
+    room->syncNewEvents(QLatin1String("test-min-sync.json"));
     QCOMPARE(model1.rowCount(), 2);
     QCOMPARE(model1.data(model1.index(0), MessageContentModel::ComponentTypeRole), MessageComponentType::Author);
     QCOMPARE(model1.data(model1.index(1), MessageContentModel::ComponentTypeRole), MessageComponentType::Text);

autotests/messageeventmodeltest.cpp

@@ -10,20 +10,20 @@
 #include <Quotient/syncdata.h>
 
 #include "enums/delegatetype.h"
-#include "models/timelinemessagemodel.h"
+#include "models/messageeventmodel.h"
 #include "neochatroom.h"
 
 #include "testutils.h"
 
 using namespace Quotient;
 
-class TimelineMessageModelTest : public QObject
+class MessageEventModelTest : public QObject
 {
     Q_OBJECT
 
 private:
     Connection *connection = nullptr;
-    TimelineMessageModel *model = nullptr;
+    MessageEventModel *model = nullptr;
 
 private Q_SLOTS:
     void initTestCase();
@@ -40,70 +40,70 @@ private Q_SLOTS:
     void cleanup();
 };
 
-void TimelineMessageModelTest::initTestCase()
+void MessageEventModelTest::initTestCase()
 {
-    connection = Connection::makeMockConnection(u"@bob:kde.org"_s);
+    connection = Connection::makeMockConnection(QStringLiteral("@bob:kde.org"));
 }
 
-void TimelineMessageModelTest::init()
+void MessageEventModelTest::init()
 {
     QCOMPARE(model, nullptr);
-    model = new TimelineMessageModel;
+    model = new MessageEventModel;
 }
 
 // Make sure that basic empty rooms can be switched without crashing.
-void TimelineMessageModelTest::switchEmptyRoom()
+void MessageEventModelTest::switchEmptyRoom()
 {
-    auto firstRoom = new TestUtils::TestRoom(connection, u"#firstRoom:kde.org"_s);
-    auto secondRoom = new TestUtils::TestRoom(connection, u"#secondRoom:kde.org"_s);
+    auto firstRoom = new TestUtils::TestRoom(connection, QStringLiteral("#firstRoom:kde.org"));
+    auto secondRoom = new TestUtils::TestRoom(connection, QStringLiteral("#secondRoom:kde.org"));
 
     QSignalSpy spy(model, SIGNAL(roomChanged()));
 
     QCOMPARE(model->room(), nullptr);
     model->setRoom(firstRoom);
     QCOMPARE(spy.count(), 1);
-    QCOMPARE(model->room()->id(), u"#firstRoom:kde.org"_s);
+    QCOMPARE(model->room()->id(), QStringLiteral("#firstRoom:kde.org"));
     model->setRoom(secondRoom);
     QCOMPARE(spy.count(), 2);
-    QCOMPARE(model->room()->id(), u"#secondRoom:kde.org"_s);
+    QCOMPARE(model->room()->id(), QStringLiteral("#secondRoom:kde.org"));
     model->setRoom(nullptr);
     QCOMPARE(spy.count(), 3);
     QCOMPARE(model->room(), nullptr);
 }
 
 // Make sure that rooms with some events can be switched without crashing
-void TimelineMessageModelTest::switchSyncedRoom()
+void MessageEventModelTest::switchSyncedRoom()
 {
-    auto firstRoom = new TestUtils::TestRoom(connection, u"#firstRoom:kde.org"_s, u"test-messageventmodel-sync.json"_s);
-    auto secondRoom = new TestUtils::TestRoom(connection, u"#secondRoom:kde.org"_s, u"test-messageventmodel-sync.json"_s);
+    auto firstRoom = new TestUtils::TestRoom(connection, QStringLiteral("#firstRoom:kde.org"), QLatin1String("test-messageventmodel-sync.json"));
+    auto secondRoom = new TestUtils::TestRoom(connection, QStringLiteral("#secondRoom:kde.org"), QLatin1String("test-messageventmodel-sync.json"));
 
     QSignalSpy spy(model, SIGNAL(roomChanged()));
 
     QCOMPARE(model->room(), nullptr);
     model->setRoom(firstRoom);
     QCOMPARE(spy.count(), 1);
-    QCOMPARE(model->room()->id(), u"#firstRoom:kde.org"_s);
+    QCOMPARE(model->room()->id(), QStringLiteral("#firstRoom:kde.org"));
     model->setRoom(secondRoom);
     QCOMPARE(spy.count(), 2);
-    QCOMPARE(model->room()->id(), u"#secondRoom:kde.org"_s);
+    QCOMPARE(model->room()->id(), QStringLiteral("#secondRoom:kde.org"));
     model->setRoom(nullptr);
     QCOMPARE(spy.count(), 3);
     QCOMPARE(model->room(), nullptr);
 }
 
-void TimelineMessageModelTest::simpleTimeline()
+void MessageEventModelTest::simpleTimeline()
 {
-    auto room = new TestUtils::TestRoom(connection, u"#myroom:kde.org"_s, u"test-messageventmodel-sync.json"_s);
+    auto room = new TestUtils::TestRoom(connection, QStringLiteral("#myroom:kde.org"), QLatin1String("test-messageventmodel-sync.json"));
 
     model->setRoom(room);
     QCOMPARE(model->rowCount(), 2);
 
-    QCOMPARE(model->data(model->index(0), TimelineMessageModel::DelegateTypeRole), DelegateType::State);
-    QCOMPARE(model->data(model->index(0)), u"changed their display name to Example Changed"_s);
+    QCOMPARE(model->data(model->index(0), MessageEventModel::DelegateTypeRole), DelegateType::State);
+    QCOMPARE(model->data(model->index(0)), QStringLiteral("changed their display name to Example Changed"));
 
-    QCOMPARE(model->data(model->index(1)), u"<b>This is an example<br>text message</b>"_s);
-    QCOMPARE(model->data(model->index(1), TimelineMessageModel::DelegateTypeRole), DelegateType::Message);
-    QCOMPARE(model->data(model->index(1), TimelineMessageModel::EventIdRole), u"$153456789:example.org"_s);
+    QCOMPARE(model->data(model->index(1)), QStringLiteral("<b>This is an example<br>text message</b>"));
+    QCOMPARE(model->data(model->index(1), MessageEventModel::DelegateTypeRole), DelegateType::Message);
+    QCOMPARE(model->data(model->index(1), MessageEventModel::EventIdRole), QStringLiteral("$153456789:example.org"));
 
     QTest::ignoreMessage(QtWarningMsg, "Index QModelIndex(-1,-1,0x0,QObject(0x0)) is not valid (expected valid)");
     QCOMPARE(model->data(model->index(-1)), QVariant());
@@ -111,33 +111,33 @@ void TimelineMessageModelTest::simpleTimeline()
     QCOMPARE(model->data(model->index(model->rowCount())), QVariant());
 }
 
-// Sync some events into the TimelineMessageModel's current room and don't crash.
-void TimelineMessageModelTest::syncNewEvents()
+// Sync some events into the MessageEventModel's current room and don't crash.
+void MessageEventModelTest::syncNewEvents()
 {
-    auto room = new TestUtils::TestRoom(connection, u"#myroom:kde.org"_s);
+    auto room = new TestUtils::TestRoom(connection, QStringLiteral("#myroom:kde.org"));
     QSignalSpy spy(room, SIGNAL(aboutToAddNewMessages(Quotient::RoomEventsRange)));
 
     model->setRoom(room);
     QCOMPARE(model->rowCount(), 0);
 
-    room->syncNewEvents(u"test-messageventmodel-sync.json"_s);
+    room->syncNewEvents(QLatin1String("test-messageventmodel-sync.json"));
 
     QCOMPARE(model->rowCount(), 2);
     QCOMPARE(spy.count(), 1);
 }
 
 // Check the adding of pending events to the room doesn't cause any issues in the model.
-void TimelineMessageModelTest::pendingEvent()
+void MessageEventModelTest::pendingEvent()
 {
     QSignalSpy spyInsert(model, SIGNAL(rowsInserted(const QModelIndex &, int, int)));
     QSignalSpy spyRemove(model, SIGNAL(rowsRemoved(const QModelIndex &, int, int)));
     QSignalSpy spyChanged(model, SIGNAL(dataChanged(const QModelIndex, const QModelIndex, const QList<int> &)));
 
-    auto room = new TestUtils::TestRoom(connection, u"#myroom:kde.org"_s);
+    auto room = new TestUtils::TestRoom(connection, QStringLiteral("#myroom:kde.org"));
     model->setRoom(room);
     QCOMPARE(model->rowCount(), 0);
 
-    auto txnId = room->postPlainText("New plain message"_L1);
+    auto txnId = room->postPlainText("New plain message"_ls);
     QCOMPARE(model->rowCount(), 1);
     QCOMPARE(spyInsert.count(), 1);
 
@@ -145,26 +145,26 @@ void TimelineMessageModelTest::pendingEvent()
     QCOMPARE(model->rowCount(), 0);
     QCOMPARE(spyRemove.count(), 1);
 
-    txnId = room->postPlainText("New plain message"_L1);
+    txnId = room->postPlainText("New plain message"_ls);
     QCOMPARE(model->rowCount(), 1);
     QCOMPARE(spyInsert.count(), 2);
 
     // We need to manually set the transaction ID of the new message as it will be
     // different every time.
     QFile testSyncFile;
-    testSyncFile.setFileName(QStringLiteral(DATA_DIR) + u'/' + u"test-pending-sync.json"_s);
+    testSyncFile.setFileName(QLatin1String(DATA_DIR) + u'/' + QLatin1String("test-pending-sync.json"));
     testSyncFile.open(QIODevice::ReadOnly);
     auto testSyncJson = QJsonDocument::fromJson(testSyncFile.readAll());
     auto root = testSyncJson.object();
-    auto timeline = root["timeline"_L1].toObject();
-    auto events = timeline["events"_L1].toArray();
+    auto timeline = root["timeline"_ls].toObject();
+    auto events = timeline["events"_ls].toArray();
     auto firstEvent = events[0].toObject();
-    firstEvent.insert("unsigned"_L1, QJsonObject{{"transaction_id"_L1, txnId}});
+    firstEvent.insert(QLatin1String("unsigned"), QJsonObject{{QLatin1String("transaction_id"), txnId}});
     events[0] = firstEvent;
-    timeline.insert("events"_L1, events);
-    root.insert("timeline"_L1, timeline);
+    timeline.insert("events"_ls, events);
+    root.insert("timeline"_ls, timeline);
     testSyncJson.setObject(root);
-    SyncRoomData roomData(u"@bob:kde.org"_s, JoinState::Join, testSyncJson.object());
+    SyncRoomData roomData(QStringLiteral("@bob:kde.org"), JoinState::Join, testSyncJson.object());
     room->update(std::move(roomData));
 
     QCOMPARE(model->rowCount(), 1);
@@ -174,7 +174,7 @@ void TimelineMessageModelTest::pendingEvent()
     auto isPendingChanged = false;
     for (auto signal : spyChanged) {
         auto roles = signal.at(2).toList();
-        if (roles.contains(TimelineMessageModel::IsPendingRole)) {
+        if (roles.contains(MessageEventModel::IsPendingRole)) {
             isPendingChanged = true;
         }
     }
@@ -182,33 +182,33 @@ void TimelineMessageModelTest::pendingEvent()
 }
 
 // Make sure that the signals are disconnecting correctly when a room is switched.
-void TimelineMessageModelTest::disconnect()
+void MessageEventModelTest::disconnect()
 {
-    auto room = new TestUtils::TestRoom(connection, u"#myroom:kde.org"_s);
+    auto room = new TestUtils::TestRoom(connection, QStringLiteral("#myroom:kde.org"));
     model->setRoom(room);
 
     QSignalSpy spy(model, SIGNAL(rowsInserted(const QModelIndex &, int, int)));
 
     model->setRoom(nullptr);
-    room->syncNewEvents(u"test-messageventmodel-sync.json"_s);
+    room->syncNewEvents(QLatin1String("test-messageventmodel-sync.json"));
 
     QCOMPARE(spy.count(), 0);
 }
 
-void TimelineMessageModelTest::idToRow()
+void MessageEventModelTest::idToRow()
 {
-    auto room = new TestUtils::TestRoom(connection, u"#myroom:kde.org"_s, u"test-min-sync.json"_s);
+    auto room = new TestUtils::TestRoom(connection, QStringLiteral("#myroom:kde.org"), QLatin1String("test-min-sync.json"));
     model->setRoom(room);
 
-    QCOMPARE(model->eventIdToRow(u"$153456789:example.org"_s), 0);
+    QCOMPARE(model->eventIdToRow(QStringLiteral("$153456789:example.org")), 0);
 }
 
-void TimelineMessageModelTest::cleanup()
+void MessageEventModelTest::cleanup()
 {
     delete model;
     model = nullptr;
     QCOMPARE(model, nullptr);
 }
 
-QTEST_MAIN(TimelineMessageModelTest)
-#include "timelinemessagemodeltest.moc"
+QTEST_MAIN(MessageEventModelTest)
+#include "messageeventmodeltest.moc"

autotests/neochatroomtest.cpp

@@ -27,8 +27,8 @@ private Q_SLOTS:
 
 void NeoChatRoomTest::initTestCase()
 {
-    connection = Connection::makeMockConnection(u"@bob:kde.org"_s);
-    room = new TestUtils::TestRoom(connection, u"#myroom:kde.org"_s, u"test-min-sync.json"_s);
+    connection = Connection::makeMockConnection(QStringLiteral("@bob:kde.org"));
+    room = new TestUtils::TestRoom(connection, QStringLiteral("#myroom:kde.org"), "test-min-sync.json"_ls);
 }
 
 void NeoChatRoomTest::eventTest()

autotests/pollhandlertest.cpp

@@ -31,8 +31,8 @@ private Q_SLOTS:
 
 void PollHandlerTest::initTestCase()
 {
-    connection = Connection::makeMockConnection(u"@bob:kde.org"_s);
-    room = new TestUtils::TestRoom(connection, u"#myroom:kde.org"_s, u"test-pollhandlerstart-sync.json"_s);
+    connection = Connection::makeMockConnection(QStringLiteral("@bob:kde.org"));
+    room = new TestUtils::TestRoom(connection, QStringLiteral("#myroom:kde.org"), "test-pollhandlerstart-sync.json"_ls);
 }
 
 // Basically don't crash.
@@ -54,16 +54,16 @@ void PollHandlerTest::poll()
     auto startEvent = eventCast<const PollStartEvent>(room->messageEvents().at(0).get());
     auto pollHandler = PollHandler(room, startEvent);
 
-    auto options = QJsonArray{QJsonObject{{"id"_L1, "option1"_L1}, {"org.matrix.msc1767.text"_L1, "option1"_L1}},
-                              QJsonObject{{"id"_L1, "option2"_L1}, {"org.matrix.msc1767.text"_L1, "option2"_L1}}};
+    auto options = QJsonArray{QJsonObject{{"id"_ls, "option1"_ls}, {"org.matrix.msc1767.text"_ls, "option1"_ls}},
+                              QJsonObject{{"id"_ls, "option2"_ls}, {"org.matrix.msc1767.text"_ls, "option2"_ls}}};
 
     QCOMPARE(pollHandler.hasEnded(), false);
     QCOMPARE(pollHandler.answerCount(), 0);
-    QCOMPARE(pollHandler.question(), u"test"_s);
+    QCOMPARE(pollHandler.question(), QStringLiteral("test"));
     QCOMPARE(pollHandler.options(), options);
     QCOMPARE(pollHandler.answers(), QJsonObject());
     QCOMPARE(pollHandler.counts(), QJsonObject());
-    QCOMPARE(pollHandler.kind(), u"org.matrix.msc3381.poll.disclosed"_s);
+    QCOMPARE(pollHandler.kind(), QStringLiteral("org.matrix.msc3381.poll.disclosed"));
 }
 
 QTEST_GUILESS_MAIN(PollHandlerTest)

autotests/reactionmodeltest.cpp

@@ -31,8 +31,8 @@ private Q_SLOTS:
 
 void ReactionModelTest::initTestCase()
 {
-    connection = Connection::makeMockConnection(u"@bob:kde.org"_s);
-    room = new TestUtils::TestRoom(connection, u"#myroom:kde.org"_s, u"test-reactionmodel-sync.json"_s);
+    connection = Connection::makeMockConnection(QStringLiteral("@bob:kde.org"));
+    room = new TestUtils::TestRoom(connection, QStringLiteral("#myroom:kde.org"), QLatin1String("test-reactionmodel-sync.json"));
 }
 
 void ReactionModelTest::nullModel()
@@ -49,9 +49,10 @@ void ReactionModelTest::basicReaction()
     auto model = ReactionModel(event, room);
 
     QCOMPARE(model.rowCount(), 1);
-    QCOMPARE(model.data(model.index(0), ReactionModel::TextContentRole), u"<span style=\"font-family: 'emoji';\">👍</span>"_s);
-    QCOMPARE(model.data(model.index(0), ReactionModel::ReactionRole), u"👍"_s);
-    QCOMPARE(model.data(model.index(0), ReactionModel::ToolTipRole), u"Alice Margatroid reacted with <span style=\"font-family: 'emoji';\">👍</span>"_s);
+    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>"));
     QCOMPARE(model.data(model.index(0), ReactionModel::HasLocalMember), false);
 }
 
@@ -61,16 +62,17 @@ void ReactionModelTest::newReaction()
     auto model = new ReactionModel(event, room);
 
     QCOMPARE(model->rowCount(), 1);
-    QCOMPARE(model->data(model->index(0), ReactionModel::ToolTipRole), u"Alice Margatroid reacted with <span style=\"font-family: 'emoji';\">👍</span>"_s);
+    QCOMPARE(model->data(model->index(0), ReactionModel::ToolTipRole),
+             QStringLiteral("Alice Margatroid reacted with <span style=\"font-family: 'emoji';\">👍</span>"));
 
     QSignalSpy spy(model, SIGNAL(modelReset()));
 
-    room->syncNewEvents(u"test-reactionmodel-extra-sync.json"_s);
+    room->syncNewEvents(QLatin1String("test-reactionmodel-extra-sync.json"));
     QCOMPARE(model->rowCount(), 2);
     QCOMPARE(spy.count(), 2); // Once for each of the 2 new reactions.
-    QCOMPARE(model->data(model->index(1), ReactionModel::ReactionRole), u"😆"_s);
+    QCOMPARE(model->data(model->index(1), ReactionModel::ReactionRole), QStringLiteral("😆"));
     QCOMPARE(model->data(model->index(0), ReactionModel::ToolTipRole),
-             u"Alice Margatroid and Bob reacted with <span style=\"font-family: 'emoji';\">👍</span>"_s);
+             QStringLiteral("Alice Margatroid and Bob reacted with <span style=\"font-family: 'emoji';\">👍</span>"));
 
     delete model;
 }

autotests/testutils.h

@@ -31,7 +31,7 @@ public:
     {
         if (!syncFileName.isEmpty()) {
             QFile testSyncFile;
-            testSyncFile.setFileName(QStringLiteral(DATA_DIR) + u'/' + syncFileName);
+            testSyncFile.setFileName(QLatin1String(DATA_DIR) + u'/' + syncFileName);
             testSyncFile.open(QIODevice::ReadOnly);
             const auto testSyncJson = QJsonDocument::fromJson(testSyncFile.readAll());
             Quotient::SyncRoomData roomData(id(), Quotient::JoinState::Join, testSyncJson.object());
@@ -45,7 +45,7 @@ inline Quotient::event_ptr_tt<EventT> loadEventFromFile(const QString &eventFile
 {
     if (!eventFileName.isEmpty()) {
         QFile testEventFile;
-        testEventFile.setFileName(QStringLiteral(DATA_DIR) + u'/' + eventFileName);
+        testEventFile.setFileName(QLatin1String(DATA_DIR) + u'/' + eventFileName);
         testEventFile.open(QIODevice::ReadOnly);
         auto testSyncJson = QJsonDocument::fromJson(testEventFile.readAll()).object();
         return Quotient::loadEvent<EventT>(testSyncJson);

autotests/texthandlertest.cpp

@@ -63,7 +63,6 @@ private Q_SLOTS:
     void receiveRichEdited();
     void receiveLineSeparator();
     void receiveRichCodeUrl();
-    void receiveRichColor();
 
     void componentOutput_data();
     void componentOutput();
@@ -71,25 +70,25 @@ private Q_SLOTS:
 
 void TextHandlerTest::initTestCase()
 {
-    connection = Connection::makeMockConnection(u"@bob:kde.org"_s);
-    connection->setAccountData(u"im.ponies.user_emotes"_s,
-                               QJsonObject{{"images"_L1,
-                                            QJsonObject{{"test"_L1,
-                                                         QJsonObject{{"body"_L1, "Test custom emoji"_L1},
-                                                                     {"url"_L1, "mxc://example.org/test"_L1},
-                                                                     {"usage"_L1, QJsonArray{"emoticon"_L1}}}}}}});
+    connection = Connection::makeMockConnection(QStringLiteral("@bob:kde.org"));
+    connection->setAccountData("im.ponies.user_emotes"_ls,
+                               QJsonObject{{"images"_ls,
+                                            QJsonObject{{"test"_ls,
+                                                         QJsonObject{{"body"_ls, "Test custom emoji"_ls},
+                                                                     {"url"_ls, "mxc://example.org/test"_ls},
+                                                                     {"usage"_ls, QJsonArray{"emoticon"_ls}}}}}}});
     CustomEmojiModel::instance().setConnection(static_cast<NeoChatConnection *>(connection));
 
-    room = new TestUtils::TestRoom(connection, u"#myroom:kde.org"_s, u"test-texthandler-sync.json"_s);
+    room = new TestUtils::TestRoom(connection, QStringLiteral("#myroom:kde.org"), QLatin1String("test-texthandler-sync.json"));
 }
 
 void TextHandlerTest::allowedAttributes()
 {
-    const QString testInputString1 = u"<span data-mx-spoiler><font color=#FFFFFF>Test</font><span>"_s;
-    const QString testOutputString1 = u"<span data-mx-spoiler><font color=#FFFFFF>Test</font><span>"_s;
+    const QString testInputString1 = QStringLiteral("<span data-mx-spoiler><font color=#FFFFFF>Test</font><span>");
+    const QString testOutputString1 = QStringLiteral("<span data-mx-spoiler><font color=#FFFFFF>Test</font><span>");
     // Handle urls where the href has either single (') or double (") quotes.
-    const QString testInputString2 = u"<a href=\"https://kde.org\">link</a><a href='https://kde.org'>link</a>"_s;
-    const QString testOutputString2 = u"<a href=\"https://kde.org\">link</a><a href='https://kde.org'>link</a>"_s;
+    const QString testInputString2 = QStringLiteral("<a href=\"https://kde.org\">link</a><a href='https://kde.org'>link</a>");
+    const QString testOutputString2 = QStringLiteral("<a href=\"https://kde.org\">link</a><a href='https://kde.org'>link</a>");
 
     TextHandler testTextHandler;
     testTextHandler.setData(testInputString1);
@@ -104,8 +103,8 @@ void TextHandlerTest::allowedAttributes()
 
 void TextHandlerTest::stripDisallowedTags()
 {
-    const QString testInputString = u"<p>Allowed</p> <span>Allowed</span> <body>Disallowed</body>"_s;
-    const QString testOutputString = u"<p>Allowed</p> <span>Allowed</span> Disallowed"_s;
+    const QString testInputString = QStringLiteral("<p>Allowed</p> <span>Allowed</span> <body>Disallowed</body>");
+    const QString testOutputString = QStringLiteral("<p>Allowed</p> <span>Allowed</span> Disallowed");
 
     TextHandler testTextHandler;
     testTextHandler.setData(testInputString);
@@ -116,8 +115,8 @@ void TextHandlerTest::stripDisallowedTags()
 
 void TextHandlerTest::stripDisallowedAttributes()
 {
-    const QString testInputString = u"<p style=\"font-size:50px;\" color=#FFFFFF>Test</p>"_s;
-    const QString testOutputString = u"Test"_s;
+    const QString testInputString = QStringLiteral("<p style=\"font-size:50px;\" color=#FFFFFF>Test</p>");
+    const QString testOutputString = QStringLiteral("Test");
 
     TextHandler testTextHandler;
     testTextHandler.setData(testInputString);
@@ -132,8 +131,8 @@ void TextHandlerTest::stripDisallowedAttributes()
  */
 void TextHandlerTest::emptyCodeTags()
 {
-    const QString testInputString = u"<pre><code></code></pre>"_s;
-    const QString testOutputString = u"<pre><code></code></pre>"_s;
+    const QString testInputString = QStringLiteral("<pre><code></code></pre>");
+    const QString testOutputString = QStringLiteral("<pre><code></code></pre>");
 
     TextHandler testTextHandler;
     testTextHandler.setData(testInputString);
@@ -144,8 +143,8 @@ void TextHandlerTest::emptyCodeTags()
 
 void TextHandlerTest::sendSimpleStringCase()
 {
-    const QString testInputString = u"This data should just be left alone."_s;
-    const QString testOutputString = u"This data should just be left alone."_s;
+    const QString testInputString = QStringLiteral("This data should just be left alone.");
+    const QString testOutputString = QStringLiteral("This data should just be left alone.");
 
     TextHandler testTextHandler;
     testTextHandler.setData(testInputString);
@@ -155,10 +154,11 @@ void TextHandlerTest::sendSimpleStringCase()
 
 void TextHandlerTest::sendSingleParaMarkup()
 {
-    const QString testInputString =
-        u"Text para with **bold**, *italic*, [link](https://kde.org), ![image](mxc://kde.org/aebd3ffd40503e1ef0525bf8f0d60282fec6183e), `inline code`."_s;
-    const QString testOutputString =
-        u"Text para with <strong>bold</strong>, <em>italic</em>, <a href=\"https://kde.org\">link</a>, <img src=\"mxc://kde.org/aebd3ffd40503e1ef0525bf8f0d60282fec6183e\" alt=\"image\">, <code>inline code</code>."_s;
+    const QString testInputString = QStringLiteral(
+        "Text para with **bold**, *italic*, [link](https://kde.org), ![image](mxc://kde.org/aebd3ffd40503e1ef0525bf8f0d60282fec6183e), `inline code`.");
+    const QString testOutputString = QStringLiteral(
+        "Text para with <strong>bold</strong>, <em>italic</em>, <a href=\"https://kde.org\">link</a>, <img "
+        "src=\"mxc://kde.org/aebd3ffd40503e1ef0525bf8f0d60282fec6183e\" alt=\"image\">, <code>inline code</code>.");
 
     TextHandler testTextHandler;
     testTextHandler.setData(testInputString);
@@ -169,9 +169,11 @@ void TextHandlerTest::sendSingleParaMarkup()
 void TextHandlerTest::sendMultipleSectionMarkup()
 {
     const QString testInputString =
-        u"Text para\n> blockquote\n* List 1\n* List 2\n1. one\n2. two\n# Heading 1\n## Heading 2\nhorizontal rule\n\n---\n```\ncodeblock\n```"_s;
-    const QString testOutputString =
-        u"<p>Text para</p>\n<blockquote>\n<p>blockquote</p>\n</blockquote>\n<ul>\n<li>List 1</li>\n<li>List 2</li>\n</ul>\n<ol>\n<li>one</li>\n<li>two</li>\n</ol>\n<h1>Heading 1</h1>\n<h2>Heading 2</h2>\n<p>horizontal rule</p>\n<hr>\n<pre><code>codeblock\n</code></pre>"_s;
+        QStringLiteral("Text para\n> blockquote\n* List 1\n* List 2\n1. one\n2. two\n# Heading 1\n## Heading 2\nhorizontal rule\n\n---\n```\ncodeblock\n```");
+    const QString testOutputString = QStringLiteral(
+        "<p>Text para</p>\n<blockquote>\n<p>blockquote</p>\n</blockquote>\n<ul>\n<li>List 1</li>\n<li>List "
+        "2</li>\n</ul>\n<ol>\n<li>one</li>\n<li>two</li>\n</ol>\n<h1>Heading 1</h1>\n<h2>Heading 2</h2>\n<p>horizontal "
+        "rule</p>\n<hr>\n<pre><code>codeblock\n</code></pre>");
 
     TextHandler testTextHandler;
     testTextHandler.setData(testInputString);
@@ -181,8 +183,8 @@ void TextHandlerTest::sendMultipleSectionMarkup()
 
 void TextHandlerTest::sendBadLinks()
 {
-    const QString testInputString = u"[link](kde.org), ![image](https://kde.org/aebd3ffd40503e1ef0525bf8f0d60282fec6183e)"_s;
-    const QString testOutputString = u"<a>link</a>, <img alt=\"image\">"_s;
+    const QString testInputString = QStringLiteral("[link](kde.org), ![image](https://kde.org/aebd3ffd40503e1ef0525bf8f0d60282fec6183e)");
+    const QString testOutputString = QStringLiteral("<a>link</a>, <img alt=\"image\">");
 
     TextHandler testTextHandler;
     testTextHandler.setData(testInputString);
@@ -195,9 +197,9 @@ void TextHandlerTest::sendBadLinks()
  */
 void TextHandlerTest::sendEscapeCode()
 {
-    const QString testInputString = u"```\n<p>Test <span style=\"font-size:50px;\">some</span> code</p>\n```"_s;
+    const QString testInputString = QStringLiteral("```\n<p>Test <span style=\"font-size:50px;\">some</span> code</p>\n```");
     const QString testOutputString =
-        u"<pre><code>&lt;p&gt;Test &lt;span style=&quot;font-size:50px;&quot;&gt;some&lt;/span&gt; code&lt;/p&gt;\n</code></pre>"_s;
+        QStringLiteral("<pre><code>&lt;p&gt;Test &lt;span style=&quot;font-size:50px;&quot;&gt;some&lt;/span&gt; code&lt;/p&gt;\n</code></pre>");
 
     TextHandler testTextHandler;
     testTextHandler.setData(testInputString);
@@ -207,8 +209,8 @@ void TextHandlerTest::sendEscapeCode()
 
 void TextHandlerTest::sendCodeClass()
 {
-    const QString testInputString = u"```html\nsome code\n```\n<pre><code class=\"code-underline\">some more code</code></pre>"_s;
-    const QString testOutputString = u"<pre><code class=\"language-html\">some code\n</code></pre>\n<pre><code>some more code</code></pre>"_s;
+    const QString testInputString = QStringLiteral("```html\nsome code\n```\n<pre><code class=\"code-underline\">some more code</code></pre>");
+    const QString testOutputString = QStringLiteral("<pre><code class=\"language-html\">some code\n</code></pre>\n<pre><code>some more code</code></pre>");
 
     TextHandler testTextHandler;
     testTextHandler.setData(testInputString);
@@ -218,9 +220,9 @@ void TextHandlerTest::sendCodeClass()
 
 void TextHandlerTest::sendCustomEmoji()
 {
-    const QString testInputString = u":test:"_s;
+    const QString testInputString = QStringLiteral(":test:");
     const QString testOutputString =
-        u"<img data-mx-emoticon=\"\" src=\"mxc://example.org/test\" alt=\":test:\" title=\":test:\" height=\"32\" vertical-align=\"middle\" />"_s;
+        QStringLiteral("<img data-mx-emoticon=\"\" src=\"mxc://example.org/test\" alt=\":test:\" title=\":test:\" height=\"32\" vertical-align=\"middle\" />");
 
     TextHandler testTextHandler;
     testTextHandler.setData(testInputString);
@@ -233,8 +235,8 @@ void TextHandlerTest::sendCustomEmojiCode_data()
     QTest::addColumn<QString>("testInputString");
     QTest::addColumn<QString>("testOutputString");
 
-    QTest::newRow("inline") << u"`:test:`"_s << u"<code>:test:</code>"_s;
-    QTest::newRow("block") << u"```\n:test:\n```"_s << u"<pre><code>:test:\n</code></pre>"_s;
+    QTest::newRow("inline") << QStringLiteral("`:test:`") << QStringLiteral("<code>:test:</code>");
+    QTest::newRow("block") << QStringLiteral("```\n:test:\n```") << QStringLiteral("<pre><code>:test:\n</code></pre>");
 }
 
 // Custom emojis in code blocks should be left alone.
@@ -251,9 +253,9 @@ void TextHandlerTest::sendCustomEmojiCode()
 
 void TextHandlerTest::receiveSpacelessSelfClosingTag()
 {
-    const QString testInputString = u"Test...<br/>...ing"_s;
-    const QString testRichOutputString = u"Test...<br/>...ing"_s;
-    const QString testPlainOutputString = u"Test...\n...ing"_s;
+    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);
@@ -264,9 +266,10 @@ void TextHandlerTest::receiveSpacelessSelfClosingTag()
 
 void TextHandlerTest::receiveStripReply()
 {
-    const QString testInputString =
-        u"<mx-reply><blockquote><a href=\"https://matrix.to/#/!somewhere:example.org/$event:example.org\">In reply to</a><a href=\"https://matrix.to/#/@alice:example.org\">@alice:example.org</a><br />Message replied to.</blockquote></mx-reply>Reply message."_s;
-    const QString testOutputString = u"Reply message."_s;
+    const QString testInputString = QStringLiteral(
+        "<mx-reply><blockquote><a href=\"https://matrix.to/#/!somewhere:example.org/$event:example.org\">In reply to</a><a "
+        "href=\"https://matrix.to/#/@alice:example.org\">@alice:example.org</a><br />Message replied to.</blockquote></mx-reply>Reply message.");
+    const QString testOutputString = QStringLiteral("Reply message.");
 
     TextHandler testTextHandler;
     testTextHandler.setData(testInputString);
@@ -280,10 +283,10 @@ void TextHandlerTest::receiveRichInPlainOut_data()
     QTest::addColumn<QString>("testInputString");
     QTest::addColumn<QString>("testOutputString");
 
-    QTest::newRow("ampersand") << u"a &amp; b"_s << u"a & b"_s;
-    QTest::newRow("quote") << u"&quot;a and b&quot;"_s << u"\"a and b\""_s;
-    QTest::newRow("new line") << u"new<br>line"_s << u"new\nline"_s;
-    QTest::newRow("unescape") << u"can&#x27;t"_s << u"can't"_s;
+    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()
@@ -299,13 +302,13 @@ void TextHandlerTest::receiveRichInPlainOut()
 
 void TextHandlerTest::receivePlainTextIn()
 {
-    const QString testInputString = u"<plain text in tag bracket>\nTest link https://kde.org."_s;
-    const QString testOutputStringRich = u"&lt;plain text in tag bracket&gt;<br>Test link <a href=\"https://kde.org\">https://kde.org</a>."_s;
-    QString testOutputStringPlain = u"<plain text in tag bracket>\nTest link https://kde.org."_s;
+    const QString testInputString = QStringLiteral("<plain text in tag bracket>\nTest link https://kde.org.");
+    const QString testOutputStringRich = QStringLiteral("&lt;plain text in tag bracket&gt;<br>Test link <a href=\"https://kde.org\">https://kde.org</a>.");
+    QString testOutputStringPlain = QStringLiteral("<plain text in tag bracket>\nTest link https://kde.org.");
 
     // Make sure quotes are maintained in a plain string.
-    const QString testInputString2 = u"last line is \"Time to switch to a new topic.\""_s;
-    const QString testOutputString2 = u"last line is \"Time to switch to a new topic.\""_s;
+    const QString testInputString2 = QStringLiteral("last line is \"Time to switch to a new topic.\"");
+    const QString testOutputString2 = QStringLiteral("last line is \"Time to switch to a new topic.\"");
 
     TextHandler testTextHandler;
     testTextHandler.setData(testInputString);
@@ -320,12 +323,12 @@ void TextHandlerTest::receivePlainTextIn()
 
 void TextHandlerTest::receiveStripNewlines()
 {
-    const QString testInputStringPlain = u"Test\nmany\nnew\nlines."_s;
-    const QString testInputStringRich = u"Test<br>many<br />new<br>lines."_s;
-    const QString testOutputString = u"Test many new lines."_s;
+    const QString testInputStringPlain = QStringLiteral("Test\nmany\nnew\nlines.");
+    const QString testInputStringRich = QStringLiteral("Test<br>many<br />new<br>lines.");
+    const QString testOutputString = QStringLiteral("Test many new lines.");
 
-    const QString testInputStringPlain2 = u"* List\n* Items"_s;
-    const QString testOutputString2 = u"List Items"_s;
+    const QString testInputStringPlain2 = QStringLiteral("* List\n* Items");
+    const QString testOutputString2 = QStringLiteral("List Items");
 
     TextHandler testTextHandler;
     testTextHandler.setData(testInputStringPlain);
@@ -347,8 +350,8 @@ void TextHandlerTest::receiveStripNewlines()
  */
 void TextHandlerTest::receivePlainStripHtml()
 {
-    const QString testInputString = u"<p>Test</p> <pre><code>Some code <strong>with tags</strong></code></pre>"_s;
-    const QString testOutputString = u"Test Some code <strong>with tags</strong>"_s;
+    const QString testInputString = QStringLiteral("<p>Test</p> <pre><code>Some code <strong>with tags</strong></code></pre>");
+    const QString testOutputString = QStringLiteral("Test Some code <strong>with tags</strong>");
 
     TextHandler testTextHandler;
     testTextHandler.setData(testInputString);
@@ -358,8 +361,8 @@ void TextHandlerTest::receivePlainStripHtml()
 
 void TextHandlerTest::receivePlainStripMarkup()
 {
-    const QString testInputString = u"**bold** `<p>inline code</p>` *italic*"_s;
-    const QString testOutputString = u"bold <p>inline code</p> italic"_s;
+    const QString testInputString = QStringLiteral("**bold** `<p>inline code</p>` *italic*");
+    const QString testOutputString = QStringLiteral("bold <p>inline code</p> italic");
 
     TextHandler testTextHandler;
     testTextHandler.setData(testInputString);
@@ -369,8 +372,8 @@ void TextHandlerTest::receivePlainStripMarkup()
 
 void TextHandlerTest::receiveRichUserPill()
 {
-    const QString testInputString = u"<p><a href=\"https://matrix.to/#/@alice:example.org\">@alice:example.org</a></p>"_s;
-    const QString testOutputString = u"<b><a href=\"https://matrix.to/#/@alice:example.org\">@alice:example.org</a></b>"_s;
+    const QString testInputString = QStringLiteral("<p><a href=\"https://matrix.to/#/@alice:example.org\">@alice:example.org</a></p>");
+    const QString testOutputString = QStringLiteral("<b><a href=\"https://matrix.to/#/@alice:example.org\">@alice:example.org</a></b>");
 
     TextHandler testTextHandler;
     testTextHandler.setData(testInputString);
@@ -380,8 +383,8 @@ void TextHandlerTest::receiveRichUserPill()
 
 void TextHandlerTest::receiveRichStrikethrough()
 {
-    const QString testInputString = u"<p><del>Test</del></p>"_s;
-    const QString testOutputString = u"<s>Test</s>"_s;
+    const QString testInputString = QStringLiteral("<p><del>Test</del></p>");
+    const QString testOutputString = QStringLiteral("<s>Test</s>");
 
     TextHandler testTextHandler;
     testTextHandler.setData(testInputString);
@@ -391,8 +394,8 @@ void TextHandlerTest::receiveRichStrikethrough()
 
 void TextHandlerTest::receiveRichtextIn()
 {
-    const QString testInputString = u"<p>Test</p> <pre><code>Some code <strong>with tags</strong></code></pre>"_s;
-    const QString testOutputString = u"<p>Test</p> <pre><code>Some code &lt;strong&gt;with tags&lt;/strong&gt;</code></pre>"_s;
+    const QString testInputString = QStringLiteral("<p>Test</p> <pre><code>Some code <strong>with tags</strong></code></pre>");
+    const QString testOutputString = QStringLiteral("<p>Test</p> <pre><code>Some code &lt;strong&gt;with tags&lt;/strong&gt;</code></pre>");
 
     TextHandler testTextHandler;
     testTextHandler.setData(testInputString);
@@ -402,10 +405,15 @@ void TextHandlerTest::receiveRichtextIn()
 
 void TextHandlerTest::receiveRichMxcUrl()
 {
-    const QString testInputString =
-        u"<img src=\"mxc://kde.org/aebd3ffd40503e1ef0525bf8f0d60282fec6183e\" alt=\"image\"><img src=\"mxc://kde.org/34c3464b3a1bd7f55af2d559e07d2c773c430e73\" alt=\"image\">"_s;
-    const QString testOutputString =
-        u"<img src=\"mxc://kde.org/aebd3ffd40503e1ef0525bf8f0d60282fec6183e?user_id=@bob:kde.org&room_id=%23myroom:kde.org&event_id=$143273582443PhrSn:example.org\" alt=\"image\"><img src=\"mxc://kde.org/34c3464b3a1bd7f55af2d559e07d2c773c430e73?user_id=@bob:kde.org&room_id=%23myroom:kde.org&event_id=$143273582443PhrSn:example.org\" alt=\"image\">"_s;
+    const QString testInputString = QStringLiteral(
+        "<img src=\"mxc://kde.org/aebd3ffd40503e1ef0525bf8f0d60282fec6183e\" alt=\"image\"><img src=\"mxc://kde.org/34c3464b3a1bd7f55af2d559e07d2c773c430e73\" "
+        "alt=\"image\">");
+    const QString testOutputString = QStringLiteral(
+        "<img "
+        "src=\"mxc://kde.org/aebd3ffd40503e1ef0525bf8f0d60282fec6183e?user_id=@bob:kde.org&room_id=%23myroom:kde.org&event_id=$143273582443PhrSn:example.org\" "
+        "alt=\"image\"><img "
+        "src=\"mxc://kde.org/34c3464b3a1bd7f55af2d559e07d2c773c430e73?user_id=@bob:kde.org&room_id=%23myroom:kde.org&event_id=$143273582443PhrSn:example.org\" "
+        "alt=\"image\">");
 
     TextHandler testTextHandler;
     testTextHandler.setData(testInputString);
@@ -423,27 +431,38 @@ void TextHandlerTest::receiveRichPlainUrl()
 {
     // This is an actual link that caused trouble which is why it's so long. Keeping
     // so we can confirm consistent behaviour for complex urls.
-    const QString testInputStringLink1 =
-        u"https://matrix.to/#/!RvzunyTWZGfNxJVQqv:matrix.org/$-9TJVTh5PvW6MvIhFDwteiyLBVGriinueO5eeIazQS8?via=libera.chat&amp;via=matrix.org&amp;via=fedora.im <a href=\"https://matrix.to/#/!RvzunyTWZGfNxJVQqv:matrix.org/$-9TJVTh5PvW6MvIhFDwteiyLBVGriinueO5eeIazQS8?via=libera.chat&amp;via=matrix.org&amp;via=fedora.im\">Link already rich</a>"_s;
-    const QString testOutputStringLink1 =
-        u"<a href=\"https://matrix.to/#/!RvzunyTWZGfNxJVQqv:matrix.org/$-9TJVTh5PvW6MvIhFDwteiyLBVGriinueO5eeIazQS8?via=libera.chat&amp;via=matrix.org&amp;via=fedora.im\">https://matrix.to/#/!RvzunyTWZGfNxJVQqv:matrix.org/$-9TJVTh5PvW6MvIhFDwteiyLBVGriinueO5eeIazQS8?via=libera.chat&amp;via=matrix.org&amp;via=fedora.im</a> <a href=\"https://matrix.to/#/!RvzunyTWZGfNxJVQqv:matrix.org/$-9TJVTh5PvW6MvIhFDwteiyLBVGriinueO5eeIazQS8?via=libera.chat&amp;via=matrix.org&amp;via=fedora.im\">Link already rich</a>"_s;
+    const QString testInputStringLink1 = QStringLiteral(
+        "https://matrix.to/#/!RvzunyTWZGfNxJVQqv:matrix.org/$-9TJVTh5PvW6MvIhFDwteiyLBVGriinueO5eeIazQS8?via=libera.chat&amp;via=matrix.org&amp;via=fedora.im "
+        "<a "
+        "href=\"https://matrix.to/#/!RvzunyTWZGfNxJVQqv:matrix.org/"
+        "$-9TJVTh5PvW6MvIhFDwteiyLBVGriinueO5eeIazQS8?via=libera.chat&amp;via=matrix.org&amp;via=fedora.im\">Link already rich</a>");
+    const QString testOutputStringLink1 = QStringLiteral(
+        "<a "
+        "href=\"https://matrix.to/#/!RvzunyTWZGfNxJVQqv:matrix.org/"
+        "$-9TJVTh5PvW6MvIhFDwteiyLBVGriinueO5eeIazQS8?via=libera.chat&amp;via=matrix.org&amp;via=fedora.im\">https://matrix.to/#/"
+        "!RvzunyTWZGfNxJVQqv:matrix.org/$-9TJVTh5PvW6MvIhFDwteiyLBVGriinueO5eeIazQS8?via=libera.chat&amp;via=matrix.org&amp;via=fedora.im</a> <a "
+        "href=\"https://matrix.to/#/!RvzunyTWZGfNxJVQqv:matrix.org/"
+        "$-9TJVTh5PvW6MvIhFDwteiyLBVGriinueO5eeIazQS8?via=libera.chat&amp;via=matrix.org&amp;via=fedora.im\">Link already rich</a>");
 
     // Another real case. The linkification wasn't handling it when a single link
     // contains what looks like and email. It was been broken into 3 but needs to
     // be just single link.
-    const QString testInputStringLink2 = u"https://lore.kernel.org/lkml/CAHk-=wio46vC4t6xXD-sFqjoPwFm_u515jm3suzmkGxQTeA1_A@mail.gmail.com/"_s;
-    const QString testOutputStringLink2 =
-        u"<a href=\"https://lore.kernel.org/lkml/CAHk-=wio46vC4t6xXD-sFqjoPwFm_u515jm3suzmkGxQTeA1_A@mail.gmail.com/\">https://lore.kernel.org/lkml/CAHk-=wio46vC4t6xXD-sFqjoPwFm_u515jm3suzmkGxQTeA1_A@mail.gmail.com/</a>"_s;
+    const QString testInputStringLink2 = QStringLiteral("https://lore.kernel.org/lkml/CAHk-=wio46vC4t6xXD-sFqjoPwFm_u515jm3suzmkGxQTeA1_A@mail.gmail.com/");
+    const QString testOutputStringLink2 = QStringLiteral(
+        "<a "
+        "href=\"https://lore.kernel.org/lkml/CAHk-=wio46vC4t6xXD-sFqjoPwFm_u515jm3suzmkGxQTeA1_A@mail.gmail.com/\">https://lore.kernel.org/lkml/"
+        "CAHk-=wio46vC4t6xXD-sFqjoPwFm_u515jm3suzmkGxQTeA1_A@mail.gmail.com/</a>");
 
-    QString testInputStringEmail = uR"(email@example.com <a href="mailto:email@example.com">Link already rich</a>)"_s;
-    QString testOutputStringEmail = uR"(<a href="mailto:email@example.com">email@example.com</a> <a href="mailto:email@example.com">Link already rich</a>)"_s;
+    QString testInputStringEmail = QStringLiteral(R"(email@example.com <a href="mailto:email@example.com">Link already rich</a>)");
+    QString testOutputStringEmail =
+        QStringLiteral(R"(<a href="mailto:email@example.com">email@example.com</a> <a href="mailto:email@example.com">Link already rich</a>)");
 
-    QString testInputStringMxId = u"@user:kde.org <a href=\"https://matrix.to/#/@user:kde.org\">Link already rich</a>"_s;
-    QString testOutputStringMxId =
-        u"<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>"_s;
+    QString testInputStringMxId = QStringLiteral("@user:kde.org <a href=\"https://matrix.to/#/@user:kde.org\">Link already rich</a>");
+    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 = u"a @user:kde.org b"_s;
-    QString testOutputStringMxIdWithPrefix = u"a <b><a href=\"https://matrix.to/#/@user:kde.org\">@user:kde.org</a></b> b"_s;
+    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);
@@ -468,9 +487,9 @@ void TextHandlerTest::receiveRichEdited_data()
     QTest::addColumn<QString>("testInputString");
     QTest::addColumn<QString>("testOutputString");
 
-    QTest::newRow("basic") << u"Edited"_s << u"Edited <span style=\"color:#000000\">(edited)</span>"_s;
-    QTest::newRow("multiple paragraphs") << u"<p>Edited</p>\n<p>Edited</p>"_s
-                                         << u"<p>Edited</p>\n<p>Edited <span style=\"color:#000000\">(edited)</span></p>"_s;
+    QTest::newRow("basic") << QStringLiteral("Edited") << QStringLiteral("Edited <span style=\"color:#000000\">(edited)</span>");
+    QTest::newRow("multiple paragraphs") << QStringLiteral("<p>Edited</p>\n<p>Edited</p>")
+                                         << QStringLiteral("<p>Edited</p>\n<p>Edited <span style=\"color:#000000\">(edited)</span></p>");
 }
 
 void TextHandlerTest::receiveRichEdited()
@@ -487,69 +506,61 @@ void TextHandlerTest::receiveRichEdited()
 
 void TextHandlerTest::receiveLineSeparator()
 {
-    auto text = u"foo\u2028bar"_s;
+    auto text = QStringLiteral("foo\u2028bar");
     TextHandler textHandler;
     textHandler.setData(text);
-    QCOMPARE(textHandler.handleRecievePlainText(Qt::PlainText, true), u"foo bar"_s);
+    QCOMPARE(textHandler.handleRecievePlainText(Qt::PlainText, true), QStringLiteral("foo bar"));
 }
 
 void TextHandlerTest::receiveRichCodeUrl()
 {
-    auto input = u"<code>https://kde.org</code>"_s;
+    auto input = QStringLiteral("<code>https://kde.org</code>");
     TextHandler testTextHandler;
     testTextHandler.setData(input);
     QCOMPARE(testTextHandler.handleRecieveRichText(), input);
 }
 
-void TextHandlerTest::receiveRichColor()
-{
-    const QString testInputString =
-        u"<span data-mx-color=\"#ff00be\">¯</span><span data-mx-color=\"#ff3b1d\">\\</span><span data-mx-color=\"#ffa600\">_</span><span data-mx-color=\"#64d200\">(</span><span data-mx-color=\"#00e261\">ツ</span><span data-mx-color=\"#00e7ff\">)</span><span data-mx-color=\"#00e1ff\">_</span><span data-mx-color=\"#00bdff\">/</span><span data-mx-color=\"#ff60ff\">¯</span>"_s;
-    const QString testOutputString =
-        u"<span style=\"color: #ff00be;\">¯</span><span style=\"color: #ff3b1d;\">\\</span><span style=\"color: #ffa600;\">_</span><span style=\"color: #64d200;\">(</span><span style=\"color: #00e261;\">ツ</span><span style=\"color: #00e7ff;\">)</span><span style=\"color: #00e1ff;\">_</span><span style=\"color: #00bdff;\">/</span><span style=\"color: #ff60ff;\">¯</span>"_s;
-
-    TextHandler testTextHandler;
-    testTextHandler.setData(testInputString);
-
-    qInfo() << testTextHandler.handleRecieveRichText();
-
-    QCOMPARE(testTextHandler.handleRecieveRichText(), testOutputString);
-}
-
 void TextHandlerTest::componentOutput_data()
 {
     QTest::addColumn<QString>("testInputString");
     QTest::addColumn<QList<MessageComponent>>("testOutputComponents");
 
-    QTest::newRow("multiple paragraphs") << u"<p>Text</p>\n<p>Text</p>"_s
-                                         << QList<MessageComponent>{MessageComponent{MessageComponentType::Text, u"Text"_s, {}},
-                                                                    MessageComponent{MessageComponentType::Text, u"Text"_s, {}}};
-    QTest::newRow("code") << u"<p>Text</p>\n<pre><code class=\"language-html\">Some code\n</code></pre>"_s
-                          << QList<MessageComponent>{MessageComponent{MessageComponentType::Text, u"Text"_s, {}},
-                                                     MessageComponent{MessageComponentType::Code, u"Some code"_s, QVariantMap{{u"class"_s, u"html"_s}}}};
-    QTest::newRow("quote") << u"<p>Text</p>\n<blockquote>\n<p>blockquote</p>\n</blockquote>"_s
-                           << QList<MessageComponent>{MessageComponent{MessageComponentType::Text, u"Text"_s, {}},
-                                                      MessageComponent{MessageComponentType::Quote, u"“blockquote”"_s, {}}};
-    QTest::newRow("no tag first paragraph") << u"Text\n<p>Text</p>"_s
-                                            << QList<MessageComponent>{MessageComponent{MessageComponentType::Text, u"Text"_s, {}},
-                                                                       MessageComponent{MessageComponentType::Text, u"Text"_s, {}}};
-    QTest::newRow("no tag last paragraph") << u"<p>Text</p>\nText"_s
-                                           << QList<MessageComponent>{MessageComponent{MessageComponentType::Text, u"Text"_s, {}},
-                                                                      MessageComponent{MessageComponentType::Text, u"Text"_s, {}}};
-    QTest::newRow("inline code") << u"<p><code>https://kde.org</code></p>\n<p>Text</p>"_s
-                                 << QList<MessageComponent>{MessageComponent{MessageComponentType::Text, u"<code>https://kde.org</code>"_s, {}},
-                                                            MessageComponent{MessageComponentType::Text, u"Text"_s, {}}};
-    QTest::newRow("inline code single block") << u"<code>https://kde.org</code>"_s
-                                              << QList<MessageComponent>{MessageComponent{MessageComponentType::Text, u"<code>https://kde.org</code>"_s, {}}};
+    QTest::newRow("multiple paragraphs") << QStringLiteral("<p>Text</p>\n<p>Text</p>")
+                                         << QList<MessageComponent>{MessageComponent{MessageComponentType::Text, QStringLiteral("Text"), {}},
+                                                                    MessageComponent{MessageComponentType::Text, QStringLiteral("Text"), {}}};
+    QTest::newRow("code") << QStringLiteral("<p>Text</p>\n<pre><code class=\"language-html\">Some code\n</code></pre>")
+                          << QList<MessageComponent>{MessageComponent{MessageComponentType::Text, QStringLiteral("Text"), {}},
+                                                     MessageComponent{MessageComponentType::Code,
+                                                                      QStringLiteral("Some code"),
+                                                                      QVariantMap{{QStringLiteral("class"), QStringLiteral("html")}}}};
+    QTest::newRow("quote") << QStringLiteral("<p>Text</p>\n<blockquote>\n<p>blockquote</p>\n</blockquote>")
+                           << QList<MessageComponent>{MessageComponent{MessageComponentType::Text, QStringLiteral("Text"), {}},
+                                                      MessageComponent{MessageComponentType::Quote, QStringLiteral("“blockquote”"), {}}};
+    QTest::newRow("no tag first paragraph") << QStringLiteral("Text\n<p>Text</p>")
+                                            << QList<MessageComponent>{MessageComponent{MessageComponentType::Text, QStringLiteral("Text"), {}},
+                                                                       MessageComponent{MessageComponentType::Text, QStringLiteral("Text"), {}}};
+    QTest::newRow("no tag last paragraph") << QStringLiteral("<p>Text</p>\nText")
+                                           << QList<MessageComponent>{MessageComponent{MessageComponentType::Text, QStringLiteral("Text"), {}},
+                                                                      MessageComponent{MessageComponentType::Text, QStringLiteral("Text"), {}}};
+    QTest::newRow("inline code") << QStringLiteral("<p><code>https://kde.org</code></p>\n<p>Text</p>")
+                                 << QList<MessageComponent>{MessageComponent{MessageComponentType::Text, QStringLiteral("<code>https://kde.org</code>"), {}},
+                                                            MessageComponent{MessageComponentType::Text, QStringLiteral("Text"), {}}};
+    QTest::newRow("inline code single block") << QStringLiteral("<code>https://kde.org</code>")
+                                              << QList<MessageComponent>{
+                                                     MessageComponent{MessageComponentType::Text, QStringLiteral("<code>https://kde.org</code>"), {}}};
     QTest::newRow("long start tag")
-        << u"Ah, you mean something like<br/><pre data-md=\"```\"><code class=\"language-qml\"># main.qml\nimport CustomQml\n...\nControls.TextField { id: someField }\nCustomQml {\n    someTextProperty: someField.text\n}\n</code></pre>Sure you can, it's still local to the same file where you defined the id"_s
+        << QStringLiteral(
+               "Ah, you mean something like<br/><pre data-md=\"```\"><code class=\"language-qml\"># main.qml\nimport CustomQml\n...\nControls.TextField { id: "
+               "someField }\nCustomQml {\n    someTextProperty: someField.text\n}\n</code></pre>Sure you can, it's still local to the same file where you "
+               "defined the id")
         << QList<MessageComponent>{
-               MessageComponent{MessageComponentType::Text, u"Ah, you mean something like<br/>"_s, {}},
+               MessageComponent{MessageComponentType::Text, QStringLiteral("Ah, you mean something like<br/>"), {}},
                MessageComponent{
                    MessageComponentType::Code,
-                   u"# main.qml\nimport CustomQml\n...\nControls.TextField { id: someField }\nCustomQml {\n    someTextProperty: someField.text\n}"_s,
-                   QVariantMap{{u"class"_s, u"qml"_s}}},
-               MessageComponent{MessageComponentType::Text, u"Sure you can, it's still local to the same file where you defined the id"_s, {}}};
+                   QStringLiteral(
+                       "# main.qml\nimport CustomQml\n...\nControls.TextField { id: someField }\nCustomQml {\n    someTextProperty: someField.text\n}"),
+                   QVariantMap{{QStringLiteral("class"), QStringLiteral("qml")}}},
+               MessageComponent{MessageComponentType::Text, QStringLiteral("Sure you can, it's still local to the same file where you defined the id"), {}}};
 }
 
 void TextHandlerTest::componentOutput()

org.kde.neochat.appdata.xml

@@ -26,7 +26,6 @@
   <name xml:lang="fr">NeoChat</name>
   <name xml:lang="gl">NeoChat</name>
   <name xml:lang="he">NeoChat</name>
-  <name xml:lang="hi">नियोचैट</name>
   <name xml:lang="hu">NeoChat</name>
   <name xml:lang="ia">Neochat</name>
   <name xml:lang="id">NeoChat</name>
@@ -42,7 +41,6 @@
   <name xml:lang="pt">NeoChat</name>
   <name xml:lang="pt-BR">NeoChat</name>
   <name xml:lang="ru">NeoChat</name>
-  <name xml:lang="sa">नवचैट्</name>
   <name xml:lang="sk">NeoChat</name>
   <name xml:lang="sl">NeoChat</name>
   <name xml:lang="sv">NeoChat</name>
@@ -58,23 +56,17 @@
   <summary xml:lang="ca-valencia">Xat a Matrix</summary>
   <summary xml:lang="de">Über Matrix unterhalten</summary>
   <summary xml:lang="en-GB">Chat on Matrix</summary>
-  <summary xml:lang="eo">Babilo en Matrix</summary>
   <summary xml:lang="es">Charle en Matrix</summary>
   <summary xml:lang="eu">Berriketa Matrix-en</summary>
-  <summary xml:lang="fi">Keskustelu Matrixissä</summary>
   <summary xml:lang="fr">Discuter sur Matrix</summary>
   <summary xml:lang="gl">Charlar en Matrix</summary>
-  <summary xml:lang="he">התכתבות דרך Matrix</summary>
-  <summary xml:lang="hi">मैट्रिक्स पर चैट करें</summary>
   <summary xml:lang="hu">Csevegés Matrixon</summary>
   <summary xml:lang="ia">Conversation en ditecto sur Matrix</summary>
   <summary xml:lang="it">Chat su Matrix</summary>
   <summary xml:lang="ka">ისაუბრეთ Matrix-ზე</summary>
-  <summary xml:lang="lv">Tērzējiet „Matrix“ tīklā</summary>
   <summary xml:lang="nl">Chat op Matrix</summary>
   <summary xml:lang="nn">Prat med via Matrix</summary>
   <summary xml:lang="pl">Rozmawiaj na Matriksie</summary>
-  <summary xml:lang="sa">Matrix इत्यत्र गपशपं कुर्वन्तु</summary>
   <summary xml:lang="sl">Klepet na Matrixu</summary>
   <summary xml:lang="sv">Chatta på Matrix</summary>
   <summary xml:lang="ta">மேட்ரிக்ஸுக்கான உரையாடல் செயலி</summary>
@@ -97,7 +89,6 @@
     <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="hi">नियोचैट एक चैट ऐप है जो आपको मैट्रिक्स नेटवर्क का पूरा लाभ उठाने देता है। यह आपको अपने परिवार, सहकर्मियों और दोस्तों को टेक्स्ट संदेश, वीडियो और ऑडियो फ़ाइलें भेजने का एक सुरक्षित तरीका प्रदान करता है।</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>
@@ -107,7 +98,6 @@
     <p xml:lang="nn">NeoChat er ein prateapp som lèt deg bruka all funksjonalitet i Matrix-nettverket. Du kan utveksla tekst, lyd og videoar med vennar, familie og kollegaar på ein trygg måte.</p>
     <p xml:lang="pl">NoeChat to aplikacja do rozmów, która umożliwia wykorzystanie wszystkich możliwości Matriksa. Umożliwia wysyłanie wiadomości tekstowych, filmów i dźwięków w bezpieczny sposób do twojej rodziny, kolegów i przyjaciół.</p>
     <p xml:lang="ru">NeoChat — приложение для общения, предоставляющее все преимущества сети Matrix. С его помощью можно безопасно отправлять текстовые сообщения, видеозаписи и звуковые файлы родственникам, коллегам и друзьям.</p>
-    <p xml:lang="sa">NeoChat इति एकं गपशप-अनुप्रयोगं यत् भवान् Matrix-जालस्य पूर्णं लाभं ग्रहीतुं शक्नोति । एतत् भवन्तं भवतः परिवाराय, सहकारिभ्यः, मित्रेभ्यः च पाठसन्देशान्, भिडियो, श्रव्यसञ्चिकाः च प्रेषयितुं सुरक्षितं मार्गं प्रदाति ।</p>
     <p xml:lang="sl">NeoChat je aplikacija za klepet, ki vam omogoča, da v celoti izkoristite omrežje Matrix. Zagotavlja vam varen način za pošiljanje besedilnih sporočil, videoposnetkov in zvočnih datotek vaši družini, sodelavcem in prijateljem.</p>
     <p xml:lang="sv">NeoChat är ett chattprogram som låter dig dra full nytta av Matrix-nätverket. Det ger dig ett säkert sätt att skicka textmeddelanden, videor och ljudfiler till din familj, kollegor och vänner.</p>
     <p xml:lang="tr">NeoChat, Matrix ağının tüm özelliklerini kullanan bir sohbet uygulamasıdır. Ailenize, arkadaşlarınıza ve iş arkadaşlarınıza metin iletileri, ses ve video dosyaları göndermenin kolay bir yolunu sunar.</p>
@@ -126,9 +116,8 @@
     <p xml:lang="eu">«NeoChat»ek «Matrix» zehaztapenaren ezaugarri guztiak eskaintzen dituen aplikazio bat izan nahi du. Beraz, egungo zehaztapen egonkorrean dagoen guztiaren euskarria du, VoIP, hariak eta muturren artean zifratzeko salbuespen nabarmenekin. Badira beste ez-betetze txikiago batzuk, «Matrix»en zehaztapena etengabe eboluzioan dagoelako, baina azken helburua zehaztapen osoaren euskarria ematea izaten jarraitzen du.</p>
     <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 é fornecer compatibilidade coa especificación completa.</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="hi">नियोचैट का लक्ष्य मैट्रिक्स विनिर्देश के लिए एक पूर्ण विशेषताओं वाला अनुप्रयोग बनना है। इस प्रकार वर्तमान स्थिर विनिर्देश में वीओआईपी, थ्रेड्स और एंड-टू-एंड एन्क्रिप्शन के कुछ पहलुओं के उल्लेखनीय अपवादों के साथ सब कुछ समर्थित है। मैट्रिक्स विनिर्देश लगातार विकसित हो रहा है, इस तथ्य के कारण कुछ अन्य छोटी चूकें हैं, लेकिन उद्देश्य पूरे विनिर्देश के लिए अंतिम समर्थन प्रदान करना है।</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="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>
@@ -140,7 +129,6 @@
     <p xml:lang="pl">NeoChat w zamyśle ma być pełnowartościową aplikacją wg wytycznych Matriksa. Z tego powodu, wszystko, co jest obecnie w stabilnych wytycznych z pominięciem VoIP, wątków i niektórych części szyfrowania Użytkownik-do-Użytkownika są obecnie obsługiwane. Pominięto też kilka mniejszych rzeczy ze względu na ciągły rozwój wytycznych Matriksa, lecz celem nadal jest zapewnienie obsługi wszystkich wytycznych.</p>
     <p xml:lang="pt">O NeoChat pretende ser uma aplicação completa para a especificação do Matrix. Como tal, tudo o que existe na especificação estável actual, com as notáveis excepções do VoIP, tópicos e alguns aspectos da Encriptação Ponto-a-Ponto, são suportados. Existem mais algumas omissões, devido ao facto que a norma do Matrix está em constante evolução, mas o objectivo continua a ser oferecer o suporte eventual para a norma por inteiro.</p>
     <p xml:lang="ru">Целью создания NeoChat является полноценная реализация программы для спецификации Matrix. Как следствие, реализовано всё в текущей стабильной спецификации (за исключением голосовой интернет-связи, потоков и некоторых аспектов сквозного шифрования). Есть также несколько других незначительных пробелов, обусловленных постоянными изменениями спецификации Matrix. Тем не менее, стоит задача в итоге предоставить полную поддержку спецификации.</p>
-    <p xml:lang="sa">NeoChat इत्यस्य उद्देश्यं Matrix विनिर्देशस्य कृते पूर्णतया विशेषतायुक्तः अनुप्रयोगः भवितुम् अस्ति । यथा तथा वर्तमानस्थिरविनिर्देशे सर्वं VoIP इत्यस्य उल्लेखनीयअपवादैः सह, थ्रेड्स तथा च End-to-End Encryption इत्यस्य केचन पक्षाः समर्थिताः सन्ति । अन्ये कतिचन लघु लोपाः सन्ति यतोहि Matrix spec निरन्तरं विकसितः अस्ति परन्तु उद्देश्यं सम्पूर्ण spec कृते अन्ततः समर्थनं प्रदातुं अवशिष्टम् अस्ति</p>
     <p xml:lang="sl">Neochat cilja, da bi bila popolna aplikacija po specifikaciji Matrixa. Kot takšna vsebuje vse v trenutni stabilni specifikaciji z pomembnimi izjemami pri VoIP, nitih in nekaterih vidikov šifriranja od konca do konca. Obstaja nekaj drugih manjših opustitev zaradi dejstva, da se specifikacija Matrix nenehno razvija, vendar cilj ostaja zagotoviti morebitno podporo celotni specifikaciji.</p>
     <p xml:lang="sv">NeoChat har som mål att vara ett fullständigt program enligt Matrix-specifikationen. Som sådant stöds allt i den nuvarande stabila specifikationen, med de nämnvärda undantagen VoIP, trådar och några aspekter av kryptering hela vägen. Det finns några ytterligare utelämnanden på grund av att Matrix-specifikationen hela tiden utvecklas, men målet förblir att till slut erbjuda stöd för hela specifikationen.</p>
     <p xml:lang="tr">NeoChat, Matrix belirtimi için tam özellikli bir uygulama olmayı hedefler. Bu nedenle; VoIP, ileti zincirleri ve Uçtan Uca Şifreleme’nin bazı yönleri gibi dikkate değer istisnalar dışında var olan kararlı belirtimdeki her şey desteklenir. Matrix belirtiminin sürekli gelişmesi nedeniyle birkaç küçük eksiklik daha var; ancak amaç tüm belirtim için nihai destek sağlamak olmayı sürdürüyor.</p>
@@ -161,7 +149,6 @@
     <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="hi">मैट्रिक्स विनिर्देश विकास की प्रकृति के कारण नियोचैट कई अस्थिर सुविधाओं का भी समर्थन करता है। वर्तमान में ये हैं:</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>
@@ -173,7 +160,6 @@
     <p xml:lang="pl">Ze względu na sposób rozwoju Matriksa, NeoChat obsługuje także kilka niestabilnych możliwości. Obecnie są to:</p>
     <p xml:lang="pt">Devido à natureza do desenvolvimento da especificação do Matrix, o NeoChat também suporta diversas funcionalidades instáveis. De momento são:</p>
     <p xml:lang="ru">В силу природы разработки спецификации Matrix в NeoChat тоже предусмотрена поддержка многочисленных нестабильных возможностей. В текущей версии это следующие возможности:</p>
-    <p xml:lang="sa">Matrix विनिर्देशविकासस्य प्रकृतेः कारणात् NeoChat अपि अनेकानाम् अस्थिरविशेषतानां समर्थनं करोति । सम्प्रति एते सन्ति :</p>
     <p xml:lang="sl">Zaradi narave razvoja specifikacije Matrixa NeoChat podpira tudi številne nestabilne zmožnosti. Trenutno so to:</p>
     <p xml:lang="sv">På grund av sättet Matrix-specifikationens utvecklas, stöder NeoChat också ett stor antal instabila funktioner. För närvarande är de:</p>
     <p xml:lang="ta">மேட்ரிக்ஸு நெறிமுறை வரையறுக்கப்படும் வித‍த்தின் காரணமாக, பல நிலையற்ற அம்சங்களையும் நியோச்சாட் ஆதரிக்கிறது. தற்போது ஆதரிக்கப்படுபவை:</p>
@@ -195,7 +181,6 @@
       <li xml:lang="fr">Sondages - MSC3381</li>
       <li xml:lang="gl">Enquisas — MSC3381</li>
       <li xml:lang="he">סקרים - MSC3381</li>
-      <li xml:lang="hi">पोल - 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 +192,6 @@
       <li xml:lang="pl">Ankiety - MSC3381</li>
       <li xml:lang="pt">Inquéritos - MSC3381</li>
       <li xml:lang="ru">Голосования — MSC3381</li>
-      <li xml:lang="sa">मतदान - MSC3381</li>
       <li xml:lang="sl">Polls - MSC3381</li>
       <li xml:lang="sv">Polls - MSC3381</li>
       <li xml:lang="ta">வாக்கெடுப்புகள் - MSC3381</li>
@@ -228,7 +212,6 @@
       <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="hi">स्टिकर पैक - 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>
@@ -240,7 +223,6 @@
       <li xml:lang="pl">Paczki naklejek - MSC2545</li>
       <li xml:lang="pt">Pacotes de Autocolantes - MSC2545</li>
       <li xml:lang="ru">Наборы стикеров — MSC2545</li>
-      <li xml:lang="sa">स्टिकर पैक - MSC2545</li>
       <li xml:lang="sl">Sticker Packs - MSC2545</li>
       <li xml:lang="sv">Sticker Packs - MSC2545</li>
       <li xml:lang="ta">ஒட்டி தொகுப்புகள் - MSC2545</li>
@@ -261,7 +243,6 @@
       <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="hi">स्थान घटनाएँ - 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>
@@ -273,7 +254,6 @@
       <li xml:lang="pl">Wydarzenia w miejscach - MSC3488</li>
       <li xml:lang="pt">Eventos com Localizações - MSC3488</li>
       <li xml:lang="ru">События местоположения — MSC3488</li>
-      <li xml:lang="sa">स्थान घटनाएँ - MSC3488</li>
       <li xml:lang="sl">Location Events - MSC3488</li>
       <li xml:lang="sv">Location Events - MSC3488</li>
       <li xml:lang="ta">இட நிகழ்வுகள் - MSC3488</li>
@@ -310,7 +290,6 @@
     <value key="KDE::windows_store::StoreLogoSquare">https://invent.kde.org/network/neochat/-/raw/master/icons/windows/storelogo-1080x1080.png</value>
     <value key="KDE::windows_store::Icon">https://invent.kde.org/network/neochat/-/raw/master/icons/300-apps-neochat.png</value>
     <value key="KDE::windows_store::PromotionalArt16x9">https://invent.kde.org/network/neochat/-/raw/master/icons/windows/promoimage-1920x1080.png</value>
-    <value key="KDE::supporters">Tanguy Fardet;[dabe](https://freeradical.zone/@dabe);[lengau](https://mastodon.world/@lengau);Joshua Strobl;Stuart Turton</value>
   </custom>
   <launchable type="desktop-id">org.kde.neochat.desktop</launchable>
   <screenshots>
@@ -330,7 +309,6 @@
       <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="hi">कमरे की सूची, चैट और कमरे की जानकारी के साथ मुख्य दृश्य</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>
@@ -342,7 +320,6 @@
       <caption xml:lang="pl">Główny widok z wykazem pokojów, rozmowami i szczegółami pokojów</caption>
       <caption xml:lang="pt">A área principal com a lista de salas e com informações sobre a conversa e a sala</caption>
       <caption xml:lang="ru">Главное окно со списком комнат, чатом и информацией о комнате</caption>
-      <caption xml:lang="sa">कक्षसूची, गपशपः, कक्षसूचना च सह मुख्यदृश्यम्</caption>
       <caption xml:lang="sl">Glavni pogled s seznamom sob, klepetom in informacijami o sobah</caption>
       <caption xml:lang="sv">Huvudvy med rumslista, chatt, och rumsinformation</caption>
       <caption xml:lang="ta">அரங்குப்பட்டியல், உரையாடல், மற்றும் அரங்குவிவரங்களைக் கொண்டுள்ள பிரதான காட்சி</caption>
@@ -367,7 +344,6 @@
       <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="hi">मैट्रिक्स स्पेस के साथ नए समुदायों की खोज करें</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>
@@ -377,7 +353,6 @@
       <caption xml:lang="nn">Oppdag nye fellesskap med Matrix Spaces</caption>
       <caption xml:lang="pl">Odkrywaj nowe społeczności w Przestrzeniach Matriksa</caption>
       <caption xml:lang="ru">Поиск новых сообществ с помощью Matrix Spaces</caption>
-      <caption xml:lang="sa">Matrix Spaces इत्यनेन सह नूतनानां समुदायानाम् अन्वेषणं कुर्वन्तु</caption>
       <caption xml:lang="sl">Odkrijte nove skupnosti z Matrix Spaces</caption>
       <caption xml:lang="sv">Upptäck nya gemenskaper med Matrix Spaces</caption>
       <caption xml:lang="ta">மேட்ரிக்ஸு இடங்களின் மூலம் புதிய சமூகங்களைக் கண்டுபிடிக்கலாம்</caption>
@@ -409,7 +384,6 @@
       <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="hi">कमरे की सूची, चैट और कमरे की जानकारी के साथ मुख्य दृश्य</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>
@@ -421,7 +395,6 @@
       <caption xml:lang="pl">Główny widok z wykazem pokojów, rozmowami i szczegółami pokojów</caption>
       <caption xml:lang="pt">A área principal com a lista de salas e com informações sobre a conversa e a sala</caption>
       <caption xml:lang="ru">Главное окно со списком комнат, чатом и информацией о комнате</caption>
-      <caption xml:lang="sa">कक्षसूची, गपशपः, कक्षसूचना च सह मुख्यदृश्यम्</caption>
       <caption xml:lang="sl">Glavni pogled s seznamom sob, klepetom in informacijami o sobah</caption>
       <caption xml:lang="sv">Huvudvy med rumslista, chatt, och rumsinformation</caption>
       <caption xml:lang="ta">அரங்குப்பட்டியல், உரையாடல், மற்றும் அரங்குவிவரங்களைக் கொண்டுள்ள பிரதான காட்சி</caption>
@@ -447,7 +420,6 @@
       <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="hi">लॉगिन स्क्रीन</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>
@@ -459,7 +431,6 @@
       <caption xml:lang="pl">Ekran logowania</caption>
       <caption xml:lang="pt">Ecrã de autenticação</caption>
       <caption xml:lang="ru">Окно входа</caption>
-      <caption xml:lang="sa">लॉगिन् स्क्रीन</caption>
       <caption xml:lang="sl">Prijavni zaslon</caption>
       <caption xml:lang="sv">Inloggningsfönster</caption>
       <caption xml:lang="ta">நுழைவுத் திரை</caption>
@@ -473,7 +444,6 @@
     <content_attribute id="social-chat">intense</content_attribute>
   </content_rating>
   <releases>
-    <release version="24.12.0" date="2024-12-12"/>
     <release version="24.08.3" date="2024-11-07"/>
     <release version="24.08.2" date="2024-10-10"/>
     <release version="24.08.1" date="2024-09-12"/>

org.kde.neochat.desktop

@@ -19,7 +19,6 @@ Name[fi]=NeoChat
 Name[fr]=NeoChat
 Name[gl]=NeoChat
 Name[he]=NeoChat
-Name[hi]=नियोचैट
 Name[hu]=NeoChat
 Name[ia]=Neochat
 Name[id]=NeoChat
@@ -37,7 +36,6 @@ Name[pt]=NeoChat
 Name[pt_BR]=NeoChat
 Name[ro]=NeoChat
 Name[ru]=NeoChat
-Name[sa]=नवचैट्
 Name[sk]=NeoChat
 Name[sl]=NeoChat
 Name[sv]=NeoChat
@@ -63,7 +61,6 @@ GenericName[fi]=Matrix-asiakas
 GenericName[fr]=Client « Matrix »
 GenericName[gl]=Cliente de Matrix
 GenericName[he]=לקוח Matrix
-GenericName[hi]=मैट्रिक्स क्लाइंट
 GenericName[hu]=Matrix kliens
 GenericName[ia]=Cliente de Matrice
 GenericName[id]=Klien Matrix
@@ -81,7 +78,6 @@ GenericName[pt]=Cliente de Matrix
 GenericName[pt_BR]=Cliente Matrix
 GenericName[ro]=Client Matrix
 GenericName[ru]=Клиент Matrix
-GenericName[sa]=मैट्रिक्स क्लाइंट
 GenericName[sk]=Matrix Client
 GenericName[sl]=Odjemalec Matrix
 GenericName[sv]=Matrix-klient
@@ -92,33 +88,24 @@ GenericName[x-test]=xxMatrix Clientxx
 GenericName[zh_CN]=Matrix 客户端
 GenericName[zh_TW]=Matrix 用戶端
 Comment=Chat on Matrix
-Comment[ar]=دردش على ماتركس
 Comment[ca]=Xat a Matrix
 Comment[ca@valencia]=Xat a Matrix
 Comment[de]=Über Matrix unterhalten
 Comment[en_GB]=Chat on Matrix
-Comment[eo]=Babilo en Matrix
 Comment[es]=Chat en Matrix
 Comment[eu]=Berriketa Matrix-en
-Comment[fi]=Keskustele Matrixissä
 Comment[fr]=Clavarder sur Matrix
 Comment[gl]=Charle en Matrix
-Comment[he]=התכתבות דרך Matrix
-Comment[hi]=मैट्रिक्स पर चैट करें
 Comment[hu]=Csevegés Matrixon
 Comment[ia]=Conversation en ditecto sur Matrix
 Comment[it]= su Matrix
-Comment[ka]=ჩატი Matrix-ზე
-Comment[lv]=Tērzējiet „Matrix“ tīklā
-Comment[nl]=Chat op Matrix
+Comment[ka]=საუბარი Matrix-ზე
 Comment[pl]=Rozmawiaj na Matriksie
-Comment[sa]=Matrix इत्यत्र गपशपं कुर्वन्तु
 Comment[sl]=Klepet na Matrixu
 Comment[sv]=Chatta på Matrix
 Comment[ta]=மேட்ரிக்ஸில் உரையாட உதவும்
-Comment[tr]=Matrix üzerinde sohbet edin
+Comment[tr]=Matrix Üzerinde Sohbet Et
 Comment[uk]=Спілкування у Matrix
-Comment[x-test]=xxChat on Matrixxx
 Comment[zh_TW]=在 Matrix 上聊天
 MimeType=x-scheme-handler/matrix;
 Exec=neochat %u

snapcraft.yaml

@@ -27,10 +27,6 @@ apps:
 
 compression: lzo
 
-package-repositories:
- - type: apt
-   ppa: ubuntu-toolchain-r/test
-
 slots:
   session-dbus-interface:
     interface: dbus
@@ -66,7 +62,7 @@ parts:
       - -Dcrypto=disabled
       - -Dgtk_doc=false
     build-packages:
-      - meson 
+      - meson
       - libglib2.0-dev
       - libgcrypt20-dev
     prime:
@@ -80,7 +76,6 @@ parts:
     source-depth: 1
     plugin: cmake
     build-environment:
-      - PATH: /snap/bin:${PATH}
       - PKG_CONFIG_PATH: $CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET/pkgconfig:$PKG_CONFIG_PATH
     cmake-parameters:
       - -DCMAKE_INSTALL_PREFIX=/usr
@@ -97,16 +92,10 @@ parts:
       - olm
       - qtkeychain
     source: https://github.com/quotient-im/libQuotient.git
-    source-tag: 0.9.1
+    source-tag: 0.9.0
     source-depth: 1
     plugin: cmake
-    build-environment:
-      - PATH: /snap/bin:${PATH}
-    build-snaps:
-      - cmake
     build-packages:
-      - gcc-13
-      - g++-13
       - libssl-dev
     cmake-parameters:
       - -DCMAKE_INSTALL_PREFIX=/usr
@@ -114,9 +103,6 @@ parts:
       - -DBUILD_TESTING=OFF
       - -DQuotient_ENABLE_E2EE=ON
       - -DBUILD_WITH_QT6=ON
-    override-build: |
-      update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-13 100 --slave /usr/bin/g++ g++ /usr/bin/g++-13 --slave /usr/bin/gcov gcov /usr/bin/gcov-13
-      craftctl default
     prime:
       - -usr/include
       - -usr/lib/*/pkgconfig
@@ -127,8 +113,6 @@ parts:
     source-tag: 'v0.3.0'
     source-depth: 1
     plugin: cmake
-    build-environment:
-      - PATH: /snap/bin:${PATH}
     cmake-parameters:
       - -DCMAKE_INSTALL_PREFIX=/usr
       - -DCMAKE_BUILD_TYPE=Release
@@ -146,10 +130,9 @@ parts:
       - kquickimageeditor
     parse-info:
       - usr/share/metainfo/org.kde.neochat.appdata.xml
-    source: .
+    source: https://invent.kde.org/network/neochat.git
+    source-tag: 'v24.08.1'
     plugin: cmake
-    build-environment:
-      - PATH: /snap/bin:${PATH}
     build-packages:
       - cmark
       - libcmark-dev

src/CMakeLists.txt

@@ -18,8 +18,8 @@ add_library(neochat STATIC
     models/customemojimodel.h
     clipboard.cpp
     clipboard.h
-    models/timelinemessagemodel.cpp
-    models/timelinemessagemodel.h
+    models/messageeventmodel.cpp
+    models/messageeventmodel.h
     models/messagefiltermodel.cpp
     models/messagefiltermodel.h
     models/roomlistmodel.cpp
@@ -128,6 +128,10 @@ add_library(neochat STATIC
     neochatconnection.h
     jobs/neochatdeactivateaccountjob.cpp
     jobs/neochatdeactivateaccountjob.h
+    jobs/neochatdeletedevicejob.cpp
+    jobs/neochatdeletedevicejob.h
+    jobs/neochatchangepasswordjob.cpp
+    jobs/neochatchangepasswordjob.h
     jobs/neochatgetcommonroomsjob.cpp
     jobs/neochatgetcommonroomsjob.h
     mediasizehelper.cpp
@@ -172,6 +176,8 @@ add_library(neochat STATIC
     models/threepidmodel.h
     threepidaddhelper.cpp
     threepidaddhelper.h
+    jobs/neochatadd3pidjob.cpp
+    jobs/neochatadd3pidjob.h
     identityserverhelper.cpp
     identityserverhelper.h
     enums/powerlevel.cpp
@@ -188,12 +194,6 @@ add_library(neochat STATIC
     models/threadmodel.h
     enums/messagetype.h
     messagecomponent.h
-    enums/roomsortparameter.cpp
-    enums/roomsortparameter.h
-    models/roomsortparametermodel.cpp
-    models/roomsortparametermodel.h
-    models/messagemodel.cpp
-    models/messagemodel.h
 )
 
 set_source_files_properties(qml/OsmLocationPlugin.qml PROPERTIES
@@ -327,10 +327,10 @@ if(WIN32)
 endif()
 
 ecm_qt_declare_logging_category(neochat
-    HEADER "messagemodel_logging.h"
-    IDENTIFIER "Message"
-    CATEGORY_NAME "org.kde.neochat.messagemodel"
-    DESCRIPTION "Neochat: messagemodel"
+    HEADER "messageeventmodel_logging.h"
+    IDENTIFIER "MessageEvent"
+    CATEGORY_NAME "org.kde.neochat.messageeventmodel"
+    DESCRIPTION "Neochat: messageeventmodel"
     DEFAULT_SEVERITY Info
     EXPORT NEOCHAT
 )
@@ -533,7 +533,6 @@ if(ANDROID)
         "kde"
         "list-remove-symbolic"
         "edit-delete"
-        "user-home-symbolic"
     )
     ecm_add_android_apk(neochat-app ANDROID_DIR ${CMAKE_SOURCE_DIR}/android)
 else()

src/chatbarcache.cpp

@@ -11,8 +11,6 @@
 #include "neochatroom.h"
 #include "texthandler.h"
 
-using namespace Qt::StringLiterals;
-
 ChatBarCache::ChatBarCache(QObject *parent)
     : QObject(parent)
 {
@@ -57,7 +55,7 @@ QString ChatBarCache::formatMentions() const
         }
         formattedText = formattedText.replace(mention.cursor.anchor(),
                                               mention.cursor.position() - mention.cursor.anchor(),
-                                              u"[%1](https://matrix.to/#/%2)"_s.arg(mention.text.toHtmlEscaped(), mention.id));
+                                              QStringLiteral("[%1](https://matrix.to/#/%2)").arg(mention.text.toHtmlEscaped(), mention.id));
     }
 
     return formattedText;
@@ -256,7 +254,7 @@ void ChatBarCache::updateMentions(QQuickTextDocument *document, ChatDocumentHand
     if (auto event = room->findInTimeline(m_relationId); event != room->historyEdge()) {
         if (const auto &roomMessageEvent = &*event->viewAs<Quotient::RoomMessageEvent>()) {
             // Replaces the mentions that are baked into the HTML but plaintext in the original markdown
-            const QRegularExpression re(uR"lit(<a\shref="https:\/\/matrix.to\/#\/([\S]*)"\s?>([\S]*)<\/a>)lit"_s);
+            const QRegularExpression re(QStringLiteral(R"lit(<a\shref="https:\/\/matrix.to\/#\/([\S]*)"\s?>([\S]*)<\/a>)lit"));
 
             m_mentions.clear();
 
@@ -309,7 +307,7 @@ void ChatBarCache::postMessage()
     }
 
     const auto result = ActionsModel::handleAction(room, this);
-    if (!result.second.has_value()) {
+    if (!result.first.has_value()) {
         return;
     }
 
@@ -321,24 +319,7 @@ void ChatBarCache::postMessage()
         return;
     }
 
-    bool isReply = !replyId().isEmpty();
-    const auto replyIt = room->findInTimeline(replyId());
-    if (replyIt == room->historyEdge()) {
-        isReply = false;
-    }
-
-    auto content = std::make_unique<Quotient::EventContent::TextContent>(sendText, u"text/html"_s);
-    std::optional<Quotient::EventRelation> relatesTo = std::nullopt;
-
-    if (!threadId().isEmpty()) {
-        relatesTo = Quotient::EventRelation::replyInThread(threadId(), !isReply, isReply ? replyId() : threadId());
-    } else if (!editId().isEmpty()) {
-        relatesTo = Quotient::EventRelation::replace(editId());
-    } else if (isReply) {
-        relatesTo = Quotient::EventRelation::replyTo(replyId());
-    }
-
-    room->post<Quotient::RoomMessageEvent>(text(), *std::get<std::optional<Quotient::RoomMessageEvent::MsgType>>(result), std::move(content), relatesTo);
+    room->postMessage(text(), sendText, *std::get<std::optional<Quotient::RoomMessageEvent::MsgType>>(result), replyId(), editId(), threadId());
     clearCache();
 }
 

src/chatdocumenthandler.cpp

@@ -16,8 +16,6 @@
 
 #include "chatdocumenthandler_logging.h"
 
-using namespace Qt::StringLiterals;
-
 class SyntaxHighlighter : public QSyntaxHighlighter
 {
 public:
@@ -230,7 +228,7 @@ void ChatDocumentHandler::complete(int index)
         QTextCursor cursor(document()->textDocument());
         cursor.setPosition(at);
         cursor.setPosition(cursorPosition(), QTextCursor::KeepAnchor);
-        cursor.insertText(name + u" "_s);
+        cursor.insertText(name + QStringLiteral(" "));
         cursor.setPosition(at);
         cursor.setPosition(cursor.position() + name.size(), QTextCursor::KeepAnchor);
         cursor.setKeepPositionOnInsert(true);
@@ -243,7 +241,7 @@ void ChatDocumentHandler::complete(int index)
         QTextCursor cursor(document()->textDocument());
         cursor.setPosition(at);
         cursor.setPosition(cursorPosition(), QTextCursor::KeepAnchor);
-        cursor.insertText(u"/%1 "_s.arg(command));
+        cursor.insertText(QStringLiteral("/%1 ").arg(command));
     } else if (m_completionModel->autoCompletionType() == CompletionModel::Room) {
         auto alias = m_completionModel->data(m_completionModel->index(index, 0), CompletionModel::SubtitleRole).toString();
         auto text = getText();
@@ -251,7 +249,7 @@ void ChatDocumentHandler::complete(int index)
         QTextCursor cursor(document()->textDocument());
         cursor.setPosition(at);
         cursor.setPosition(cursorPosition(), QTextCursor::KeepAnchor);
-        cursor.insertText(alias + u" "_s);
+        cursor.insertText(alias + QStringLiteral(" "));
         cursor.setPosition(at);
         cursor.setPosition(cursor.position() + alias.size(), QTextCursor::KeepAnchor);
         cursor.setKeepPositionOnInsert(true);

src/clipboard.cpp

@@ -14,8 +14,6 @@
 #include <QStandardPaths>
 #include <QUrl>
 
-using namespace Qt::StringLiterals;
-
 Clipboard::Clipboard(QObject *parent)
     : QObject(parent)
     , m_clipboard(QGuiApplication::clipboard())
@@ -35,14 +33,14 @@ QImage Clipboard::image() const
 
 QString Clipboard::saveImage(QString localPath) const
 {
-    QString imageDir(u"%1/screenshots"_s.arg(QStandardPaths::writableLocation(QStandardPaths::CacheLocation)));
+    QString imageDir(QStringLiteral("%1/screenshots").arg(QStandardPaths::writableLocation(QStandardPaths::CacheLocation)));
 
     if (!QDir().exists(imageDir)) {
         QDir().mkdir(imageDir);
     }
 
     if (localPath.isEmpty()) {
-        localPath = u"file://%1/%2.png"_s.arg(imageDir, QDateTime::currentDateTime().toString(u"yyyy-MM-dd-hh-mm-ss"_s));
+        localPath = QStringLiteral("file://%1/%2.png").arg(imageDir, QDateTime::currentDateTime().toString(QStringLiteral("yyyy-MM-dd-hh-mm-ss")));
     }
     QUrl url(localPath);
     if (!url.isLocalFile()) {
@@ -63,7 +61,7 @@ QString Clipboard::saveImage(QString localPath) const
 
 void Clipboard::saveText(QString message)
 {
-    static QRegularExpression re(u"<[^>]*>"_s);
+    static QRegularExpression re(QStringLiteral("<[^>]*>"));
     auto *mimeData = new QMimeData; // ownership is transferred to clipboard
     mimeData->setHtml(message);
     mimeData->setText(message.replace(re, QString()));

src/colorschemer.cpp

@@ -8,6 +8,7 @@
 
 ColorSchemer::ColorSchemer(QObject *parent)
     : QObject(parent)
+    , c(new KColorSchemeManager(this))
 {
 }
 
@@ -17,17 +18,17 @@ ColorSchemer::~ColorSchemer()
 
 QAbstractItemModel *ColorSchemer::model() const
 {
-    return KColorSchemeManager::instance()->model();
+    return c->model();
 }
 
 void ColorSchemer::apply(int idx)
 {
-    KColorSchemeManager::instance()->activateScheme(KColorSchemeManager::instance()->model()->index(idx, 0));
+    c->activateScheme(c->model()->index(idx, 0));
 }
 
 int ColorSchemer::indexForCurrentScheme()
 {
-    return KColorSchemeManager::instance()->indexForSchemeId(KColorSchemeManager::instance()->activeSchemeId()).row();
+    return c->indexForSchemeId(c->activeSchemeId()).row();
 }
 
 #include "moc_colorschemer.cpp"

src/colorschemer.h

@@ -49,4 +49,7 @@ public:
      * @sa KColorScheme
      */
     Q_INVOKABLE int indexForCurrentScheme();
+
+private:
+    KColorSchemeManager *c;
 };

src/controller.cpp

@@ -63,7 +63,7 @@ Controller::Controller(QObject *parent)
         });
     } else {
         auto c = new NeoChatConnection(this);
-        c->assumeIdentity(u"@user:localhost:1234"_s, u"device_1234"_s, u"token_1234"_s);
+        c->assumeIdentity(QStringLiteral("@user:localhost:1234"), QStringLiteral("device_1234"), QStringLiteral("token_1234"));
         connect(c, &Connection::connected, this, [c, this]() {
             m_accountRegistry.add(c);
             c->syncLoop();
@@ -117,7 +117,7 @@ Controller::Controller(QObject *parent)
     });
 
 #ifdef HAVE_KUNIFIEDPUSH
-    auto connector = new KUnifiedPush::Connector(u"org.kde.neochat"_s);
+    auto connector = new KUnifiedPush::Connector(QStringLiteral("org.kde.neochat"));
     connect(connector, &KUnifiedPush::Connector::endpointChanged, this, [this](const QString &endpoint) {
         m_endpoint = endpoint;
         for (auto &quotientConnection : m_accountRegistry) {
@@ -187,7 +187,7 @@ void Controller::dropConnection(NeoChatConnection *c)
 
 void Controller::invokeLogin()
 {
-    const auto accounts = SettingsGroup("Accounts"_L1).childGroups();
+    const auto accounts = SettingsGroup("Accounts"_ls).childGroups();
     for (const auto &accountId : accounts) {
         AccountSettings account{accountId};
         m_accountsLoading += accountId;
@@ -288,7 +288,7 @@ bool Controller::supportSystemTray() const
     return false;
 #else
     auto de = QString::fromLatin1(qgetenv("XDG_CURRENT_DESKTOP"));
-    return de != u"GNOME"_s && de != u"Pantheon"_s;
+    return de != QStringLiteral("GNOME") && de != QStringLiteral("Pantheon");
 #endif
 }
 
@@ -341,7 +341,7 @@ void Controller::setActiveConnection(NeoChatConnection *connection)
 void Controller::listenForNotifications()
 {
 #ifdef HAVE_KUNIFIEDPUSH
-    auto connector = new KUnifiedPush::Connector(u"org.kde.neochat"_s);
+    auto connector = new KUnifiedPush::Connector(QStringLiteral("org.kde.neochat"));
 
     auto timer = new QTimer();
     connect(timer, &QTimer::timeout, qGuiApp, &QGuiApplication::quit);
@@ -370,19 +370,19 @@ void Controller::updateBadgeNotificationCount(NeoChatConnection *connection, int
 #if QT_VERSION < QT_VERSION_CHECK(6, 6, 0)
 #ifndef Q_OS_ANDROID
         // copied from Telegram desktop
-        const auto launcherUrl = "application://org.kde.neochat.desktop"_L1;
+        const auto launcherUrl = "application://org.kde.neochat.desktop"_ls;
         // Gnome requires that count is a 64bit integer
         const qint64 counterSlice = std::min(count, 9999);
         QVariantMap dbusUnityProperties;
 
         if (counterSlice > 0) {
-            dbusUnityProperties["count"_L1] = counterSlice;
-            dbusUnityProperties["count-visible"_L1] = true;
+            dbusUnityProperties["count"_ls] = counterSlice;
+            dbusUnityProperties["count-visible"_ls] = true;
         } else {
-            dbusUnityProperties["count-visible"_L1] = false;
+            dbusUnityProperties["count-visible"_ls] = false;
         }
 
-        auto signal = QDBusMessage::createSignal("/com/canonical/unity/launcherentry/neochat"_L1, "com.canonical.Unity.LauncherEntry"_L1, "Update"_L1);
+        auto signal = QDBusMessage::createSignal("/com/canonical/unity/launcherentry/neochat"_ls, "com.canonical.Unity.LauncherEntry"_ls, "Update"_ls);
 
         signal.setArguments({launcherUrl, dbusUnityProperties});
 
@@ -423,15 +423,11 @@ void Controller::setTestMode(bool test)
 
 void Controller::removeConnection(const QString &userId)
 {
-    // When loadAccessTokenFromKeyChain() fails m_connectionsLoading won't have an
-    // entry for it so we need to check both separately.
-    if (m_accountsLoading.contains(userId)) {
-        m_accountsLoading.removeAll(userId);
-        Q_EMIT accountsLoadingChanged();
-    }
     if (m_connectionsLoading.contains(userId) && m_connectionsLoading[userId]) {
         auto connection = m_connectionsLoading[userId];
-        SettingsGroup("Accounts"_L1).remove(userId);
+        m_accountsLoading.removeAll(userId);
+        Q_EMIT accountsLoadingChanged();
+        SettingsGroup("Accounts"_ls).remove(userId);
     }
 }
 

src/controller.h

@@ -11,6 +11,7 @@
 #include <Quotient/accountregistry.h>
 
 class TrayIcon;
+class QQuickTextDocument;
 
 namespace QKeychain
 {

src/devtools/AccountData.qml

@@ -33,28 +33,4 @@ ColumnLayout {
             }
         }
     }
-    FormCard.FormCard {
-        FormCard.FormSwitchDelegate {
-            id: showAccessTokenCheckbox
-            text: i18nc("@info", "Show Access Token")
-            description: i18n("This should not be shared with anyone, even other users. This token gives full access to your account.")
-        }
-        FormCard.FormTextDelegate {
-            text: i18nc("@info", "Access Token")
-            description: root.connection.accessToken
-            visible: showAccessTokenCheckbox.checked
-
-            contentItem.children: QQC2.Button {
-                text: i18nc("@action:button", "Copy access token to clipboard")
-                icon.name: "edit-copy"
-                display: QQC2.AbstractButton.IconOnly
-
-                onClicked: Clipboard.saveText(root.connection.accessToken)
-
-                QQC2.ToolTip.text: text
-                QQC2.ToolTip.delay: Kirigami.Units.toolTipDelay
-                QQC2.ToolTip.visible: hovered
-            }
-        }
-    }
 }

src/devtools/RoomData.qml

@@ -21,22 +21,19 @@ ColumnLayout {
         title: i18nc("@title", "Choose Room")
     }
     FormCard.FormCard {
-        FormCard.FormButtonDelegate {
-            text: root.room?.displayNameForHtml ?? i18nc("@info", "No room selected")
-            description: i18nc("@info", "Click to choose a room");
-
-            onClicked: {
-                let dialog = root.Window.window.pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'ChooseRoomDialog'), {
-                    connection: root.connection,
-                }, {
-                    title: i18nc("@title:dialog", "Choose Room"),
-                    width: Kirigami.Units.gridUnit * 24
-                });
-                dialog.chosen.connect(id => root.room = root.connection.room(id))
-            }
+        FormCard.FormComboBoxDelegate {
+            id: roomComboBox
+            text: i18n("Room")
+            textRole: "escapedDisplayName"
+            valueRole: "roomId"
+            displayText: RoomManager.roomListModel.data(RoomManager.roomListModel.index(currentIndex, 0), RoomListModel.EscapedDisplayNameRole)
+            model: RoomManager.roomListModel
+            currentIndex: 0
+            displayMode: FormCard.FormComboBoxDelegate.Page
+            Component.onCompleted: currentIndex = RoomManager.roomListModel.rowForRoom(root.room)
+            onCurrentValueChanged: root.room = RoomManager.roomListModel.roomByAliasOrId(roomComboBox.currentValue)
         }
         FormCard.FormTextDelegate {
-            visible: root.room
             text: i18n("Room Id: %1", root.room.id)
         }
     }

src/devtools/StateKeys.qml

@@ -37,7 +37,7 @@ FormCard.FormCardPage {
     }
 
     function openEventSource(stateKey: string): void {
-        pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'MessageSourceSheet'), {
+        applicationWindow().pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'MessageSourceSheet'), {
             model: stateKeysModel,
             allowEdit: true,
             room: root.room,

src/emojitones.cpp

@@ -4,8 +4,6 @@
 #include "emojitones.h"
 #include "models/emojimodel.h"
 
-using namespace Qt::StringLiterals;
-
 QMultiHash<QString, QVariant> EmojiTones::_tones = {
 #include "emojitones_data.h"
 };

src/enums/delegatetype.h

@@ -13,8 +13,6 @@
 
 #include "events/pollevent.h"
 
-using namespace Qt::StringLiterals;
-
 /**
  * @class DelegateType
  *
@@ -60,7 +58,7 @@ public:
             return Message;
         }
         if (event.isStateEvent()) {
-            if (event.matrixType() == u"org.matrix.msc3672.beacon_info"_s) {
+            if (event.matrixType() == QStringLiteral("org.matrix.msc3672.beacon_info")) {
                 return Message;
             }
             return State;

src/enums/messagecomponenttype.h

@@ -13,8 +13,6 @@
 
 #include "events/pollevent.h"
 
-using namespace Qt::StringLiterals;
-
 /**
  * @class MessageComponentType
  *
@@ -53,7 +51,6 @@ public:
         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. */
-        ReplyButton, /**< A button to reply in the current thread. */
         Verification, /**< A user verification session start message. */
         Loading, /**< The component is loading. */
         Other, /**< Anything that cannot be classified as another type. */
@@ -95,7 +92,7 @@ public:
             return MessageComponentType::Image;
         }
         if (event.isStateEvent()) {
-            if (event.matrixType() == u"org.matrix.msc3672.beacon_info"_s) {
+            if (event.matrixType() == QStringLiteral("org.matrix.msc3672.beacon_info")) {
                 return MessageComponentType::LiveLocation;
             }
             return MessageComponentType::Other;
@@ -123,10 +120,10 @@ public:
      */
     static Type typeForTag(const QString &tag)
     {
-        if (tag == u"pre"_s || tag == u"pre"_s) {
+        if (tag == QLatin1String("pre") || tag == QLatin1String("pre")) {
             return Code;
         }
-        if (tag == u"blockquote"_s) {
+        if (tag == QLatin1String("blockquote")) {
             return Quote;
         }
         return Text;

src/enums/neochatroomtype.h

@@ -10,8 +10,6 @@
 
 #include <KLocalizedString>
 
-using namespace Qt::StringLiterals;
-
 class NeoChatRoomType : public QObject
 {
     Q_OBJECT
@@ -77,19 +75,19 @@ public:
     {
         switch (category) {
         case NeoChatRoomType::Invited:
-            return u"user-invisible"_s;
+            return QStringLiteral("user-invisible");
         case NeoChatRoomType::Favorite:
-            return u"favorite"_s;
+            return QStringLiteral("favorite");
         case NeoChatRoomType::Direct:
-            return u"dialog-messages"_s;
+            return QStringLiteral("dialog-messages");
         case NeoChatRoomType::Normal:
-            return u"group"_s;
+            return QStringLiteral("group");
         case NeoChatRoomType::Deprioritized:
-            return u"object-order-lower"_s;
+            return QStringLiteral("object-order-lower");
         case NeoChatRoomType::Space:
-            return u"group"_s;
+            return QStringLiteral("group");
         default:
-            return u"tools-report-bug"_s;
+            return QStringLiteral("tools-report-bug");
         }
     }
 };

src/enums/pushrule.h

@@ -6,8 +6,6 @@
 #include <QObject>
 #include <QQmlEngine>
 
-using namespace Qt::StringLiterals;
-
 /**
  * @class PushRuleKind
  *
@@ -44,15 +42,15 @@ public:
     {
         switch (kind) {
         case Kind::Override:
-            return u"override"_s;
+            return QLatin1String("override");
         case Kind::Content:
-            return u"content"_s;
+            return QLatin1String("content");
         case Kind::Room:
-            return u"room"_s;
+            return QLatin1String("room");
         case Kind::Sender:
-            return u"sender"_s;
+            return QLatin1String("sender");
         case Kind::Underride:
-            return u"underride"_s;
+            return QLatin1String("underride");
         default:
             return {};
         }
@@ -172,15 +170,15 @@ public:
     {
         switch (section) {
         case Section::Master:
-            return u"Master"_s;
+            return QLatin1String("Master");
         case Section::Room:
-            return u"Room Notifications"_s;
+            return QLatin1String("Room Notifications");
         case Section::Mentions:
-            return u"@Mentions"_s;
+            return QLatin1String("@Mentions");
         case Section::Keywords:
-            return u"Keywords"_s;
+            return QLatin1String("Keywords");
         case Section::Invites:
-            return u"Invites"_s;
+            return QLatin1String("Invites");
         default:
             return {};
         }

src/enums/roomsortparameter.cpp

@@ -1,162 +0,0 @@
-// SPDX-FileCopyrightText: 2024 James Graham <james.h.graham@protonmail.com>
-// SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
-
-#include "roomsortparameter.h"
-
-#include <algorithm>
-
-#include "neochatconfig.h"
-#include "neochatroom.h"
-
-namespace
-{
-template<typename T>
-int typeCompare(T left, T right)
-{
-    return left == right ? 0 : left > right ? 1 : -1;
-}
-
-template<>
-int typeCompare<QString>(QString left, QString right)
-{
-    return left.localeAwareCompare(right);
-}
-
-static const QList<RoomSortParameter::Parameter> allSortPriorities = {
-    RoomSortParameter::AlphabeticalAscending,
-    RoomSortParameter::AlphabeticalDescending,
-    RoomSortParameter::HasUnread,
-    RoomSortParameter::MostUnread,
-    RoomSortParameter::HasHighlight,
-    RoomSortParameter::MostHighlights,
-    RoomSortParameter::LastActive,
-};
-
-static const QList<RoomSortParameter::Parameter> alphabeticalSortPriorities = {
-    RoomSortParameter::AlphabeticalAscending,
-};
-
-static const QList<RoomSortParameter::Parameter> activitySortPriorities = {
-    RoomSortParameter::HasHighlight,
-    RoomSortParameter::MostHighlights,
-    RoomSortParameter::HasUnread,
-    RoomSortParameter::MostUnread,
-    RoomSortParameter::LastActive,
-};
-
-static const QList<RoomSortParameter::Parameter> lastMessageSortPriorities = {
-    RoomSortParameter::LastActive,
-};
-}
-
-QList<RoomSortParameter::Parameter> RoomSortParameter::allParameterList()
-{
-    return allSortPriorities;
-}
-
-QList<RoomSortParameter::Parameter> RoomSortParameter::currentParameterList()
-{
-    QList<RoomSortParameter::Parameter> configParamList;
-    switch (static_cast<NeoChatConfig::EnumSortOrder::type>(NeoChatConfig::sortOrder())) {
-    case NeoChatConfig::EnumSortOrder::Activity:
-        configParamList = activitySortPriorities;
-        break;
-    case NeoChatConfig::EnumSortOrder::Alphabetical:
-        configParamList = alphabeticalSortPriorities;
-        break;
-    case NeoChatConfig::EnumSortOrder::LastMessage:
-        configParamList = lastMessageSortPriorities;
-        break;
-    case NeoChatConfig::EnumSortOrder::Custom: {
-        const auto intList = NeoChatConfig::customSortOrder();
-        std::transform(intList.constBegin(), intList.constEnd(), std::back_inserter(configParamList), [](int param) {
-            return static_cast<Parameter>(param);
-        });
-        break;
-    }
-    default:
-        break;
-    }
-
-    if (configParamList.isEmpty()) {
-        return activitySortPriorities;
-    }
-    return configParamList;
-}
-
-void RoomSortParameter::saveNewParameterList(const QList<Parameter> &newList)
-{
-    QList<int> intList;
-    std::transform(newList.constBegin(), newList.constEnd(), std::back_inserter(intList), [](Parameter param) {
-        return static_cast<int>(param);
-    });
-    NeoChatConfig::setCustomSortOrder(intList);
-    NeoChatConfig::setSortOrder(NeoChatConfig::EnumSortOrder::Custom);
-    NeoChatConfig::self()->save();
-}
-
-int RoomSortParameter::compareParameter(Parameter parameter, NeoChatRoom *leftRoom, NeoChatRoom *rightRoom)
-{
-    switch (parameter) {
-    case AlphabeticalAscending:
-        return compareParameter<AlphabeticalAscending>(leftRoom, rightRoom);
-    case AlphabeticalDescending:
-        return compareParameter<AlphabeticalDescending>(leftRoom, rightRoom);
-    case HasUnread:
-        return compareParameter<HasUnread>(leftRoom, rightRoom);
-    case MostUnread:
-        return compareParameter<MostUnread>(leftRoom, rightRoom);
-    case HasHighlight:
-        return compareParameter<HasHighlight>(leftRoom, rightRoom);
-    case MostHighlights:
-        return compareParameter<MostHighlights>(leftRoom, rightRoom);
-    case LastActive:
-        return compareParameter<LastActive>(leftRoom, rightRoom);
-    default:
-        return 0;
-    }
-}
-
-template<>
-int RoomSortParameter::compareParameter<RoomSortParameter::AlphabeticalAscending>(NeoChatRoom *leftRoom, NeoChatRoom *rightRoom)
-{
-    return -typeCompare(leftRoom->displayName(), rightRoom->displayName());
-}
-
-template<>
-int RoomSortParameter::compareParameter<RoomSortParameter::AlphabeticalDescending>(NeoChatRoom *leftRoom, NeoChatRoom *rightRoom)
-{
-    return typeCompare(leftRoom->displayName(), rightRoom->displayName());
-}
-
-template<>
-int RoomSortParameter::compareParameter<RoomSortParameter::HasUnread>(NeoChatRoom *leftRoom, NeoChatRoom *rightRoom)
-{
-    return typeCompare(leftRoom->contextAwareNotificationCount() > 0, rightRoom->contextAwareNotificationCount() > 0);
-}
-
-template<>
-int RoomSortParameter::compareParameter<RoomSortParameter::MostUnread>(NeoChatRoom *leftRoom, NeoChatRoom *rightRoom)
-{
-    return typeCompare(leftRoom->contextAwareNotificationCount(), rightRoom->contextAwareNotificationCount());
-}
-
-template<>
-int RoomSortParameter::compareParameter<RoomSortParameter::HasHighlight>(NeoChatRoom *leftRoom, NeoChatRoom *rightRoom)
-{
-    const auto leftHighlight = leftRoom->highlightCount() > 0 && leftRoom->contextAwareNotificationCount() > 0;
-    const auto rightHighlight = rightRoom->highlightCount() > 0 && rightRoom->contextAwareNotificationCount() > 0;
-    return typeCompare(leftHighlight, rightHighlight);
-}
-
-template<>
-int RoomSortParameter::compareParameter<RoomSortParameter::MostHighlights>(NeoChatRoom *leftRoom, NeoChatRoom *rightRoom)
-{
-    return typeCompare(int(leftRoom->highlightCount()), int(rightRoom->highlightCount()));
-}
-
-template<>
-int RoomSortParameter::compareParameter<RoomSortParameter::LastActive>(NeoChatRoom *leftRoom, NeoChatRoom *rightRoom)
-{
-    return typeCompare(leftRoom->lastActiveTime(), rightRoom->lastActiveTime());
-}

src/enums/roomsortparameter.h

@@ -1,142 +0,0 @@
-// SPDX-FileCopyrightText: 2024 James Graham <james.h.graham@protonmail.com>
-// SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
-
-#pragma once
-
-#include <QObject>
-#include <QQmlEngine>
-
-#include <KLocalizedString>
-
-class NeoChatRoom;
-
-/**
- * @class RoomSortParameter
- *
- * A class with the Parameter enum for room sort parameters.
- */
-class RoomSortParameter : public QObject
-{
-    Q_OBJECT
-    QML_ELEMENT
-    QML_UNCREATABLE("")
-
-public:
-    /**
-     * @brief Defines the available sort parameters.
-     *
-     * @note All values are specifically numbered as they should never change even
-     *       if new options are later added. This is because they are stored in
-     *       the config as ints and changing would break someones config on upgrade.
-     */
-    enum Parameter {
-        AlphabeticalAscending = 0,
-        AlphabeticalDescending = 1,
-        HasUnread = 2,
-        MostUnread = 3,
-        HasHighlight = 4,
-        MostHighlights = 5,
-        LastActive = 6,
-    };
-    Q_ENUM(Parameter)
-
-    /**
-     * @brief Translate the Parameter enum value to a human readable name string.
-     *
-     * @sa Parameter
-     */
-    Q_INVOKABLE static QString parameterName(Parameter parameter)
-    {
-        switch (parameter) {
-        case Parameter::AlphabeticalAscending:
-            return i18nc("As in sorting alphabetically with A first and Z last", "Alphabetical Ascending");
-        case Parameter::AlphabeticalDescending:
-            return i18nc("As in sorting alphabetically with Z first and A last", "Alphabetical Descending");
-        case Parameter::HasUnread:
-            return i18nc("As in sorting rooms with unread message above those without", "Has Unread Messages");
-        case Parameter::MostUnread:
-            return i18nc("As in sorting rooms with the most unread messages higher", "Most Unread Messages");
-        case Parameter::HasHighlight:
-            return i18nc("As in sorting rooms with highlighted message above those without", "Has Highlighted Messages");
-        case Parameter::MostHighlights:
-            return i18nc("As in sorting rooms with the most highlighted messages higher", "Most Highlighted Messages");
-        case Parameter::LastActive:
-            return i18nc("As in sorting the chat room with the newest meassage first", "Last Active");
-        default:
-            return {};
-        }
-    };
-
-    /**
-     * @brief Translate the Parameter enum value to a human readable description string.
-     *
-     * @sa Parameter
-     */
-    Q_INVOKABLE static QString parameterDescription(Parameter parameter)
-    {
-        switch (parameter) {
-        case Parameter::AlphabeticalAscending:
-            return i18nc("@info", "Room names closer to A alphabetically are higher");
-        case Parameter::AlphabeticalDescending:
-            return i18nc("@info", "Room names closer to Z alphabetically are higher");
-        case Parameter::HasUnread:
-            return i18nc("@info", "Rooms with unread messages are higher");
-        case Parameter::MostUnread:
-            return i18nc("@info", "Rooms with the most unread message are higher");
-        case Parameter::HasHighlight:
-            return i18nc("@info", "Rooms with highlighted messages are higher");
-        case Parameter::MostHighlights:
-            return i18nc("@info", "Rooms with the most highlighted messages are higher");
-        case Parameter::LastActive:
-            return i18nc("@info", "Rooms with the newer messages are higher");
-        default:
-            return {};
-        }
-    };
-
-    /**
-     * @brief List of all available Parameter sort orders.
-     */
-    static QList<Parameter> allParameterList();
-
-    /**
-     * @brief The current Parameter sort order list.
-     */
-    static QList<Parameter> currentParameterList();
-
-    /**
-     * @brief Save the give Parameter sort order list as the custom sort order.
-     */
-    static void saveNewParameterList(const QList<Parameter> &newList);
-
-    /**
-     * @brief Compare the given parameter of the two given rooms.
-     *
-     * @return 0 if they are equal, 1 if the left is greater and -1 if the right is greater.
-     *
-     * @sa Parameter
-     */
-    static int compareParameter(Parameter parameter, NeoChatRoom *leftRoom, NeoChatRoom *rightRoom);
-
-private:
-    template<Parameter parameter>
-    static int compareParameter(NeoChatRoom *, NeoChatRoom *)
-    {
-        return false;
-    }
-};
-
-template<>
-int RoomSortParameter::compareParameter<RoomSortParameter::AlphabeticalAscending>(NeoChatRoom *leftRoom, NeoChatRoom *rightRoom);
-template<>
-int RoomSortParameter::compareParameter<RoomSortParameter::AlphabeticalDescending>(NeoChatRoom *leftRoom, NeoChatRoom *rightRoom);
-template<>
-int RoomSortParameter::compareParameter<RoomSortParameter::HasUnread>(NeoChatRoom *leftRoom, NeoChatRoom *rightRoom);
-template<>
-int RoomSortParameter::compareParameter<RoomSortParameter::MostUnread>(NeoChatRoom *leftRoom, NeoChatRoom *rightRoom);
-template<>
-int RoomSortParameter::compareParameter<RoomSortParameter::HasHighlight>(NeoChatRoom *leftRoom, NeoChatRoom *rightRoom);
-template<>
-int RoomSortParameter::compareParameter<RoomSortParameter::MostHighlights>(NeoChatRoom *leftRoom, NeoChatRoom *rightRoom);
-template<>
-int RoomSortParameter::compareParameter<RoomSortParameter::LastActive>(NeoChatRoom *leftRoom, NeoChatRoom *rightRoom);

src/eventhandler.cpp

@@ -49,6 +49,16 @@ Q_DECLARE_FLAGS(MemberChanges, MemberChange)
 Q_DECLARE_OPERATORS_FOR_FLAGS(MemberChanges)
 };
 
+QString EventHandler::id(const Quotient::RoomEvent *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)
 {
     if (room == nullptr) {
@@ -60,9 +70,9 @@ QString EventHandler::authorDisplayName(const NeoChatRoom *room, const Quotient:
         return {};
     }
 
-    if (is<RoomMemberEvent>(*event) && event->unsignedJson()["prev_content"_L1].toObject().contains("displayname"_L1)
+    if (is<RoomMemberEvent>(*event) && !event->unsignedJson()[QStringLiteral("prev_content")][QStringLiteral("displayname")].isNull()
         && event->stateKey() == event->senderId()) {
-        auto previousDisplayName = event->unsignedJson()["prev_content"_L1]["displayname"_L1].toString().toHtmlEscaped();
+        auto previousDisplayName = event->unsignedJson()[QStringLiteral("prev_content")][QStringLiteral("displayname")].toString().toHtmlEscaped();
         if (previousDisplayName.isEmpty()) {
             previousDisplayName = event->senderId();
         }
@@ -86,39 +96,32 @@ QString EventHandler::singleLineAuthorDisplayname(const NeoChatRoom *room, const
 
     const auto author = isPending ? room->localMember() : room->member(event->senderId());
     auto displayName = author.displayName();
-    displayName.replace(u"<br>\n"_s, u" "_s);
-    displayName.replace(u"<br>"_s, u" "_s);
-    displayName.replace(u"<br />\n"_s, u" "_s);
-    displayName.replace(u"<br />"_s, u" "_s);
-    displayName.replace(u'\n', u" "_s);
-    displayName.replace(u'\u2028', u" "_s);
+    displayName.replace(QStringLiteral("<br>\n"), QStringLiteral(" "));
+    displayName.replace(QStringLiteral("<br>"), QStringLiteral(" "));
+    displayName.replace(QStringLiteral("<br />\n"), QStringLiteral(" "));
+    displayName.replace(QStringLiteral("<br />"), QStringLiteral(" "));
+    displayName.replace(u'\n', QStringLiteral(" "));
+    displayName.replace(u'\u2028', QStringLiteral(" "));
     return displayName;
 }
 
-QDateTime EventHandler::time(const NeoChatRoom *room, const Quotient::RoomEvent *event, bool isPending)
+QDateTime EventHandler::time(const Quotient::RoomEvent *event, bool isPending, QDateTime lastUpdated)
 {
-    if (room == nullptr) {
-        qCWarning(EventHandling) << "time called with room set to nullptr.";
-        return {};
-    }
     if (event == nullptr) {
         qCWarning(EventHandling) << "time called with event set to nullptr.";
         return {};
     }
-
-    if (isPending) {
-        const auto pendingIt = room->findPendingEvent(event->transactionId());
-        if (pendingIt != room->pendingEvents().end()) {
-            return pendingIt->lastUpdated();
-        }
+    if (isPending && lastUpdated == QDateTime()) {
+        qCWarning(EventHandling) << "a value must be provided for lastUpdated for a pending event.";
         return {};
     }
-    return event->originTimestamp();
+
+    return isPending ? lastUpdated : event->originTimestamp();
 }
 
-QString EventHandler::timeString(const NeoChatRoom *room, const Quotient::RoomEvent *event, bool relative, QLocale::FormatType format, bool isPending)
+QString EventHandler::timeString(const Quotient::RoomEvent *event, bool relative, QLocale::FormatType format, bool isPending, QDateTime lastUpdated)
 {
-    auto ts = time(room, event, isPending);
+    auto ts = time(event, isPending, lastUpdated);
     if (ts.isValid()) {
         if (relative) {
             KFormat formatter;
@@ -130,9 +133,9 @@ QString EventHandler::timeString(const NeoChatRoom *room, const Quotient::RoomEv
     return {};
 }
 
-QString EventHandler::timeString(const NeoChatRoom *room, const Quotient::RoomEvent *event, const QString &format, bool isPending)
+QString EventHandler::timeString(const Quotient::RoomEvent *event, const QString &format, bool isPending, const QDateTime &lastUpdated)
 {
-    return time(room, event, isPending).toLocalTime().toString(format);
+    return time(event, isPending, lastUpdated).toLocalTime().toString(format);
 }
 
 bool EventHandler::isHighlighted(const NeoChatRoom *room, const Quotient::RoomEvent *event)
@@ -202,7 +205,7 @@ bool EventHandler::isHidden(const NeoChatRoom *room, const Quotient::RoomEvent *
     }
 
     // hide ending live location beacons
-    if (event->isStateEvent() && event->matrixType() == "org.matrix.msc3672.beacon_info"_L1 && !event->contentJson()["live"_L1].toBool()) {
+    if (event->isStateEvent() && event->matrixType() == "org.matrix.msc3672.beacon_info"_ls && !event->contentJson()["live"_ls].toBool()) {
         return true;
     }
 
@@ -211,7 +214,7 @@ bool EventHandler::isHidden(const NeoChatRoom *room, const Quotient::RoomEvent *
 
 Qt::TextFormat EventHandler::messageBodyInputFormat(const Quotient::RoomMessageEvent &event)
 {
-    if (event.mimeType().name() == "text/plain"_L1) {
+    if (event.mimeType().name() == "text/plain"_ls) {
         return Qt::PlainText;
     } else {
         return Qt::RichText;
@@ -288,7 +291,7 @@ QString EventHandler::markdownBody(const Quotient::RoomEvent *event)
 
 QString EventHandler::getBody(const NeoChatRoom *room, const Quotient::RoomEvent *event, Qt::TextFormat format, bool stripNewlines)
 {
-    if (event->isRedacted() && !event->isStateEvent()) {
+    if (event->isRedacted()) {
         auto reason = event->redactedBecause()->reason();
         return (reason.isEmpty()) ? i18n("<i>[This message was deleted]</i>") : i18n("<i>[This message was deleted: %1]</i>", reason.toHtmlEscaped());
     }
@@ -316,8 +319,8 @@ QString EventHandler::getBody(const NeoChatRoom *room, const Quotient::RoomEvent
             }
 
             if (prettyPrint) {
-                subjectName =
-                    u"<a href=\"https://matrix.to/#/%1\" style=\"color: %2\">%3</a>"_s.arg(e.userId(), room->member(e.userId()).color().name(), subjectName);
+                subjectName = QStringLiteral("<a href=\"https://matrix.to/#/%1\" style=\"color: %2\">%3</a>")
+                                  .arg(e.userId(), room->member(e.userId()).color().name(), subjectName);
             }
 
             // The below code assumes senderName output in AuthorRole
@@ -383,7 +386,7 @@ QString EventHandler::getBody(const NeoChatRoom *room, const Quotient::RoomEvent
                 if (e.senderId() == e.userId()) {
                     return i18n("left the room");
                 }
-                if (const auto &reason = e.contentJson()["reason"_L1].toString().toHtmlEscaped(); !reason.isEmpty()) {
+                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);
@@ -398,7 +401,7 @@ QString EventHandler::getBody(const NeoChatRoom *room, const Quotient::RoomEvent
                     return i18n("self-banned from the room");
                 }
             case Membership::Knock: {
-                QString reason(e.contentJson()["reason"_L1].toString().toHtmlEscaped());
+                QString reason(e.contentJson()["reason"_ls].toString().toHtmlEscaped());
                 return reason.isEmpty() ? i18n("requested an invite") : i18n("requested an invite with reason: %1", reason);
             }
             default:;
@@ -426,26 +429,26 @@ QString EventHandler::getBody(const NeoChatRoom *room, const Quotient::RoomEvent
         },
         [prettyPrint](const RoomCreateEvent &e) {
             return e.isUpgrade()
-                ? i18n("upgraded the room to version %1", e.version().isEmpty() ? "1"_L1 : (prettyPrint ? e.version().toHtmlEscaped() : e.version()))
-                : i18n("created the room, version %1", e.version().isEmpty() ? "1"_L1 : (prettyPrint ? e.version().toHtmlEscaped() : e.version()));
+                ? i18n("upgraded the room to version %1", e.version().isEmpty() ? "1"_ls : (prettyPrint ? e.version().toHtmlEscaped() : e.version()))
+                : i18n("created the room, version %1", e.version().isEmpty() ? "1"_ls : (prettyPrint ? e.version().toHtmlEscaped() : e.version()));
         },
         [](const RoomPowerLevelsEvent &) {
             return i18nc("'power level' means permission level", "changed the power levels for this room");
         },
         [](const LocationBeaconEvent &e) {
-            return e.contentJson()["description"_L1].toString();
+            return e.contentJson()["description"_ls].toString();
         },
         [](const RoomServerAclEvent &) {
             return i18n("changed the server access control lists for this room");
         },
         [](const WidgetEvent &e) {
-            if (e.fullJson()["unsigned"_L1]["prev_content"_L1].toObject().isEmpty()) {
-                return i18nc("[User] added <name> widget", "added %1 widget", e.contentJson()["name"_L1].toString());
+            if (e.fullJson()["unsigned"_ls]["prev_content"_ls].toObject().isEmpty()) {
+                return i18nc("[User] added <name> widget", "added %1 widget", e.contentJson()["name"_ls].toString());
             }
             if (e.contentJson().isEmpty()) {
-                return i18nc("[User] removed <name> widget", "removed %1 widget", e.fullJson()["unsigned"_L1]["prev_content"_L1]["name"_L1].toString());
+                return i18nc("[User] removed <name> widget", "removed %1 widget", e.fullJson()["unsigned"_ls]["prev_content"_ls]["name"_ls].toString());
             }
-            return i18nc("[User] configured <name> widget", "configured %1 widget", e.contentJson()["name"_L1].toString());
+            return i18nc("[User] configured <name> widget", "configured %1 widget", e.contentJson()["name"_ls].toString());
         },
         [prettyPrint](const StateEvent &e) {
             return e.stateKey().isEmpty() ? i18n("updated %1 state", e.matrixType())
@@ -466,7 +469,7 @@ QString EventHandler::getMessageBody(const NeoChatRoom *room, const RoomMessageE
         if (fileCaption.isEmpty()) {
             fileCaption = event.plainBody();
         } else if (fileCaption != event.plainBody()) {
-            fileCaption = event.plainBody() + " | "_L1 + fileCaption;
+            fileCaption = event.plainBody() + " | "_ls + fileCaption;
         }
         textHandler.setData(fileCaption);
         return !fileCaption.isEmpty() ? textHandler.handleRecievePlainText(Qt::PlainText, stripNewlines) : i18n("a file");
@@ -482,7 +485,7 @@ QString EventHandler::getMessageBody(const NeoChatRoom *room, const RoomMessageE
     textHandler.setData(body);
 
     Qt::TextFormat inputFormat;
-    if (event.mimeType().name() == "text/plain"_L1) {
+    if (event.mimeType().name() == "text/plain"_ls) {
         inputFormat = Qt::PlainText;
     } else {
         inputFormat = Qt::RichText;
@@ -505,12 +508,12 @@ QString EventHandler::genericBody(const NeoChatRoom *room, const Quotient::RoomE
         qCWarning(EventHandling) << "genericBody called with event set to nullptr.";
         return {};
     }
-    if (event->isRedacted() && !event->isStateEvent()) {
+    if (event->isRedacted()) {
         return i18n("<i>[This message was deleted]</i>");
     }
 
     const auto sender = room->member(event->senderId());
-    const auto senderString = u"<a href=\"https://matrix.to/#/%1\">%2</a>"_s.arg(sender.id(), sender.htmlSafeDisplayName());
+    const auto senderString = QStringLiteral("<a href=\"https://matrix.to/#/%1\">%2</a>").arg(sender.id(), sender.htmlSafeDisplayName());
 
     return switchOnType(
         *event,
@@ -639,7 +642,7 @@ QString EventHandler::genericBody(const NeoChatRoom *room, const Quotient::RoomE
             return i18n("%1 changed the server access control lists for this room", senderString);
         },
         [senderString](const WidgetEvent &e) {
-            if (e.fullJson()["unsigned"_L1]["prev_content"_L1].toObject().isEmpty()) {
+            if (e.fullJson()["unsigned"_ls]["prev_content"_ls].toObject().isEmpty()) {
                 return i18n("%1 added a widget", senderString);
             }
             if (e.contentJson().isEmpty()) {
@@ -666,7 +669,7 @@ QString EventHandler::subtitleText(const NeoChatRoom *room, const Quotient::Room
         qCWarning(EventHandling) << "subtitleText called with event set to nullptr.";
         return {};
     }
-    return singleLineAuthorDisplayname(room, event) + (event->isStateEvent() ? u" "_s : u": "_s) + plainBody(room, event, true);
+    return singleLineAuthorDisplayname(room, event) + (event->isStateEvent() ? QLatin1String(" ") : QLatin1String(": ")) + plainBody(room, event, true);
 }
 
 QVariantMap EventHandler::mediaInfo(const NeoChatRoom *room, const Quotient::RoomEvent *event)
@@ -697,7 +700,7 @@ QVariantMap EventHandler::getMediaInfoForEvent(const NeoChatRoom *room, const Qu
         QVariantMap mediaInfo = getMediaInfoFromFileInfo(room, content.get(), eventId, false, false);
         // if filename isn't specifically given, it is in body
         // https://spec.matrix.org/latest/client-server-api/#mfile
-        mediaInfo["filename"_L1] = content->commonInfo().originalName.isEmpty() ? roomMessageEvent->plainBody() : content->commonInfo().originalName;
+        mediaInfo["filename"_ls] = content->commonInfo().originalName.isEmpty() ? roomMessageEvent->plainBody() : content->commonInfo().originalName;
 
         return mediaInfo;
     } else if (event->is<StickerEvent>()) {
@@ -719,80 +722,80 @@ QVariantMap EventHandler::getMediaInfoFromFileInfo(const NeoChatRoom *room,
     QVariantMap mediaInfo;
 
     // Get the mxc URL for the media.
-    if (!fileContent->url().isValid() || fileContent->url().scheme() != u"mxc"_s || eventId.isEmpty()) {
-        mediaInfo["source"_L1] = QUrl();
+    if (!fileContent->url().isValid() || fileContent->url().scheme() != QStringLiteral("mxc") || eventId.isEmpty()) {
+        mediaInfo["source"_ls] = QUrl();
     } else {
         QUrl source = room->makeMediaUrl(eventId, fileContent->url());
 
         if (source.isValid()) {
-            mediaInfo["source"_L1] = source;
+            mediaInfo["source"_ls] = source;
         } else {
-            mediaInfo["source"_L1] = QUrl();
+            mediaInfo["source"_ls] = QUrl();
         }
     }
 
     auto mimeType = fileContent->type();
     // Add the MIME type for the media if available.
-    mediaInfo["mimeType"_L1] = mimeType.name();
+    mediaInfo["mimeType"_ls] = mimeType.name();
 
     // Add the MIME type icon if available.
-    mediaInfo["mimeIcon"_L1] = mimeType.iconName();
+    mediaInfo["mimeIcon"_ls] = mimeType.iconName();
 
     // Add media size if available.
-    mediaInfo["size"_L1] = fileContent->commonInfo().payloadSize;
+    mediaInfo["size"_ls] = fileContent->commonInfo().payloadSize;
 
-    mediaInfo["isSticker"_L1] = isSticker;
+    mediaInfo["isSticker"_ls] = isSticker;
 
     // Add parameter depending on media type.
-    if (mimeType.name().contains(u"image"_s)) {
+    if (mimeType.name().contains(QStringLiteral("image"))) {
         if (auto castInfo = static_cast<const EventContent::ImageContent *>(fileContent)) {
-            mediaInfo["width"_L1] = castInfo->imageSize.width();
-            mediaInfo["height"_L1] = castInfo->imageSize.height();
+            mediaInfo["width"_ls] = castInfo->imageSize.width();
+            mediaInfo["height"_ls] = castInfo->imageSize.height();
 
             // TODO: Images in certain formats (e.g. WebP) will be erroneously marked as animated, even if they are static.
-            mediaInfo["animated"_L1] = QMovie::supportedFormats().contains(mimeType.preferredSuffix().toUtf8());
+            mediaInfo["animated"_ls] = QMovie::supportedFormats().contains(mimeType.preferredSuffix().toUtf8());
 
             QVariantMap tempInfo;
             auto thumbnailInfo = getMediaInfoFromTumbnail(room, castInfo->thumbnail, eventId);
-            if (thumbnailInfo["source"_L1].toUrl().scheme() == "mxc"_L1) {
+            if (thumbnailInfo["source"_ls].toUrl().scheme() == "mxc"_ls) {
                 tempInfo = thumbnailInfo;
             } else {
-                QString blurhash = castInfo->originalInfoJson["xyz.amorgan.blurhash"_L1].toString();
+                QString blurhash = castInfo->originalInfoJson["xyz.amorgan.blurhash"_ls].toString();
                 if (blurhash.isEmpty()) {
-                    tempInfo["source"_L1] = QUrl();
+                    tempInfo["source"_ls] = QUrl();
                 } else {
-                    tempInfo["source"_L1] = QUrl("image://blurhash/"_L1 + blurhash);
+                    tempInfo["source"_ls] = QUrl("image://blurhash/"_ls + blurhash);
                 }
             }
-            mediaInfo["tempInfo"_L1] = tempInfo;
+            mediaInfo["tempInfo"_ls] = tempInfo;
         }
     }
-    if (mimeType.name().contains(u"video"_s)) {
+    if (mimeType.name().contains(QStringLiteral("video"))) {
         if (auto castInfo = static_cast<const EventContent::VideoContent *>(fileContent)) {
-            mediaInfo["width"_L1] = castInfo->imageSize.width();
-            mediaInfo["height"_L1] = castInfo->imageSize.height();
-            mediaInfo["duration"_L1] = castInfo->duration;
+            mediaInfo["width"_ls] = castInfo->imageSize.width();
+            mediaInfo["height"_ls] = castInfo->imageSize.height();
+            mediaInfo["duration"_ls] = castInfo->duration;
 
             if (!isThumbnail) {
                 QVariantMap tempInfo;
                 auto thumbnailInfo = getMediaInfoFromTumbnail(room, castInfo->thumbnail, eventId);
-                if (thumbnailInfo["source"_L1].toUrl().scheme() == "mxc"_L1) {
+                if (thumbnailInfo["source"_ls].toUrl().scheme() == "mxc"_ls) {
                     tempInfo = thumbnailInfo;
                 } else {
-                    QString blurhash = castInfo->originalInfoJson["xyz.amorgan.blurhash"_L1].toString();
+                    QString blurhash = castInfo->originalInfoJson["xyz.amorgan.blurhash"_ls].toString();
                     if (blurhash.isEmpty()) {
-                        tempInfo["source"_L1] = QUrl();
+                        tempInfo["source"_ls] = QUrl();
                     } else {
-                        tempInfo["source"_L1] = QUrl("image://blurhash/"_L1 + blurhash);
+                        tempInfo["source"_ls] = QUrl("image://blurhash/"_ls + blurhash);
                     }
                 }
-                mediaInfo["tempInfo"_L1] = tempInfo;
+                mediaInfo["tempInfo"_ls] = tempInfo;
             }
         }
     }
-    if (mimeType.name().contains(u"audio"_s)) {
+    if (mimeType.name().contains(QStringLiteral("audio"))) {
         if (auto castInfo = static_cast<const EventContent::AudioContent *>(fileContent)) {
-            mediaInfo["duration"_L1] = castInfo->duration;
+            mediaInfo["duration"_ls] = castInfo->duration;
         }
     }
 
@@ -803,34 +806,59 @@ QVariantMap EventHandler::getMediaInfoFromTumbnail(const NeoChatRoom *room, cons
 {
     QVariantMap thumbnailInfo;
 
-    if (!thumbnail.url().isValid() || thumbnail.url().scheme() != u"mxc"_s || eventId.isEmpty()) {
-        thumbnailInfo["source"_L1] = QUrl();
+    if (!thumbnail.url().isValid() || thumbnail.url().scheme() != QStringLiteral("mxc") || eventId.isEmpty()) {
+        thumbnailInfo["source"_ls] = QUrl();
     } else {
         QUrl source = room->makeMediaUrl(eventId, thumbnail.url());
 
         if (source.isValid()) {
-            thumbnailInfo["source"_L1] = source;
+            thumbnailInfo["source"_ls] = source;
         } else {
-            thumbnailInfo["source"_L1] = QUrl();
+            thumbnailInfo["source"_ls] = QUrl();
         }
     }
 
     auto mimeType = thumbnail.mimeType;
     // Add the MIME type for the media if available.
-    thumbnailInfo["mimeType"_L1] = mimeType.name();
+    thumbnailInfo["mimeType"_ls] = mimeType.name();
 
     // Add the MIME type icon if available.
-    thumbnailInfo["mimeIcon"_L1] = mimeType.iconName();
+    thumbnailInfo["mimeIcon"_ls] = mimeType.iconName();
 
     // Add media size if available.
-    thumbnailInfo["size"_L1] = thumbnail.payloadSize;
+    thumbnailInfo["size"_ls] = thumbnail.payloadSize;
 
-    thumbnailInfo["width"_L1] = thumbnail.imageSize.width();
-    thumbnailInfo["height"_L1] = thumbnail.imageSize.height();
+    thumbnailInfo["width"_ls] = thumbnail.imageSize.width();
+    thumbnailInfo["height"_ls] = thumbnail.imageSize.height();
 
     return thumbnailInfo;
 }
 
+bool EventHandler::hasReply(const Quotient::RoomEvent *event, bool showFallbacks)
+{
+    if (event == nullptr) {
+        qCWarning(EventHandling) << "hasReply called with 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;
+}
+
+QString EventHandler::replyId(const Quotient::RoomEvent *event)
+{
+    if (event == nullptr) {
+        qCWarning(EventHandling) << "replyId called with event set to nullptr.";
+        return {};
+    }
+    return 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)
 {
     if (room == nullptr) {
@@ -849,6 +877,38 @@ Quotient::RoomMember EventHandler::replyAuthor(const NeoChatRoom *room, const Qu
     }
 }
 
+bool EventHandler::isThreaded(const Quotient::RoomEvent *event)
+{
+    if (event == nullptr) {
+        qCWarning(EventHandling) << "isThreaded called with 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));
+}
+
+QString EventHandler::threadRoot(const Quotient::RoomEvent *event)
+{
+    if (event == nullptr) {
+        qCWarning(EventHandling) << "threadRoot called with 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();
+    }
+    // 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);
+    }
+    return {};
+}
+
 float EventHandler::latitude(const Quotient::RoomEvent *event)
 {
     if (event == nullptr) {
@@ -856,7 +916,7 @@ float EventHandler::latitude(const Quotient::RoomEvent *event)
         return -100.0;
     }
 
-    const auto geoUri = event->contentJson()["geo_uri"_L1].toString();
+    const auto geoUri = event->contentJson()["geo_uri"_ls].toString();
     if (geoUri.isEmpty()) {
         return -100.0; // latitude runs from -90deg to +90deg so -100 is out of range.
     }
@@ -871,7 +931,7 @@ float EventHandler::longitude(const Quotient::RoomEvent *event)
         return -200.0;
     }
 
-    const auto geoUri = event->contentJson()["geo_uri"_L1].toString();
+    const auto geoUri = event->contentJson()["geo_uri"_ls].toString();
     if (geoUri.isEmpty()) {
         return -200.0; // longitude runs from -180deg to +180deg so -200 is out of range.
     }
@@ -886,7 +946,7 @@ QString EventHandler::locationAssetType(const Quotient::RoomEvent *event)
         return {};
     }
 
-    const auto assetType = event->contentJson()["org.matrix.msc3488.asset"_L1].toObject()["type"_L1].toString();
+    const auto assetType = event->contentJson()["org.matrix.msc3488.asset"_ls].toObject()["type"_ls].toString();
     if (assetType.isEmpty()) {
         return {};
     }

src/eventhandler.h

@@ -37,6 +37,14 @@ class NeoChatRoom;
 class EventHandler
 {
 public:
+    /**
+     * @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.
+     */
+    static QString id(const Quotient::RoomEvent *event);
+
     /**
      * @brief Get the display name of the event author.
      *
@@ -64,7 +72,7 @@ public:
     /**
      * @brief Return a QDateTime object for the event timestamp.
      */
-    static QDateTime time(const NeoChatRoom *room, const Quotient::RoomEvent *event, bool isPending = false);
+    static QDateTime time(const Quotient::RoomEvent *event, bool isPending = false, QDateTime lastUpdated = {});
 
     /**
      * @brief Return a QString for the event timestamp.
@@ -80,11 +88,11 @@ public:
      * @param lastUpdated the time the event was last updated locally as this cannot be
      *                    obtained from the event.
      */
-    static QString timeString(const NeoChatRoom *room,
-                              const Quotient::RoomEvent *event,
+    static QString timeString(const Quotient::RoomEvent *event,
                               bool relative,
                               QLocale::FormatType format = QLocale::ShortFormat,
-                              bool isPending = false);
+                              bool isPending = false,
+                              QDateTime lastUpdated = {});
 
     /**
      * @brief Return a QString for the event timestamp.
@@ -98,7 +106,7 @@ public:
      * @param lastUpdated the time the event was last updated locally as this cannot be
      *                    obtained from the event.
      */
-    static QString timeString(const NeoChatRoom *room, const Quotient::RoomEvent *event, const QString &format, bool isPending = false);
+    static QString timeString(const Quotient::RoomEvent *event, const QString &format, bool isPending = false, const QDateTime &lastUpdated = {});
 
     /**
      * @brief Whether the event should be highlighted in the timeline.
@@ -212,6 +220,20 @@ public:
      */
     static QVariantMap mediaInfo(const NeoChatRoom *room, const Quotient::RoomEvent *event);
 
+    /**
+     * @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);
+
+    /**
+     * @brief Return the Matrix ID of the event replied to.
+     */
+    static QString replyId(const Quotient::RoomEvent *event);
+
     /**
      * @brief Get the author of the event replied to in context of the room.
      *
@@ -227,6 +249,20 @@ public:
      */
     static Quotient::RoomMember replyAuthor(const NeoChatRoom *room, const Quotient::RoomEvent *event);
 
+    /**
+     * @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);
+
+    /**
+     * @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);
+
     /**
      * @brief Return the latitude for the event.
      *

src/events/imagepackevent.cpp

@@ -8,31 +8,31 @@ using namespace Quotient;
 
 ImagePackEventContent::ImagePackEventContent(const QJsonObject &json)
 {
-    if (json.contains("pack"_L1)) {
+    if (json.contains(QStringLiteral("pack"))) {
         pack = ImagePackEventContent::Pack{
-            fromJson<std::optional<QString>>(json["pack"_L1].toObject()["display_name"_L1]),
-            fromJson<std::optional<QUrl>>(json["pack"_L1].toObject()["avatar_url"_L1]),
-            fromJson<std::optional<QStringList>>(json["pack"_L1].toObject()["usage"_L1]),
-            fromJson<std::optional<QString>>(json["pack"_L1].toObject()["attribution"_L1]),
+            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;
     }
 
-    const auto &keys = json["images"_L1].toObject().keys();
+    const auto &keys = json["images"_ls].toObject().keys();
     for (const auto &k : keys) {
         std::optional<EventContent::ImageInfo> info;
-        if (json["images"_L1][k].toObject().contains("info"_L1)) {
-            info = EventContent::ImageInfo(QUrl(json["images"_L1][k]["url"_L1].toString()), json["images"_L1][k]["info"_L1].toObject(), k);
+        if (json["images"_ls][k].toObject().contains(QStringLiteral("info"))) {
+            info = EventContent::ImageInfo(QUrl(json["images"_ls][k]["url"_ls].toString()), json["images"_ls][k]["info"_ls].toObject(), k);
         } else {
             info = std::nullopt;
         }
         images += ImagePackImage{
             k,
-            fromJson<QUrl>(json["images"_L1][k]["url"_L1].toString()),
-            fromJson<std::optional<QString>>(json["images"_L1][k]["body"_L1]),
+            fromJson<QUrl>(json["images"_ls][k]["url"_ls].toString()),
+            fromJson<std::optional<QString>>(json["images"_ls][k]["body"_ls]),
             info,
-            fromJson<std::optional<QStringList>>(json["images"_L1][k]["usage"_L1]),
+            fromJson<std::optional<QStringList>>(json["images"_ls][k]["usage"_ls]),
         };
     }
 }
@@ -42,42 +42,42 @@ void ImagePackEventContent::fillJson(QJsonObject *o) const
     if (pack) {
         QJsonObject packJson;
         if (pack->displayName) {
-            packJson["display_name"_L1] = *pack->displayName;
+            packJson["display_name"_ls] = *pack->displayName;
         }
         if (pack->usage) {
             QJsonArray usageJson;
             for (const auto &usage : *pack->usage) {
                 usageJson += usage;
             }
-            packJson["usage"_L1] = usageJson;
+            packJson["usage"_ls] = usageJson;
         }
         if (pack->avatarUrl) {
-            packJson["avatar_url"_L1] = pack->avatarUrl->toString();
+            packJson["avatar_url"_ls] = pack->avatarUrl->toString();
         }
         if (pack->attribution) {
-            packJson["attribution"_L1] = *pack->attribution;
+            packJson["attribution"_ls] = *pack->attribution;
         }
-        (*o)["pack"_L1] = packJson;
+        (*o)["pack"_ls] = packJson;
     }
 
     QJsonObject imagesJson;
     for (const auto &image : images) {
         QJsonObject imageJson;
-        imageJson["url"_L1] = image.url.toString();
+        imageJson["url"_ls] = image.url.toString();
         if (image.body) {
-            imageJson["body"_L1] = *image.body;
+            imageJson["body"_ls] = *image.body;
         }
         if (image.usage) {
             QJsonArray usageJson;
             for (const auto &usage : *image.usage) {
                 usageJson += usage;
             }
-            imageJson["usage"_L1] = usageJson;
+            imageJson["usage"_ls] = usageJson;
         }
         if (image.info.has_value()) {
-            imageJson["info"_L1] = Quotient::EventContent::toInfoJson(*image.info);
+            imageJson["info"_ls] = Quotient::EventContent::toInfoJson(*image.info);
         }
         imagesJson[image.shortcode] = imageJson;
     }
-    (*o)["images"_L1] = imagesJson;
+    (*o)["images"_ls] = imagesJson;
 }

src/events/joinrulesevent.cpp

@@ -7,10 +7,10 @@ using namespace Quotient;
 
 QString JoinRulesEvent::joinRule() const
 {
-    return fromJson<QString>(contentJson()["join_rule"_L1]);
+    return fromJson<QString>(contentJson()["join_rule"_ls]);
 }
 
 QJsonArray JoinRulesEvent::allow() const
 {
-    return contentJson()["allow"_L1].toArray();
+    return contentJson()["allow"_ls].toArray();
 }

src/events/pollevent.cpp

@@ -12,12 +12,12 @@ PollStartEvent::PollStartEvent(const QJsonObject &obj)
 
 int PollStartEvent::maxSelections() const
 {
-    return contentJson()["org.matrix.msc3381.poll.start"_L1]["max_selections"_L1].toInt();
+    return contentJson()["org.matrix.msc3381.poll.start"_ls]["max_selections"_ls].toInt();
 }
 
 QString PollStartEvent::question() const
 {
-    return contentJson()["org.matrix.msc3381.poll.start"_L1]["question"_L1]["body"_L1].toString();
+    return contentJson()["org.matrix.msc3381.poll.start"_ls]["question"_ls]["body"_ls].toString();
 }
 
 PollResponseEvent::PollResponseEvent(const QJsonObject &obj)
@@ -32,7 +32,7 @@ PollEndEvent::PollEndEvent(const QJsonObject &obj)
 
 PollResponseEvent::PollResponseEvent(const QString &pollStartEventId, QStringList responses)
     : RoomEvent(basicJson(TypeId,
-                          {{"org.matrix.msc3381.poll.response"_L1, QJsonObject{{"answers"_L1, QJsonArray::fromStringList(responses)}}},
-                           {"m.relates_to"_L1, QJsonObject{{"rel_type"_L1, "m.reference"_L1}, {"event_id"_L1, pollStartEventId}}}}))
+                          {{"org.matrix.msc3381.poll.response"_ls, QJsonObject{{"answers"_ls, QJsonArray::fromStringList(responses)}}},
+                           {"m.relates_to"_ls, QJsonObject{{"rel_type"_ls, "m.reference"_ls}, {"event_id"_ls, pollStartEventId}}}}))
 {
 }

src/identityserverhelper.cpp

@@ -11,8 +11,6 @@
 
 #include "neochatconnection.h"
 
-using namespace Qt::StringLiterals;
-
 IdentityServerHelper::IdentityServerHelper(QObject *parent)
     : QObject(parent)
 {
@@ -77,8 +75,8 @@ void IdentityServerHelper::checkUrl()
         return;
     }
 
-    const auto requestUrl = QUrl(m_url + u"/_matrix/identity/v2"_s);
-    if (!(requestUrl.scheme() == u"https"_s || requestUrl.scheme() == u"http"_s)) {
+    const auto requestUrl = QUrl(m_url + QStringLiteral("/_matrix/identity/v2"));
+    if (!(requestUrl.scheme() == QStringLiteral("https") || requestUrl.scheme() == QStringLiteral("http"))) {
         m_status = Invalid;
         Q_EMIT statusChanged();
         return;
@@ -103,7 +101,7 @@ void IdentityServerHelper::setIdentityServer()
         return;
     }
 
-    m_connection->setAccountData(u"m.identity_server"_s, {{"base_url"_L1, m_url}});
+    m_connection->setAccountData(QLatin1String("m.identity_server"), {{QLatin1String("base_url"), m_url}});
     m_status = Ready;
     Q_EMIT statusChanged();
 }
@@ -113,7 +111,7 @@ void IdentityServerHelper::clearIdentityServer()
     if (m_connection->identityServer().isEmpty()) {
         return;
     }
-    m_connection->setAccountData(u"m.identity_server"_s, {{"base_url"_L1, QString()}});
+    m_connection->setAccountData(QLatin1String("m.identity_server"), {{QLatin1String("base_url"), QString()}});
     m_status = Ready;
     Q_EMIT statusChanged();
 }

src/jobs/neochatadd3pidjob.cpp

@@ -0,0 +1,16 @@
+// SPDX-FileCopyrightText: 2024 James Graham <james.h.graham@protonmail.com>
+// SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
+
+#include "neochatadd3pidjob.h"
+
+using namespace Quotient;
+
+NeochatAdd3PIdJob::NeochatAdd3PIdJob(const QString &clientSecret, const QString &sid, const std::optional<QJsonObject> &auth)
+    : BaseJob(HttpVerb::Post, QStringLiteral("Add3PIDJob"), makePath("/_matrix/client/v3", "/account/3pid/add"))
+{
+    QJsonObject _dataJson;
+    addParam<IfNotEmpty>(_dataJson, QStringLiteral("auth"), auth);
+    addParam<>(_dataJson, QStringLiteral("client_secret"), clientSecret);
+    addParam<>(_dataJson, QStringLiteral("sid"), sid);
+    setRequestData({_dataJson});
+}

src/jobs/neochatadd3pidjob.h

@@ -0,0 +1,12 @@
+// SPDX-FileCopyrightText: 2024 James Graham <james.h.graham@protonmail.com>
+// SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
+
+#pragma once
+
+#include <Quotient/jobs/basejob.h>
+
+class NeochatAdd3PIdJob : public Quotient::BaseJob
+{
+public:
+    explicit NeochatAdd3PIdJob(const QString &clientSecret, const QString &sid, const std::optional<QJsonObject> &auth = {});
+};

src/jobs/neochatchangepasswordjob.cpp

@@ -0,0 +1,16 @@
+// SPDX-FileCopyrightText: 2023 Tobias Fella <tobias.fella@kde.org>
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "neochatchangepasswordjob.h"
+
+using namespace Quotient;
+
+NeochatChangePasswordJob::NeochatChangePasswordJob(const QString &newPassword, bool logoutDevices, const std::optional<QJsonObject> &auth)
+    : BaseJob(HttpVerb::Post, QStringLiteral("ChangePasswordJob"), "/_matrix/client/r0/account/password")
+{
+    QJsonObject _data;
+    addParam<>(_data, QStringLiteral("new_password"), newPassword);
+    addParam<IfNotEmpty>(_data, QStringLiteral("logout_devices"), logoutDevices);
+    addParam<IfNotEmpty>(_data, QStringLiteral("auth"), auth);
+    setRequestData(_data);
+}

src/jobs/neochatchangepasswordjob.h

@@ -0,0 +1,12 @@
+// SPDX-FileCopyrightText: 2023 Tobias Fella <tobias.fella@kde.org>
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include <Quotient/jobs/basejob.h>
+
+class NeochatChangePasswordJob : public Quotient::BaseJob
+{
+public:
+    explicit NeochatChangePasswordJob(const QString &newPassword, bool logoutDevices, const std::optional<QJsonObject> &auth = {});
+};

src/jobs/neochatdeactivateaccountjob.cpp

@@ -6,9 +6,9 @@
 using namespace Quotient;
 
 NeoChatDeactivateAccountJob::NeoChatDeactivateAccountJob(const std::optional<QJsonObject> &auth)
-    : BaseJob(HttpVerb::Post, u"DisableDeviceJob"_s, "_matrix/client/v3/account/deactivate")
+    : BaseJob(HttpVerb::Post, QStringLiteral("DisableDeviceJob"), "_matrix/client/v3/account/deactivate")
 {
     QJsonObject data;
-    addParam<IfNotEmpty>(data, u"auth"_s, auth);
+    addParam<IfNotEmpty>(data, QStringLiteral("auth"), auth);
     setRequestData(data);
 }

src/jobs/neochatdeletedevicejob.cpp

@@ -0,0 +1,14 @@
+// SPDX-FileCopyrightText: 2023 Tobias Fella <tobias.fella@kde.org>
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "neochatdeletedevicejob.h"
+
+using namespace Quotient;
+
+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;
+    addParam<IfNotEmpty>(_data, QStringLiteral("auth"), auth);
+    setRequestData(std::move(_data));
+}