GIT_SILENT Sync po/docbooks with svn

This fixes the problem that the tray icon is created in GNOME if it was
enabled in other desktop environment previously.



(cherry picked from commit d103de96aa)

Co-authored-by: Balló György <ballogyor@gmail.com>

.flatpak-manifest.json

@@ -110,7 +110,7 @@
                 {
                     "type": "git",
                     "url": "https://github.com/quotient-im/libQuotient.git",
-                    "branch": "dev",
+                    "tag": "0.9.2",
                     "disable-submodules": true
                 }
             ],

.kde-ci.yml

@@ -14,6 +14,7 @@ Dependencies:
     'frameworks/kquickcharts': '@latest-kf6'
     'frameworks/knotifications': '@latest-kf6'
     'frameworks/kcolorscheme': '@latest-kf6'
+    'frameworks/kiconthemes': '@latest-kf6'
     'libraries/kquickimageeditor': '@latest-kf6'
     'frameworks/sonnet': '@latest-kf6'
     'frameworks/prison': '@latest-kf6'

.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 "12")
+set(RELEASE_SERVICE_VERSION_MICRO "3")
 set(RELEASE_SERVICE_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE_VERSION_MINOR}.${RELEASE_SERVICE_VERSION_MICRO}")
 
 project(NeoChat VERSION ${RELEASE_SERVICE_VERSION})
@@ -66,7 +66,7 @@ if (QT_KNOWN_POLICY_QTP0004)
 qt_policy(SET QTP0004 NEW)
 endif ()
 
-find_package(KF6 ${KF_MIN_VERSION} COMPONENTS Kirigami I18n Notifications Config CoreAddons Sonnet ItemModels ColorScheme)
+find_package(KF6 ${KF_MIN_VERSION} COMPONENTS Kirigami I18n Notifications Config CoreAddons Sonnet ItemModels IconThemes ColorScheme)
 set_package_properties(KF6 PROPERTIES
     TYPE REQUIRED
     PURPOSE "Basic application components"

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:7.4.1'
+        classpath 'com.android.tools.build:gradle:8.6.0'
     }
 }
 

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,11 +11,11 @@ ecm_add_test(
     TEST_NAME neochatroomtest
 )
 
-ecm_add_test(
-    texthandlertest.cpp
-    LINK_LIBRARIES neochat Qt::Test
-    TEST_NAME texthandlertest
-)
+# ecm_add_test(
+#     texthandlertest.cpp
+#     LINK_LIBRARIES neochat Qt::Test
+#     TEST_NAME texthandlertest
+# )
 
 ecm_add_test(
     delegatesizehelpertest.cpp

autotests/eventhandlertest.cpp

@@ -32,6 +32,8 @@ private:
 private Q_SLOTS:
     void initTestCase();
 
+    void eventId();
+    void nullEventId();
     void authorDisplayName();
     void nullAuthorDisplayName();
     void singleLineSidplayName();
@@ -54,8 +56,14 @@ 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();
 };
@@ -66,6 +74,17 @@ void EventHandlerTest::initTestCase()
     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()), QStringLiteral("before"));
@@ -99,9 +118,8 @@ void EventHandlerTest::time()
 {
     const auto event = room->messageEvents().at(0).get();
 
-    QCOMPARE(EventHandler::time(event), QDateTime::fromMSecsSinceEpoch(1432735824654, QTimeZone(QTimeZone::UTC)));
-    QCOMPARE(EventHandler::time(event, true, QDateTime::fromMSecsSinceEpoch(1234, QTimeZone(QTimeZone::UTC))),
-             QDateTime::fromMSecsSinceEpoch(1234, QTimeZone(QTimeZone::UTC)));
+    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()
@@ -120,19 +138,19 @@ void EventHandlerTest::timeString()
     KFormat format;
 
     QCOMPARE(EventHandler::timeString(event, false),
-             QLocale().toString(QDateTime::fromMSecsSinceEpoch(1432735824654, QTimeZone(QTimeZone::UTC)).toLocalTime().time(), QLocale::ShortFormat));
+             QLocale().toString(QDateTime::fromMSecsSinceEpoch(1432735824654, Qt::UTC).toLocalTime().time(), QLocale::ShortFormat));
     QCOMPARE(EventHandler::timeString(event, true),
-             format.formatRelativeDate(QDateTime::fromMSecsSinceEpoch(1432735824654, QTimeZone(QTimeZone::UTC)).toLocalTime().date(), QLocale::ShortFormat));
-    QCOMPARE(EventHandler::timeString(event, false, QLocale::ShortFormat, true, QDateTime::fromMSecsSinceEpoch(1690699214545, QTimeZone(QTimeZone::UTC))),
-             QLocale().toString(QDateTime::fromMSecsSinceEpoch(1690699214545, QTimeZone(QTimeZone::UTC)).toLocalTime().time(), QLocale::ShortFormat));
-    QCOMPARE(EventHandler::timeString(event, true, QLocale::ShortFormat, true, QDateTime::fromMSecsSinceEpoch(1690699214545, QTimeZone(QTimeZone::UTC))),
-             format.formatRelativeDate(QDateTime::fromMSecsSinceEpoch(1690699214545, QTimeZone(QTimeZone::UTC)).toLocalTime().date(), QLocale::ShortFormat));
-    QCOMPARE(EventHandler::timeString(event, false, QLocale::LongFormat, true, QDateTime::fromMSecsSinceEpoch(1690699214545, QTimeZone(QTimeZone::UTC))),
-             QLocale().toString(QDateTime::fromMSecsSinceEpoch(1690699214545, QTimeZone(QTimeZone::UTC)).toLocalTime().time(), QLocale::LongFormat));
-    QCOMPARE(EventHandler::timeString(event, true, QLocale::LongFormat, true, QDateTime::fromMSecsSinceEpoch(1690699214545, QTimeZone(QTimeZone::UTC))),
-             format.formatRelativeDate(QDateTime::fromMSecsSinceEpoch(1690699214545, QTimeZone(QTimeZone::UTC)).toLocalTime().date(), QLocale::LongFormat));
+             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, QTimeZone(QTimeZone::UTC)).toString(QStringLiteral("hh:mm")));
+             QDateTime::fromMSecsSinceEpoch(1432735824654, Qt::UTC).toString(QStringLiteral("hh:mm")));
 }
 
 void EventHandlerTest::highlighted()
@@ -277,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();
@@ -302,6 +344,29 @@ 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()), QStringLiteral("51.7035").toFloat());

autotests/texthandlertest.cpp

@@ -63,6 +63,7 @@ private Q_SLOTS:
     void receiveRichEdited();
     void receiveLineSeparator();
     void receiveRichCodeUrl();
+    void receiveRichColor();
 
     void componentOutput_data();
     void componentOutput();
@@ -520,6 +521,25 @@ void TextHandlerTest::receiveRichCodeUrl()
     QCOMPARE(testTextHandler.handleRecieveRichText(), input);
 }
 
+void TextHandlerTest::receiveRichColor()
+{
+    const QString testInputString = QStringLiteral(
+        "<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>");
+    const QString testOutputString = QStringLiteral(
+        "<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>");
+
+    TextHandler testTextHandler;
+    testTextHandler.setData(testInputString);
+
+    qInfo() << testTextHandler.handleRecieveRichText();
+
+    QCOMPARE(testTextHandler.handleRecieveRichText(), testOutputString);
+}
+
 void TextHandlerTest::componentOutput_data()
 {
     QTest::addColumn<QString>("testInputString");

org.kde.neochat.appdata.xml

@@ -56,6 +56,7 @@
   <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>
@@ -66,7 +67,6 @@
   <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>
@@ -119,7 +119,7 @@
     <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 é implementar a 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 é fornecer compatibilidade coa especificación completa.</p>
     <p xml:lang="he">NeoChat מתיימר להיות יישום עתיר יכולות לפי מפרט Matrix. כיוון שזה ייעודו, כל מה שבמפרט היציב עם חריגות משמעותיות כגון VoIP, שרשורים ועוד מגוון היבטים של הצפנה מקצה לקצה נתמכים גם הם. יש מספר השמטות קטן עקב העובדה שהמפרט של Matrix ממשיך להתפתח אך המטרה היא להמשיך לספק תמיכה בסופו של דבר לכל המפרט.</p>
     <p xml:lang="hu">A NeoChat célja, hogy a Matrix specifikációnak megfelelő teljes funkcionalitású alkalmazás legyen. Mint ilyen, a jelenlegi stabil specifikáció támogatott a VoIP, a szálak és a végpontok közötti titkosítás egyes elemeinek kivételével. Van még néhány kisebb hiányosság annak köszönhetően, hogy a Matrix specifikáció folyamatosan fejlődik, de végső cél a teljes specifikáció megvalósítása.</p>
     <p xml:lang="ia">NeoChat aspira a esser un application plenmente eminente per le specification de Matrix. Tal como omne cosas in le specification currentemente stabile con le exceptiones notabile de VOIP, threads e alcun aspectos del cryptation End-to-End es supportate. Il ha ltere pauc omissiones, debite al facto que le specification de Matrix es in evolution constante ma le aspiration remane a fornir supporto eventual per le integre specification.</p>
@@ -293,7 +293,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>
@@ -448,6 +447,9 @@
     <content_attribute id="social-chat">intense</content_attribute>
   </content_rating>
   <releases>
+    <release version="24.12.3" date="2025-03-06"/>
+    <release version="24.12.2" date="2025-02-06"/>
+    <release version="24.12.1" date="2025-01-09"/>
     <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"/>

org.kde.neochat.desktop

@@ -93,6 +93,7 @@ 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ä
@@ -102,16 +103,16 @@ Comment[he]=התכתבות דרך Matrix
 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[ka]=საუბარი Matrix-ზე
 Comment[nl]=Chat op Matrix
 Comment[pl]=Rozmawiaj na Matriksie
+Comment[pt_BR]=Bate papo na Matrix
 Comment[sl]=Klepet na Matrixu
 Comment[sv]=Chatta på Matrix
 Comment[ta]=மேட்ரிக்ஸில் உரையாட உதவும்
-Comment[tr]=Matrix Üzerinde Sohbet Et
+Comment[tr]=Matrix üzerinde sohbet edin
 Comment[uk]=Спілкування у Matrix
-Comment[x-test]=xxChat on Matrixxx
+Comment[zh_CN]=在 Matrix 上聊天
 Comment[zh_TW]=在 Matrix 上聊天
 MimeType=x-scheme-handler/matrix;
 Exec=neochat %u

snapcraft.yaml

@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: CC0-1.0
 ---
 name: neochat
-base: core22
+base: core24
 adopt-info: neochat
 grade: stable
 confinement: strict
@@ -27,6 +27,10 @@ apps:
 
 compression: lzo
 
+package-repositories:
+ - type: apt
+   ppa: ubuntu-toolchain-r/test
+
 slots:
   session-dbus-interface:
     interface: dbus
@@ -76,6 +80,7 @@ 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
@@ -95,6 +100,10 @@ parts:
     source-tag: 0.9.1
     source-depth: 1
     plugin: cmake
+    build-environment:
+      - PATH: /snap/bin:${PATH}
+    build-snaps:
+      - cmake
     build-packages:
       - libssl-dev
     cmake-parameters:
@@ -113,6 +122,10 @@ parts:
     source-tag: 'v0.3.0'
     source-depth: 1
     plugin: cmake
+    build-environment:
+      - PATH: /snap/bin:${PATH}
+      - PYTHONPATH: ${CRAFT_STAGE}/lib/python3.12/site-packages:${CRAFT_STAGE}/usr/lib/python3/dist-packages
+      - LD_LIBRARY_PATH: "/snap/mesa-2404/current/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR:$CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR:/snap/kde-qt6-core24-sdk/current/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/libproxy:$LD_LIBRARY_PATH"
     cmake-parameters:
       - -DCMAKE_INSTALL_PREFIX=/usr
       - -DCMAKE_BUILD_TYPE=Release
@@ -130,9 +143,12 @@ parts:
       - kquickimageeditor
     parse-info:
       - usr/share/metainfo/org.kde.neochat.appdata.xml
-    source: https://invent.kde.org/network/neochat.git
-    source-tag: 'v24.08.1'
+    source: .
     plugin: cmake
+    build-environment:
+      - PATH: /snap/bin:${PATH}
+      - PYTHONPATH: ${CRAFT_STAGE}/lib/python3.12/site-packages:${CRAFT_STAGE}/usr/lib/python3/dist-packages
+      - LD_LIBRARY_PATH: "/snap/mesa-2404/current/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR:$CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR:/snap/kde-qt6-core24-sdk/current/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/libproxy:$LD_LIBRARY_PATH"
     build-packages:
       - cmark
       - libcmark-dev
@@ -156,3 +172,12 @@ parts:
     prime:
       - usr/lib/*/libcmark.so*
 
+  gpu-2404:
+    after: [neochat]
+    source: https://github.com/canonical/gpu-snap.git
+    plugin: dump
+    override-prime: |
+      craftctl default
+      ${CRAFT_PART_SRC}/bin/gpu-2404-cleanup mesa-2404
+    prime:
+      - bin/gpu-2404-wrapper

src/CMakeLists.txt

@@ -194,8 +194,6 @@ add_library(neochat STATIC
     models/threadmodel.h
     enums/messagetype.h
     messagecomponent.h
-    enums/roomsortparameter.cpp
-    enums/roomsortparameter.h
 )
 
 set_source_files_properties(qml/OsmLocationPlugin.qml PROPERTIES
@@ -420,6 +418,7 @@ target_link_libraries(neochat PUBLIC
     KF6::ConfigGui
     KF6::CoreAddons
     KF6::SonnetCore
+    KF6::IconThemes
     KF6::ColorScheme
     KF6::ItemModels
     QuotientQt6
@@ -493,6 +492,7 @@ if(ANDROID)
         "network-connect"
         "list-remove-user"
         "org.kde.neochat"
+        "org.kde.neochat.tray"
         "preferences-system-users"
         "preferences-desktop-theme-global"
         "notifications"
@@ -530,6 +530,7 @@ if(ANDROID)
         "object-rotate-left"
         "object-rotate-right"
         "add-subtitle"
+        "security-high"
         "security-low"
         "security-low-symbolic"
         "kde"

src/chatbarcache.cpp

@@ -11,8 +11,6 @@
 #include "neochatroom.h"
 #include "texthandler.h"
 
-using namespace Qt::StringLiterals;
-
 ChatBarCache::ChatBarCache(QObject *parent)
     : QObject(parent)
 {
@@ -321,25 +319,8 @@ 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());
-    }
-
-    const auto type = std::get<std::optional<Quotient::RoomMessageEvent::MsgType>>(result);
-    room->post<Quotient::RoomMessageEvent>(text(), type ? *type : Quotient::RoomMessageEvent::MsgType::Text, std::move(content), relatesTo);
+    auto type = std::get<std::optional<Quotient::RoomMessageEvent::MsgType>>(result);
+    room->postMessage(text(), sendText, type ? *type : Quotient::RoomMessageEvent::MsgType::Text, replyId(), editId(), threadId());
     clearCache();
 }
 

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

@@ -168,7 +168,6 @@ void Controller::addConnection(NeoChatConnection *c)
     connect(c, &NeoChatConnection::syncDone, this, [this, c]() {
         m_notificationsManager.handleNotifications(c);
     });
-    connect(c, &NeoChatConnection::showInviteNotification, &m_notificationsManager, &NotificationsManager::postInviteNotification);
 
     c->sync();
 
@@ -295,7 +294,7 @@ bool Controller::supportSystemTray() const
 void Controller::setQuitOnLastWindowClosed()
 {
 #ifndef Q_OS_ANDROID
-    if (NeoChatConfig::self()->systemTray()) {
+    if (supportSystemTray() && NeoChatConfig::self()->systemTray()) {
         m_trayIcon = new TrayIcon(this);
         m_trayIcon->show();
     } else {

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

@@ -3,6 +3,7 @@
 
 import QtQuick
 import QtQuick.Layouts
+import QtQuick.Window
 
 import org.kde.kirigami as Kirigami
 import org.kde.kirigamiaddons.formcard as FormCard
@@ -37,7 +38,7 @@ FormCard.FormCardPage {
     }
 
     function openEventSource(stateKey: string): void {
-        pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'MessageSourceSheet'), {
+        root.Window.window.pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'MessageSourceSheet'), {
             model: stateKeysModel,
             allowEdit: true,
             room: root.room,

src/enums/roomsortparameter.cpp

@@ -1,85 +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"
-
-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);
-}
-}
-
-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 false;
-    }
-}
-
-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,122 +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 "neochatroom.h"
-#include <QObject>
-#include <QQmlEngine>
-
-#include <KLocalizedString>
-
-/**
- * @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.
-     */
-    enum Parameter {
-        AlphabeticalAscending,
-        AlphabeticalDescending,
-        HasUnread,
-        MostUnread,
-        HasHighlight,
-        MostHighlights,
-        LastActive,
-    };
-    Q_ENUM(Parameter)
-
-    /**
-     * @brief Translate the Parameter enum value to a human readable name string.
-     *
-     * @sa Parameter
-     */
-    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
-     */
-    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 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,7 +70,7 @@ QString EventHandler::authorDisplayName(const NeoChatRoom *room, const Quotient:
         return {};
     }
 
-    if (is<RoomMemberEvent>(*event) && event->unsignedJson()[QStringLiteral("prev_content")].toObject().contains("displayname"_L1)
+    if (is<RoomMemberEvent>(*event) && !event->unsignedJson()[QStringLiteral("prev_content")][QStringLiteral("displayname")].isNull()
         && event->stateKey() == event->senderId()) {
         auto previousDisplayName = event->unsignedJson()[QStringLiteral("prev_content")][QStringLiteral("displayname")].toString().toHtmlEscaped();
         if (previousDisplayName.isEmpty()) {
@@ -281,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());
     }
@@ -498,7 +508,7 @@ 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>");
     }
 
@@ -824,6 +834,31 @@ QVariantMap EventHandler::getMediaInfoFromTumbnail(const NeoChatRoom *room, cons
     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) {
@@ -842,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) {

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.
      *
@@ -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/linkpreviewer.cpp

@@ -4,12 +4,11 @@
 #include "linkpreviewer.h"
 
 #include <Quotient/connection.h>
-#include <Quotient/csapi/authed-content-repo.h>
 #include <Quotient/csapi/content-repo.h>
-
 #include <Quotient/events/roommessageevent.h>
 
 #include "neochatconfig.h"
+#include "neochatconnection.h"
 #include "utils.h"
 
 using namespace Quotient;
@@ -62,13 +61,7 @@ void LinkPreviewer::loadUrlPreview()
         if (conn == nullptr) {
             return;
         }
-
-        BaseJob *job = nullptr;
-        if (conn->supportedMatrixSpecVersions().contains("v1.11"_L1)) {
-            job = conn->callApi<GetUrlPreviewAuthedJob>(m_url);
-        } else {
-            QT_IGNORE_DEPRECATIONS(job = conn->callApi<GetUrlPreviewJob>(m_url);)
-        }
+        GetUrlPreviewJob *job = conn->callApi<GetUrlPreviewJob>(m_url);
 
         connect(job, &BaseJob::success, this, [this, job, conn]() {
             const auto json = job->jsonData();

src/login/WelcomePage.qml

@@ -17,6 +17,7 @@ Kirigami.Page {
 
     property bool showExisting: false
     property bool _showExisting: showExisting && root.currentStepString === root.initialStep
+    property bool showSettings: true
     property alias currentStep: module.item
     property string currentStepString: initialStep
     property string initialStep: "LoginRegister"
@@ -265,6 +266,7 @@ Kirigami.Page {
             FormCard.FormCard {
                 Layout.topMargin: Kirigami.Units.largeSpacing * 2
                 maximumWidth: Kirigami.Units.gridUnit * 20
+                visible: root.showSettings
                 FormCard.FormButtonDelegate {
                     text: i18nc("@action:button", "Settings")
                     icon.name: "settings-configure"

src/main.cpp

@@ -37,6 +37,7 @@
 #include <KCrash>
 #endif
 
+#include <KIconTheme>
 #include <KLocalizedContext>
 #include <KLocalizedString>
 
@@ -101,6 +102,7 @@ Q_DECL_EXPORT
 #endif
 int main(int argc, char *argv[])
 {
+    KIconTheme::initTheme();
     QNetworkProxyFactory::setUseSystemConfiguration(true);
 
 #ifdef HAVE_WEBVIEW
@@ -271,6 +273,7 @@ int main(int argc, char *argv[])
 #endif
 
     engine.rootContext()->setContextObject(new KLocalizedContext(&engine));
+    QObject::connect(&engine, &QQmlApplicationEngine::quit, &app, &QCoreApplication::quit);
     engine.setNetworkAccessManagerFactory(new NetworkAccessManagerFactory());
 
     if (parser.isSet("ignore-ssl-errors"_ls)) {

src/models/actionsmodel.cpp

@@ -109,10 +109,11 @@ QList<ActionsModel::Action> actions{
                 rainbowText += QStringLiteral("<font color='%2'>%3</font>").arg(rainbowColors[i % rainbowColors.length()], text.at(i));
             }
             // Ideally, we would just return rainbowText and let that do the rest, but the colors don't survive markdownToHTML.
-            auto content = std::make_unique<Quotient::EventContent::TextContent>(rainbowText, u"text/html"_s);
-            EventRelation relatesTo =
-                chatBarCache->isReplying() ? EventRelation::replyTo(chatBarCache->replyId()) : EventRelation::replace(chatBarCache->editId());
-            room->post<Quotient::RoomMessageEvent>("/rainbow %1"_L1.arg(text), MessageEventType::Text, std::move(content), relatesTo);
+            room->postMessage(QStringLiteral("/rainbow %1").arg(text),
+                              rainbowText,
+                              RoomMessageEvent::MsgType::Text,
+                              chatBarCache->replyId(),
+                              chatBarCache->editId());
             return QString();
         },
         false,
@@ -128,10 +129,11 @@ QList<ActionsModel::Action> actions{
                 rainbowText += QStringLiteral("<font color='%2'>%3</font>").arg(rainbowColors[i % rainbowColors.length()], text.at(i));
             }
             // Ideally, we would just return rainbowText and let that do the rest, but the colors don't survive markdownToHTML.
-            auto content = std::make_unique<Quotient::EventContent::TextContent>(rainbowText, u"text/html"_s);
-            EventRelation relatesTo =
-                chatBarCache->isReplying() ? EventRelation::replyTo(chatBarCache->replyId()) : EventRelation::replace(chatBarCache->editId());
-            room->post<Quotient::RoomMessageEvent>(u"/rainbow %1"_s.arg(text), MessageEventType::Text, std::move(content), relatesTo);
+            room->postMessage(QStringLiteral("/rainbow %1").arg(text),
+                              rainbowText,
+                              RoomMessageEvent::MsgType::Emote,
+                              chatBarCache->replyId(),
+                              chatBarCache->editId());
             return QString();
         },
         false,
@@ -142,7 +144,7 @@ QList<ActionsModel::Action> actions{
     Action{
         QStringLiteral("plain"),
         [](const QString &text, NeoChatRoom *room, ChatBarCache *) {
-            room->postPlainText(text.toHtmlEscaped());
+            room->postMessage(text, text.toHtmlEscaped(), RoomMessageEvent::MsgType::Text, {}, {});
             return QString();
         },
         false,
@@ -154,10 +156,11 @@ QList<ActionsModel::Action> actions{
         QStringLiteral("spoiler"),
         [](const QString &text, NeoChatRoom *room, ChatBarCache *chatBarCache) {
             // Ideally, we would just return rainbowText and let that do the rest, but the colors don't survive markdownToHTML.
-            auto content = std::make_unique<Quotient::EventContent::TextContent>(u"<span data-mx-spoiler>%1</span>"_s.arg(text), u"text/html"_s);
-            EventRelation relatesTo =
-                chatBarCache->isReplying() ? EventRelation::replyTo(chatBarCache->replyId()) : EventRelation::replace(chatBarCache->editId());
-            room->post<Quotient::RoomMessageEvent>(u"/spoiler %1"_s.arg(text), MessageEventType::Text, std::move(content), relatesTo);
+            room->postMessage(QStringLiteral("/spoiler %1").arg(text),
+                              QStringLiteral("<span data-mx-spoiler>%1</span>").arg(text),
+                              RoomMessageEvent::MsgType::Text,
+                              chatBarCache->replyId(),
+                              chatBarCache->editId());
             return QString();
         },
         false,
@@ -602,15 +605,15 @@ bool ActionsModel::handleQuickEditAction(NeoChatRoom *room, const QString &messa
                         if (eventRelation && eventRelation->type == "m.replace"_L1) {
                             replaceId = eventRelation->eventId;
                         }
-
-                        std::unique_ptr<EventContent::TextContent> content = nullptr;
                         if (flags == "/g"_L1) {
-                            content = std::make_unique<Quotient::EventContent::TextContent>(originalString.replace(regex, replacement), u"text/html"_s);
+                            room->postHtmlMessage(messageText, originalString.replace(regex, replacement), event->msgtype(), {}, replaceId);
                         } else {
-                            content = std::make_unique<Quotient::EventContent::TextContent>(originalString.replace(regex, replacement), u"text/html"_s);
+                            room->postHtmlMessage(messageText,
+                                                  originalString.replace(originalString.indexOf(regex), regex.size(), replacement),
+                                                  event->msgtype(),
+                                                  {},
+                                                  replaceId);
                         }
-                        Quotient::EventRelation relatesTo = Quotient::EventRelation::replace(replaceId);
-                        room->post<Quotient::RoomMessageEvent>(messageText, event->msgtype(), std::move(content), relatesTo);
                         return true;
                     }
                 }

src/models/messagecontentmodel.cpp

@@ -34,7 +34,7 @@ MessageContentModel::MessageContentModel(NeoChatRoom *room, const QString &event
     : QAbstractListModel(parent)
     , m_room(room)
     , m_eventId(eventId)
-    , m_currentState(isPending ? Pending : Unknown)
+    , m_isPending(isPending)
     , m_isReply(isReply)
 {
     initializeModel();
@@ -45,27 +45,19 @@ void MessageContentModel::initializeModel()
     Q_ASSERT(m_room != nullptr);
     Q_ASSERT(!m_eventId.isEmpty());
 
-    connect(m_room, &NeoChatRoom::pendingEventAdded, this, [this]() {
-        if (m_room != nullptr && m_currentState == Unknown) {
-            initializeEvent();
-            updateReplyModel();
-            resetModel();
-        }
-    });
+    connect(this, &MessageContentModel::eventUnavailable, this, &MessageContentModel::getEvent);
+
     connect(m_room, &NeoChatRoom::pendingEventAboutToMerge, this, [this](Quotient::RoomEvent *serverEvent) {
         if (m_room != nullptr) {
             if (m_eventId == serverEvent->id() || m_eventId == serverEvent->transactionId()) {
+                beginResetModel();
+                m_isPending = false;
                 m_eventId = serverEvent->id();
+                initializeEvent();
+                endResetModel();
             }
         }
     });
-    connect(m_room, &NeoChatRoom::pendingEventMerged, this, [this]() {
-        if (m_room != nullptr && m_currentState == Pending) {
-            initializeEvent();
-            updateReplyModel();
-            resetModel();
-        }
-    });
     connect(m_room, &NeoChatRoom::addedMessages, this, [this](int fromIndex, int toIndex) {
         if (m_room != nullptr) {
             for (int i = fromIndex; i <= toIndex; i++) {
@@ -151,33 +143,20 @@ void MessageContentModel::initializeModel()
     });
 
     initializeEvent();
-    if (m_currentState == Available || m_currentState == Pending) {
-        updateReplyModel();
-    }
+    updateReplyModel();
     resetModel();
 }
 
 void MessageContentModel::initializeEvent()
 {
-    if (m_currentState == UnAvailable) {
+    const auto event = m_room->getEvent(m_eventId);
+    if (event == nullptr) {
+        Q_EMIT eventUnavailable();
         return;
     }
 
-    const auto eventResult = m_room->getEvent(m_eventId);
-    if (eventResult.first == nullptr) {
-        if (m_currentState != Pending) {
-            getEvent();
-        }
-        return;
-    }
-    if (eventResult.second) {
-        m_currentState = Pending;
-    } else {
-        m_currentState = Available;
-    }
-
     if (m_eventSenderObject == nullptr) {
-        auto senderId = eventResult.first->senderId();
+        auto senderId = event->senderId();
         // A pending event might not have a sender ID set yet but in that case it must
         // be the local member.
         if (senderId.isEmpty()) {
@@ -193,6 +172,7 @@ void MessageContentModel::getEvent()
     Quotient::connectUntil(m_room.get(), &NeoChatRoom::extraEventLoaded, this, [this](const QString &eventId) {
         if (m_room != nullptr) {
             if (eventId == m_eventId) {
+                m_notFound = false;
                 initializeEvent();
                 updateReplyModel();
                 resetModel();
@@ -204,7 +184,7 @@ void MessageContentModel::getEvent()
     Quotient::connectUntil(m_room.get(), &NeoChatRoom::extraEventNotFound, this, [this](const QString &eventId) {
         if (m_room != nullptr) {
             if (eventId == m_eventId) {
-                m_currentState = UnAvailable;
+                m_notFound = true;
                 resetModel();
                 return true;
             }
@@ -257,7 +237,7 @@ QVariant MessageContentModel::data(const QModelIndex &index, int role) const
     const auto component = m_components[index.row()];
 
     const auto event = m_room->getEvent(m_eventId);
-    if (event.first == nullptr) {
+    if (event == nullptr) {
         if (role == DisplayRole) {
             if (m_isReply) {
                 return i18n("Loading reply");
@@ -272,7 +252,7 @@ QVariant MessageContentModel::data(const QModelIndex &index, int role) const
     }
 
     if (role == DisplayRole) {
-        if (m_currentState == UnAvailable || m_room->connection()->isIgnored(m_eventSenderId)) {
+        if (m_notFound || m_room->connection()->isIgnored(m_eventSenderId)) {
             Kirigami::Platform::PlatformTheme *theme =
                 static_cast<Kirigami::Platform::PlatformTheme *>(qmlAttachedPropertiesObject<Kirigami::Platform::PlatformTheme>(this, true));
 
@@ -296,7 +276,7 @@ QVariant MessageContentModel::data(const QModelIndex &index, int role) const
         if (!component.content.isEmpty()) {
             return component.content;
         }
-        return EventHandler::richBody(m_room, event.first);
+        return EventHandler::richBody(m_room, event);
     }
     if (role == ComponentTypeRole) {
         return component.type;
@@ -305,55 +285,53 @@ QVariant MessageContentModel::data(const QModelIndex &index, int role) const
         return component.attributes;
     }
     if (role == EventIdRole) {
-        return event.first->displayId();
+        return EventHandler::id(event);
     }
     if (role == TimeRole) {
         const auto pendingIt = std::find_if(m_room->pendingEvents().cbegin(), m_room->pendingEvents().cend(), [event](const PendingEventItem &pendingEvent) {
-            return event.first->transactionId() == pendingEvent->transactionId();
+            return event->transactionId() == pendingEvent->transactionId();
         });
 
         auto lastUpdated = pendingIt == m_room->pendingEvents().cend() ? QDateTime() : pendingIt->lastUpdated();
-        return EventHandler::time(event.first, m_currentState == Pending, lastUpdated);
+        return EventHandler::time(event, m_isPending, lastUpdated);
     }
     if (role == TimeStringRole) {
         const auto pendingIt = std::find_if(m_room->pendingEvents().cbegin(), m_room->pendingEvents().cend(), [event](const PendingEventItem &pendingEvent) {
-            return event.first->transactionId() == pendingEvent->transactionId();
+            return event->transactionId() == pendingEvent->transactionId();
         });
 
         auto lastUpdated = pendingIt == m_room->pendingEvents().cend() ? QDateTime() : pendingIt->lastUpdated();
-        return EventHandler::timeString(event.first, QStringLiteral("hh:mm"), m_currentState == Pending, lastUpdated);
+        return EventHandler::timeString(event, QStringLiteral("hh:mm"), m_isPending, lastUpdated);
     }
     if (role == AuthorRole) {
         return QVariant::fromValue<NeochatRoomMember *>(m_eventSenderObject.get());
     }
     if (role == MediaInfoRole) {
-        return EventHandler::mediaInfo(m_room, event.first);
+        return EventHandler::mediaInfo(m_room, event);
     }
     if (role == FileTransferInfoRole) {
-        return QVariant::fromValue(m_room->cachedFileTransferInfo(event.first));
+        return QVariant::fromValue(m_room->cachedFileTransferInfo(event));
     }
     if (role == ItineraryModelRole) {
         return QVariant::fromValue<ItineraryModel *>(m_itineraryModel);
     }
     if (role == LatitudeRole) {
-        return EventHandler::latitude(event.first);
+        return EventHandler::latitude(event);
     }
     if (role == LongitudeRole) {
-        return EventHandler::longitude(event.first);
+        return EventHandler::longitude(event);
     }
     if (role == AssetRole) {
-        return EventHandler::locationAssetType(event.first);
+        return EventHandler::locationAssetType(event);
     }
     if (role == PollHandlerRole) {
         return QVariant::fromValue<PollHandler *>(m_room->poll(m_eventId));
     }
     if (role == ReplyEventIdRole) {
-        if (const auto roomMessageEvent = eventCast<const RoomMessageEvent>(event.first)) {
-            return roomMessageEvent->replyEventId();
-        }
+        return EventHandler::replyId(event);
     }
     if (role == ReplyAuthorRole) {
-        return QVariant::fromValue(EventHandler::replyAuthor(m_room, event.first));
+        return QVariant::fromValue(EventHandler::replyAuthor(m_room, event));
     }
     if (role == ReplyContentModelRole) {
         return QVariant::fromValue<MessageContentModel *>(m_replyModel);
@@ -409,17 +387,18 @@ QHash<int, QByteArray> MessageContentModel::roleNames() const
 
 void MessageContentModel::resetModel()
 {
+    const auto event = m_room->getEvent(m_eventId);
+
     beginResetModel();
     m_components.clear();
 
-    if (m_room->connection()->isIgnored(m_eventSenderId) || m_currentState == UnAvailable) {
+    if (m_room->connection()->isIgnored(m_eventSenderId) || m_notFound) {
         m_components += MessageComponent{MessageComponentType::Text, QString(), {}};
         endResetModel();
         return;
     }
 
-    const auto event = m_room->getEvent(m_eventId);
-    if (event.first == nullptr) {
+    if (event == nullptr) {
         m_components += MessageComponent{MessageComponentType::Loading, QString(), {}};
         endResetModel();
         return;
@@ -452,19 +431,19 @@ void MessageContentModel::resetContent(bool isEditing, bool isThreading)
 QList<MessageComponent> MessageContentModel::messageContentComponents(bool isEditing, bool isThreading)
 {
     const auto event = m_room->getEvent(m_eventId);
-    if (event.first == nullptr) {
+    if (event == nullptr) {
         return {};
     }
 
     QList<MessageComponent> newComponents;
 
-    const auto roomMessageEvent = eventCast<const Quotient::RoomMessageEvent>(event.first);
-    if (roomMessageEvent && roomMessageEvent->rawMsgtype() == QStringLiteral("m.key.verification.request")) {
+    if (eventCast<const Quotient::RoomMessageEvent>(event)
+        && eventCast<const Quotient::RoomMessageEvent>(event)->rawMsgtype() == QStringLiteral("m.key.verification.request")) {
         newComponents += MessageComponent{MessageComponentType::Verification, QString(), {}};
         return newComponents;
     }
 
-    if (event.first->isRedacted()) {
+    if (event->isRedacted()) {
         newComponents += MessageComponent{MessageComponentType::Text, QString(), {}};
         return newComponents;
     }
@@ -476,7 +455,7 @@ QList<MessageComponent> MessageContentModel::messageContentComponents(bool isEdi
     if (isEditing) {
         newComponents += MessageComponent{MessageComponentType::ChatBar, QString(), {}};
     } else {
-        newComponents.append(componentsForType(MessageComponentType::typeForEvent(*event.first)));
+        newComponents.append(componentsForType(MessageComponentType::typeForEvent(*event)));
     }
 
     if (m_room->urlPreviewEnabled()) {
@@ -484,7 +463,7 @@ QList<MessageComponent> MessageContentModel::messageContentComponents(bool isEdi
     }
 
     // If the event is already threaded the ThreadModel will handle displaying a chat bar.
-    if (isThreading && roomMessageEvent && roomMessageEvent->isThreaded()) {
+    if (isThreading && !EventHandler::isThreaded(event)) {
         newComponents += MessageComponent{MessageComponentType::ChatBar, QString(), {}};
     }
 
@@ -494,15 +473,11 @@ QList<MessageComponent> MessageContentModel::messageContentComponents(bool isEdi
 void MessageContentModel::updateReplyModel()
 {
     const auto event = m_room->getEvent(m_eventId);
-    if (event.first == nullptr || m_isReply) {
+    if (event == nullptr || m_isReply) {
         return;
     }
 
-    const auto roomMessageEvent = eventCast<const Quotient::RoomMessageEvent>(event.first);
-    if (roomMessageEvent == nullptr) {
-        return;
-    }
-    if (!roomMessageEvent->isReply() || (roomMessageEvent->isThreaded() && NeoChatConfig::self()->threads())) {
+    if (!EventHandler::hasReply(event) || (EventHandler::isThreaded(event) && NeoChatConfig::self()->threads())) {
         if (m_replyModel) {
             delete m_replyModel;
         }
@@ -513,7 +488,7 @@ void MessageContentModel::updateReplyModel()
         return;
     }
 
-    m_replyModel = new MessageContentModel(m_room, roomMessageEvent->replyEventId(), true, false, this);
+    m_replyModel = new MessageContentModel(m_room, EventHandler::replyId(event), true, false, this);
 
     connect(m_replyModel, &MessageContentModel::eventUpdated, this, [this]() {
         Q_EMIT dataChanged(index(0), index(0), {ReplyAuthorRole});
@@ -523,13 +498,13 @@ void MessageContentModel::updateReplyModel()
 QList<MessageComponent> MessageContentModel::componentsForType(MessageComponentType::Type type)
 {
     const auto event = m_room->getEvent(m_eventId);
-    if (event.first == nullptr) {
+    if (event == nullptr) {
         return {};
     }
 
     switch (type) {
     case MessageComponentType::Text: {
-        const auto roomMessageEvent = eventCast<const Quotient::RoomMessageEvent>(event.first);
+        const auto roomMessageEvent = eventCast<const Quotient::RoomMessageEvent>(event);
         auto body = EventHandler::rawMessageBody(*roomMessageEvent);
         return TextHandler().textComponents(body,
                                             EventHandler::messageBodyInputFormat(*roomMessageEvent),
@@ -540,11 +515,11 @@ QList<MessageComponent> MessageContentModel::componentsForType(MessageComponentT
     case MessageComponentType::File: {
         QList<MessageComponent> components;
         components += MessageComponent{MessageComponentType::File, QString(), {}};
-        const auto roomMessageEvent = eventCast<const Quotient::RoomMessageEvent>(event.first);
+        const auto roomMessageEvent = eventCast<const Quotient::RoomMessageEvent>(event);
 
         if (m_emptyItinerary) {
             if (!m_isReply) {
-                auto fileTransferInfo = m_room->cachedFileTransferInfo(event.first);
+                auto fileTransferInfo = m_room->cachedFileTransferInfo(event);
 
 #ifndef Q_OS_ANDROID
                 Q_ASSERT(roomMessageEvent->content() != nullptr && roomMessageEvent->has<EventContent::FileContent>());
@@ -592,8 +567,8 @@ QList<MessageComponent> MessageContentModel::componentsForType(MessageComponentT
     case MessageComponentType::Image:
     case MessageComponentType::Audio:
     case MessageComponentType::Video: {
-        if (!event.first->is<StickerEvent>()) {
-            const auto roomMessageEvent = eventCast<const Quotient::RoomMessageEvent>(event.first);
+        if (!event->is<StickerEvent>()) {
+            const auto roomMessageEvent = eventCast<const Quotient::RoomMessageEvent>(event);
             const auto fileContent = roomMessageEvent->get<EventContent::FileContentBase>();
             if (fileContent != nullptr) {
                 const auto fileInfo = fileContent->commonInfo();
@@ -612,7 +587,6 @@ QList<MessageComponent> MessageContentModel::componentsForType(MessageComponentT
             }
         }
     }
-        [[fallthrough]];
     default:
         return {MessageComponent{type, QString(), {}}};
     }
@@ -686,13 +660,13 @@ void MessageContentModel::closeLinkPreview(int row)
 void MessageContentModel::updateItineraryModel()
 {
     const auto event = m_room->getEvent(m_eventId);
-    if (m_room == nullptr || event.first == nullptr) {
+    if (m_room == nullptr || event == nullptr) {
         return;
     }
 
-    if (auto roomMessageEvent = eventCast<const Quotient::RoomMessageEvent>(event.first)) {
+    if (auto roomMessageEvent = eventCast<const Quotient::RoomMessageEvent>(event)) {
         if (roomMessageEvent->has<EventContent::FileContent>()) {
-            auto filePath = m_room->cachedFileTransferInfo(event.first).localPath;
+            auto filePath = m_room->cachedFileTransferInfo(event).localPath;
             if (filePath.isEmpty() && m_itineraryModel != nullptr) {
                 delete m_itineraryModel;
                 m_itineraryModel = nullptr;

src/models/messagecontentmodel.h

@@ -31,14 +31,6 @@ class MessageContentModel : public QAbstractListModel
     Q_PROPERTY(bool showAuthor READ showAuthor WRITE setShowAuthor NOTIFY showAuthorChanged)
 
 public:
-    enum MessageState {
-        Unknown, /**< The message state is unknown. */
-        Pending, /**< The message is a new pending message which the server has not yet acknowledged. */
-        Available, /**< The message is available and acknowledged by the server. */
-        UnAvailable, /**< The message can't be retrieved either because it doesn't exist or is blocked. */
-    };
-    Q_ENUM(MessageState)
-
     /**
      * @brief Defines the model roles.
      */
@@ -106,6 +98,7 @@ public:
 
 Q_SIGNALS:
     void showAuthorChanged();
+    void eventUnavailable();
     void eventUpdated();
 
 private:
@@ -114,9 +107,10 @@ private:
     QString m_eventSenderId;
     std::unique_ptr<NeochatRoomMember> m_eventSenderObject = nullptr;
 
-    MessageState m_currentState = Unknown;
+    bool m_isPending;
     bool m_showAuthor = true;
     bool m_isReply;
+    bool m_notFound = false;
 
     void initializeModel();
     void initializeEvent();

src/models/messageeventmodel.cpp

@@ -160,21 +160,12 @@ void MessageEventModel::setRoom(NeoChatRoom *room)
                 refreshLastUserEvents(i);
             }
         });
-#if Quotient_VERSION_MINOR > 9 || (Quotient_VERSION_MINOR == 9 && Quotient_VERSION_PATCH > 0)
-        connect(m_currentRoom, &Room::pendingEventAdded, this, [this](const Quotient::RoomEvent *event) {
-            m_initialized = true;
-            createEventObjects(event, true);
-            beginInsertRows({}, 0, 0);
-            endInsertRows();
-        });
-#else
         connect(m_currentRoom, &Room::pendingEventAboutToAdd, this, [this](Quotient::RoomEvent *event) {
             m_initialized = true;
-            createEventObjects(event, true);
+            createEventObjects(event);
             beginInsertRows({}, 0, 0);
         });
         connect(m_currentRoom, &Room::pendingEventAdded, this, &MessageEventModel::endInsertRows);
-#endif
         connect(m_currentRoom, &Room::pendingEventAboutToMerge, this, [this](RoomEvent *, int i) {
             Q_EMIT dataChanged(index(i, 0), index(i, 0), {IsPendingRole});
             if (i == 0) {
@@ -501,8 +492,7 @@ QVariant MessageEventModel::data(const QModelIndex &idx, int role) const
             return EventStatus::Hidden;
         }
 
-        auto roomMessageEvent = eventCast<const RoomMessageEvent>(&evt);
-        if (roomMessageEvent && roomMessageEvent->isThreaded() && roomMessageEvent->threadRootEventId() != evt.id() && NeoChatConfig::threads()) {
+        if (EventHandler::isThreaded(&evt) && EventHandler::threadRoot(&evt) != EventHandler::id(&evt) && NeoChatConfig::threads()) {
             return EventStatus::Hidden;
         }
 
@@ -510,12 +500,13 @@ QVariant MessageEventModel::data(const QModelIndex &idx, int role) const
     }
 
     if (role == EventIdRole) {
-        return evt.displayId();
+        return EventHandler::id(&evt);
     }
 
     if (role == ProgressInfoRole) {
         if (auto e = eventCast<const RoomMessageEvent>(&evt)) {
-            if (e->has<EventContent::FileContent>()) {
+            if (e->has<EventContent::FileContent>() || e->has<EventContent::ImageContent>() || e->has<EventContent::VideoContent>()
+                || e->has<EventContent::AudioContent>()) {
                 return QVariant::fromValue(m_currentRoom->cachedFileTransferInfo(&evt));
             }
         }
@@ -535,18 +526,11 @@ QVariant MessageEventModel::data(const QModelIndex &idx, int role) const
     }
 
     if (role == IsThreadedRole) {
-        if (auto roomMessageEvent = eventCast<const RoomMessageEvent>(&evt)) {
-            return roomMessageEvent->isThreaded();
-        }
-        return {};
+        return EventHandler::isThreaded(&evt);
     }
 
     if (role == ThreadRootRole) {
-        auto roomMessageEvent = eventCast<const RoomMessageEvent>(&evt);
-        if (roomMessageEvent && roomMessageEvent->isThreaded()) {
-            return roomMessageEvent->threadRootEventId();
-        }
-        return {};
+        return EventHandler::threadRoot(&evt);
     }
 
     if (role == ShowSectionRole) {
@@ -635,7 +619,7 @@ int MessageEventModel::eventIdToRow(const QString &eventID) const
     return it - m_currentRoom->messageEvents().rbegin() + timelineBaseIndex();
 }
 
-void MessageEventModel::createEventObjects(const Quotient::RoomEvent *event, bool isPending)
+void MessageEventModel::createEventObjects(const Quotient::RoomEvent *event)
 {
     if (event == nullptr) {
         return;
@@ -658,14 +642,12 @@ void MessageEventModel::createEventObjects(const Quotient::RoomEvent *event, boo
 
     if (!m_contentModels.contains(eventId) && !m_contentModels.contains(event->transactionId())) {
         if (!event->isStateEvent() || event->matrixType() == QStringLiteral("org.matrix.msc3672.beacon_info")) {
-            m_contentModels[eventId] = std::unique_ptr<MessageContentModel>(new MessageContentModel(m_currentRoom, eventId, false, isPending));
+            m_contentModels[eventId] = std::unique_ptr<MessageContentModel>(new MessageContentModel(m_currentRoom, eventId));
         }
     }
 
-    const auto roomMessageEvent = eventCast<const Quotient::RoomMessageEvent>(event);
-    if (roomMessageEvent && roomMessageEvent->isThreaded() && !m_threadModels.contains(roomMessageEvent->threadRootEventId())) {
-        m_threadModels[roomMessageEvent->threadRootEventId()] =
-            QSharedPointer<ThreadModel>(new ThreadModel(roomMessageEvent->threadRootEventId(), m_currentRoom));
+    if (EventHandler::isThreaded(event) && !m_threadModels.contains(EventHandler::threadRoot(event))) {
+        m_threadModels[EventHandler::threadRoot(event)] = QSharedPointer<ThreadModel>(new ThreadModel(EventHandler::threadRoot(event), m_currentRoom));
     }
 
     // ReadMarkerModel handles updates to add and remove markers, we only need to

src/models/messageeventmodel.h

@@ -136,7 +136,7 @@ private:
     int refreshEventRoles(const QString &eventId, const QList<int> &roles = {});
     void moveReadMarker(const QString &toEventId);
 
-    void createEventObjects(const Quotient::RoomEvent *event, bool isPending = false);
+    void createEventObjects(const Quotient::RoomEvent *event);
     // Hack to ensure that we don't call endInsertRows when we haven't called beginInsertRows
     bool m_initialized = false;
 

src/models/publicroomlistmodel.cpp

@@ -8,23 +8,6 @@
 
 using namespace Quotient;
 
-class NeoChatQueryPublicRoomsJob : public QueryPublicRoomsJob
-{
-public:
-    explicit NeoChatQueryPublicRoomsJob(const QString &server = {},
-                                        std::optional<int> limit = std::nullopt,
-                                        const QString &since = {},
-                                        const std::optional<Filter> &filter = std::nullopt,
-                                        std::optional<bool> includeAllNetworks = std::nullopt,
-                                        const QString &thirdPartyInstanceId = {})
-        : QueryPublicRoomsJob(server, limit, since, filter, includeAllNetworks, thirdPartyInstanceId)
-    {
-        // TODO Remove once we can use libQuotient's job directly
-        // This is to make libQuotient happy about results not having the "chunk" field
-        setExpectedKeys({});
-    }
-};
-
 PublicRoomListModel::PublicRoomListModel(QObject *parent)
     : QAbstractListModel(parent)
 {
@@ -170,8 +153,6 @@ void PublicRoomListModel::next(int limit)
     if (m_connection == nullptr || limit < 1) {
         return;
     }
-    m_redirectedText.clear();
-    Q_EMIT redirectedChanged();
 
     if (job) {
         qCDebug(PublicRoomList) << "Other job running, ignore";
@@ -182,7 +163,7 @@ void PublicRoomListModel::next(int limit)
     if (m_showOnlySpaces) {
         roomTypes += QLatin1String("m.space");
     }
-    job = m_connection->callApi<NeoChatQueryPublicRoomsJob>(m_server, limit, nextBatch, QueryPublicRoomsJob::Filter{m_searchText, roomTypes});
+    job = m_connection->callApi<QueryPublicRoomsJob>(m_server, limit, nextBatch, QueryPublicRoomsJob::Filter{m_searchText, roomTypes});
     Q_EMIT searchingChanged();
 
     connect(job, &BaseJob::finished, this, [this] {
@@ -200,9 +181,6 @@ void PublicRoomListModel::next(int limit)
             this->beginInsertRows({}, rooms.count(), rooms.count() + job->chunk().count() - 1);
             rooms.append(job->chunk());
             this->endInsertRows();
-        } else if (job->error() == BaseJob::ContentAccessError) {
-            m_redirectedText = job->jsonData()[u"error"_s].toString();
-            Q_EMIT redirectedChanged();
         }
 
         this->job = nullptr;
@@ -324,9 +302,4 @@ bool PublicRoomListModel::searching() const
     return job != nullptr;
 }
 
-QString PublicRoomListModel::redirectedText() const
-{
-    return m_redirectedText;
-}
-
 #include "moc_publicroomlistmodel.cpp"

src/models/publicroomlistmodel.h

@@ -52,11 +52,6 @@ class PublicRoomListModel : public QAbstractListModel
      */
     Q_PROPERTY(bool searching READ searching NOTIFY searchingChanged)
 
-    /**
-     * @brief The text returned by the server after redirection
-     */
-    Q_PROPERTY(QString redirectedText READ redirectedText NOTIFY redirectedChanged)
-
 public:
     /**
      * @brief Defines the model roles.
@@ -118,8 +113,6 @@ public:
      */
     Q_INVOKABLE void search(int limit = 50);
 
-    QString redirectedText() const;
-
 private:
     QPointer<NeoChatConnection> m_connection = nullptr;
     QString m_server;
@@ -142,7 +135,6 @@ private:
     QList<Quotient::PublicRoomsChunk> rooms;
 
     Quotient::QueryPublicRoomsJob *job = nullptr;
-    QString m_redirectedText;
 
 Q_SIGNALS:
     void connectionChanged();
@@ -150,5 +142,4 @@ Q_SIGNALS:
     void searchTextChanged();
     void showOnlySpacesChanged();
     void searchingChanged();
-    void redirectedChanged();
 };

src/models/roomlistmodel.cpp

@@ -129,7 +129,7 @@ void RoomListModel::connectRoomSignals(NeoChatRoom *room)
         refresh(room);
     });
     connect(room, &Room::addedMessages, this, [this, room] {
-        refresh(room, {SubtitleTextRole});
+        refresh(room, {SubtitleTextRole, LastActiveTimeRole});
     });
     connect(room, &Room::pendingEventMerged, this, [this, room] {
         refresh(room, {SubtitleTextRole});
@@ -229,6 +229,9 @@ QVariant RoomListModel::data(const QModelIndex &index, int role) const
     if (role == HasHighlightNotificationsRole) {
         return room->highlightCount() > 0 && room->contextAwareNotificationCount() > 0;
     }
+    if (role == LastActiveTimeRole) {
+        return room->lastActiveTime();
+    }
     if (role == JoinStateRole) {
         if (!room->successorId().isEmpty()) {
             return QStringLiteral("upgraded");
@@ -288,6 +291,7 @@ QHash<int, QByteArray> RoomListModel::roleNames() const
     roles[CategoryRole] = "category";
     roles[ContextNotificationCountRole] = "contextNotificationCount";
     roles[HasHighlightNotificationsRole] = "hasHighlightNotifications";
+    roles[LastActiveTimeRole] = "lastActiveTime";
     roles[JoinStateRole] = "joinState";
     roles[CurrentRoomRole] = "currentRoom";
     roles[SubtitleTextRole] = "subtitleText";

src/models/roomlistmodel.h

@@ -43,6 +43,7 @@ public:
         CategoryRole, /**< The room category, e.g favourite. */
         ContextNotificationCountRole, /**< The context aware notification count for the room. */
         HasHighlightNotificationsRole, /**< Whether there are any highlight notifications. */
+        LastActiveTimeRole, /**< The timestamp of the last event sent in the room. */
         JoinStateRole, /**< The local user's join state in the room. */
         CurrentRoomRole, /**< The room object for the room. */
         SubtitleTextRole, /**< The text to show as the room subtitle. */

src/models/roomtreemodel.cpp

@@ -176,7 +176,7 @@ void RoomTreeModel::connectRoomSignals(NeoChatRoom *room)
         refreshRoomRoles(room);
     });
     connect(room, &Room::addedMessages, this, [this, room] {
-        refreshRoomRoles(room, {SubtitleTextRole});
+        refreshRoomRoles(room, {SubtitleTextRole, LastActiveTimeRole});
     });
     connect(room, &Room::pendingEventMerged, this, [this, room] {
         refreshRoomRoles(room, {SubtitleTextRole});
@@ -274,6 +274,7 @@ QHash<int, QByteArray> RoomTreeModel::roleNames() const
     roles[CategoryRole] = "category";
     roles[ContextNotificationCountRole] = "contextNotificationCount";
     roles[HasHighlightNotificationsRole] = "hasHighlightNotifications";
+    roles[LastActiveTimeRole] = "lastActiveTime";
     roles[JoinStateRole] = "joinState";
     roles[CurrentRoomRole] = "currentRoom";
     roles[SubtitleTextRole] = "subtitleText";
@@ -283,6 +284,8 @@ QHash<int, QByteArray> RoomTreeModel::roleNames() const
     roles[IsDirectChat] = "isDirectChat";
     roles[DelegateTypeRole] = "delegateType";
     roles[IconRole] = "icon";
+    roles[AttentionRole] = "attention";
+    roles[FavouriteRole] = "favourite";
     roles[RoomTypeRole] = "roomType";
     return roles;
 }
@@ -338,6 +341,9 @@ QVariant RoomTreeModel::data(const QModelIndex &index, int role) const
     if (role == HasHighlightNotificationsRole) {
         return room->highlightCount() > 0 && room->contextAwareNotificationCount() > 0;
     }
+    if (role == LastActiveTimeRole) {
+        return room->lastActiveTime();
+    }
     if (role == JoinStateRole) {
         if (!room->successorId().isEmpty()) {
             return QStringLiteral("upgraded");
@@ -374,6 +380,12 @@ QVariant RoomTreeModel::data(const QModelIndex &index, int role) const
     if (role == DelegateTypeRole) {
         return QStringLiteral("normal");
     }
+    if (role == AttentionRole) {
+        return room->notificationCount() + room->highlightCount() > 0;
+    }
+    if (role == FavouriteRole) {
+        return room->isFavourite();
+    }
     if (role == RoomTypeRole) {
         if (room->creation()) {
             return room->creation()->contentPart<QString>("type"_L1);

src/models/roomtreemodel.h

@@ -36,6 +36,7 @@ public:
         CategoryRole, /**< The room category, e.g favourite. */
         ContextNotificationCountRole, /**< The context aware notification count for the room. */
         HasHighlightNotificationsRole, /**< Whether there are any highlight notifications. */
+        LastActiveTimeRole, /**< The timestamp of the last event sent in the room. */
         JoinStateRole, /**< The local user's join state in the room. */
         CurrentRoomRole, /**< The room object for the room. */
         SubtitleTextRole, /**< The text to show as the room subtitle. */
@@ -47,6 +48,8 @@ public:
         IsDirectChat, /**< Whether this room is a direct chat. */
         DelegateTypeRole,
         IconRole,
+        AttentionRole, /**< Whether there are any notifications. */
+        FavouriteRole, /**< Whether the room is favourited. */
         RoomTypeRole, /**< The room's type. */
     };
     Q_ENUM(EventRoles)

src/models/searchmodel.cpp

@@ -108,17 +108,11 @@ QVariant SearchModel::data(const QModelIndex &index, int role) const
     case HighlightRole:
         return EventHandler::isHighlighted(m_room, &event);
     case EventIdRole:
-        return event.displayId();
+        return EventHandler::id(&event);
     case IsThreadedRole:
-        if (auto roomMessageEvent = eventCast<const RoomMessageEvent>(&event)) {
-            return roomMessageEvent->isThreaded();
-        }
-        return {};
+        return EventHandler::isThreaded(&event);
     case ThreadRootRole:
-        if (auto roomMessageEvent = eventCast<const RoomMessageEvent>(&event); roomMessageEvent->isThreaded()) {
-            return roomMessageEvent->threadRootEventId();
-        }
-        return {};
+        return EventHandler::threadRoot(&event);
     case ContentModelRole: {
         if (!event.isStateEvent()) {
             return QVariant::fromValue<MessageContentModel *>(new MessageContentModel(m_room, event.id()));

src/models/sortfilterroomtreemodel.cpp

@@ -6,7 +6,6 @@
 
 #include "neochatconfig.h"
 #include "neochatconnection.h"
-#include "neochatroom.h"
 #include "neochatroomtype.h"
 #include "roommanager.h"
 #include "roomtreemodel.h"
@@ -45,49 +44,58 @@ SortFilterRoomTreeModel::SortFilterRoomTreeModel(RoomTreeModel *sourceModel, QOb
 void SortFilterRoomTreeModel::setRoomSortOrder(SortFilterRoomTreeModel::RoomSortOrder sortOrder)
 {
     m_sortOrder = sortOrder;
+    if (sortOrder == SortFilterRoomTreeModel::Alphabetical) {
+        setSortRole(RoomTreeModel::DisplayNameRole);
+    } else if (sortOrder == SortFilterRoomTreeModel::Activity) {
+        setSortRole(RoomTreeModel::LastActiveTimeRole);
+    }
     invalidate();
 }
 
-static const QVector<RoomSortParameter::Parameter> alphabeticalSortPriorities{
+static const QVector<RoomTreeModel::EventRoles> alphabeticalSortPriorities{
     // Does exactly what it says on the tin.
-    RoomSortParameter::AlphabeticalAscending,
+    RoomTreeModel::DisplayNameRole,
 };
 
-static const QVector<RoomSortParameter::Parameter> activitySortPriorities{
-    RoomSortParameter::HasHighlight,
-    RoomSortParameter::MostHighlights,
-    RoomSortParameter::HasUnread,
-    RoomSortParameter::MostUnread,
-    RoomSortParameter::LastActive,
+static const QVector<RoomTreeModel::EventRoles> activitySortPriorities{
+    // Anything useful at the top, quiet rooms at the bottom
+    RoomTreeModel::AttentionRole,
+    // Organize by highlights, notifications, unread favorites, all other unread, in that order
+    RoomTreeModel::HasHighlightNotificationsRole,
+    RoomTreeModel::ContextNotificationCountRole,
+    RoomTreeModel::FavouriteRole,
+    // Finally sort by last activity time
+    RoomTreeModel::LastActiveTimeRole,
 };
 
-static const QVector<RoomSortParameter::Parameter> lastMessageSortPriorities{
-    RoomSortParameter::LastActive,
-};
+bool SortFilterRoomTreeModel::roleCmp(const QVariant &sortLeft, const QVariant &sortRight) const
+{
+    switch (sortLeft.typeId()) {
+    case QMetaType::Bool:
+        return (sortLeft == sortRight) ? false : sortLeft.toBool();
+    case QMetaType::QString:
+        return sortLeft.toString() < sortRight.toString();
+    case QMetaType::Int:
+        return sortLeft.toInt() > sortRight.toInt();
+    case QMetaType::QDateTime:
+        return sortLeft.toDateTime() > sortRight.toDateTime();
+    default:
+        return false;
+    }
+}
 
-bool SortFilterRoomTreeModel::prioritiesCmp(const QVector<RoomSortParameter::Parameter> &priorities,
+bool SortFilterRoomTreeModel::prioritiesCmp(const QVector<RoomTreeModel::EventRoles> &priorities,
                                             const QModelIndex &source_left,
                                             const QModelIndex &source_right) const
 {
-    const auto treeModel = dynamic_cast<RoomTreeModel *>(sourceModel());
-    if (treeModel == nullptr) {
-        return false;
-    }
-
-    const auto leftRoom = dynamic_cast<NeoChatRoom *>(treeModel->connection()->room(source_left.data(RoomTreeModel::RoomIdRole).toString()));
-    const auto rightRoom = dynamic_cast<NeoChatRoom *>(treeModel->connection()->room(source_right.data(RoomTreeModel::RoomIdRole).toString()));
-    if (leftRoom == nullptr || rightRoom == nullptr) {
-        return false;
-    }
-
-    for (auto sortRole : priorities) {
-        auto result = RoomSortParameter::compareParameter(sortRole, leftRoom, rightRoom);
-
-        if (result != 0) {
-            return result > 0;
+    for (RoomTreeModel::EventRoles sortRole : priorities) {
+        const auto sortLeft = sourceModel()->data(source_left, sortRole);
+        const auto sortRight = sourceModel()->data(source_right, sortRole);
+        if (sortLeft != sortRight) {
+            return roleCmp(sortLeft, sortRight);
         }
     }
-    return false;
+    return QSortFilterProxyModel::lessThan(source_left, source_right);
 }
 
 bool SortFilterRoomTreeModel::lessThan(const QModelIndex &source_left, const QModelIndex &source_right) const
@@ -102,9 +110,8 @@ bool SortFilterRoomTreeModel::lessThan(const QModelIndex &source_left, const QMo
         return prioritiesCmp(alphabeticalSortPriorities, source_left, source_right);
     case SortFilterRoomTreeModel::Activity:
         return prioritiesCmp(activitySortPriorities, source_left, source_right);
-    case SortFilterRoomTreeModel::LastMessage:
-        return prioritiesCmp(lastMessageSortPriorities, source_left, source_right);
     }
+
     return QSortFilterProxyModel::lessThan(source_left, source_right);
 }
 

src/models/sortfilterroomtreemodel.h

@@ -7,7 +7,6 @@
 #include <QQmlEngine>
 #include <QSortFilterProxyModel>
 
-#include "enums/roomsortparameter.h"
 #include "models/roomtreemodel.h"
 
 /**
@@ -54,7 +53,6 @@ public:
     enum RoomSortOrder {
         Alphabetical,
         Activity,
-        LastMessage,
     };
     Q_ENUM(RoomSortOrder)
 
@@ -106,5 +104,6 @@ private:
     QString m_filterText;
     QString m_activeSpaceId;
 
-    bool prioritiesCmp(const QVector<RoomSortParameter::Parameter> &priorities, const QModelIndex &left, const QModelIndex &right) const;
+    bool roleCmp(const QVariant &left, const QVariant &right) const;
+    bool prioritiesCmp(const QVector<RoomTreeModel::EventRoles> &priorities, const QModelIndex &left, const QModelIndex &right) const;
 };

src/models/threadmodel.cpp

@@ -25,7 +25,7 @@ ThreadModel::ThreadModel(const QString &threadRootId, NeoChatRoom *room)
 
     connect(room, &Quotient::Room::pendingEventAboutToAdd, this, [this](Quotient::RoomEvent *event) {
         if (auto roomEvent = eventCast<const Quotient::RoomMessageEvent>(event)) {
-            if (roomEvent->isThreaded() && roomEvent->threadRootEventId() == m_threadRootId) {
+            if (EventHandler::isThreaded(roomEvent) && EventHandler::threadRoot(roomEvent) == m_threadRootId) {
                 addNewEvent(event);
                 addModels();
             }
@@ -34,7 +34,7 @@ ThreadModel::ThreadModel(const QString &threadRootId, NeoChatRoom *room)
     connect(room, &Quotient::Room::aboutToAddNewMessages, this, [this](Quotient::RoomEventsRange events) {
         for (const auto &event : events) {
             if (auto roomEvent = eventCast<const Quotient::RoomMessageEvent>(event)) {
-                if (roomEvent->isThreaded() && roomEvent->threadRootEventId() == m_threadRootId) {
+                if (EventHandler::isThreaded(roomEvent) && EventHandler::threadRoot(roomEvent) == m_threadRootId) {
                     addNewEvent(roomEvent);
                 }
             }

src/neochat.notifyrc

@@ -289,6 +289,7 @@ Name[ta]=பகிர்
 Name[tr]=Paylaş
 Name[uk]=Оприлюднення
 Name[x-test]=xxSharexx
+Name[zh_CN]=分享
 Name[zh_TW]=分享
 Comment=The result of sharing a piece of content
 Comment[ar]=نتيجة مشاركة محتوى
@@ -320,5 +321,6 @@ Comment[ta]=எதையோ பகிர்ந்த‍தன் விளைவ
 Comment[tr]=Bir parça içerik paylaşımının sonucu
 Comment[uk]=Результат оприлюднення даних
 Comment[x-test]=xxThe result of sharing a piece of contentxx
+Comment[zh_CN]=分享一个内容得到的结果
 Comment[zh_TW]=分享一份內容之後的結果
 Action=Popup

src/neochatconnection.cpp

@@ -109,10 +109,6 @@ void NeoChatConnection::connectSignals()
             Q_EMIT homeHaveHighlightNotificationsChanged();
         });
     });
-    connect(this, &NeoChatConnection::invitedRoom, this, [this](Quotient::Room *room) {
-        auto r = dynamic_cast<NeoChatRoom *>(room);
-        connect(r, &NeoChatRoom::showInviteNotification, this, &NeoChatConnection::showInviteNotification);
-    });
     connect(this, &NeoChatConnection::leftRoom, this, [this](Room *room, Room *prev) {
         Q_UNUSED(room)
         if (prev && prev->isDirectChat()) {

src/neochatconnection.h

@@ -205,11 +205,6 @@ Q_SIGNALS:
      */
     void errorOccured(const QString &error);
 
-    /**
-     * @brief Request a notification be shown for an invite to this room.
-     */
-    void showInviteNotification(NeoChatRoom *room);
-
 private:
     bool m_isOnline = true;
     void setIsOnline(bool isOnline);

src/neochatroom.cpp

@@ -10,8 +10,6 @@
 #include <QTemporaryFile>
 
 #include <Quotient/events/eventcontent.h>
-#include <Quotient/events/eventrelation.h>
-#include <Quotient/events/roommessageevent.h>
 #include <Quotient/jobs/basejob.h>
 #include <Quotient/quotient_common.h>
 #include <qcoro/qcorosignal.h>
@@ -126,9 +124,6 @@ NeoChatRoom::NeoChatRoom(Connection *connection, QString roomId, JoinState joinS
             updatePushNotificationState(QStringLiteral("m.push_rules"));
 
             Q_EMIT canEncryptRoomChanged();
-            if (this->joinState() == JoinState::Invite) {
-                Q_EMIT showInviteNotification(this);
-            }
         },
         Qt::SingleShotConnection);
     connect(this, &Room::changed, this, [this] {
@@ -484,6 +479,119 @@ QString msgTypeToString(MessageEventType msgType)
     }
 }
 
+void NeoChatRoom::postMessage(const QString &rawText,
+                              const QString &text,
+                              MessageEventType type,
+                              const QString &replyEventId,
+                              const QString &relateToEventId,
+                              const QString &threadRootId,
+                              const QString &fallbackId)
+{
+    postHtmlMessage(rawText, text, type, replyEventId, relateToEventId, threadRootId, fallbackId);
+}
+
+void NeoChatRoom::postHtmlMessage(const QString &text,
+                                  const QString &html,
+                                  MessageEventType type,
+                                  const QString &replyEventId,
+                                  const QString &relateToEventId,
+                                  const QString &threadRootId,
+                                  const QString &fallbackId)
+{
+    bool isReply = !replyEventId.isEmpty();
+    bool isEdit = !relateToEventId.isEmpty();
+    bool isThread = !threadRootId.isEmpty();
+    const auto replyIt = findInTimeline(replyEventId);
+    if (replyIt == historyEdge()) {
+        isReply = false;
+    }
+
+    if (isThread) {
+        bool isFallingBack = !fallbackId.isEmpty();
+        QString replyEventId = isFallingBack ? fallbackId : QString();
+        if (isReply) {
+            isFallingBack = false;
+            replyEventId = EventHandler::id(replyIt->get());
+        }
+
+        // If we are not replying and there is no fallback ID it means a new thread
+        // is being created.
+        if (!isFallingBack && !isReply) {
+            isFallingBack = true;
+            replyEventId = threadRootId;
+        }
+
+        // clang-format off
+        QJsonObject json{
+          {"msgtype"_ls, msgTypeToString(type)},
+          {"body"_ls, text},
+          {"format"_ls, "org.matrix.custom.html"_ls},
+          {"m.relates_to"_ls,
+            QJsonObject {
+              {"rel_type"_ls, "m.thread"_ls},
+              {"event_id"_ls, threadRootId},
+              {"is_falling_back"_ls, isFallingBack},
+              {"m.in_reply_to"_ls,
+                QJsonObject {
+                  {"event_id"_ls, replyEventId}
+                }
+              }
+            }
+          },
+          {"formatted_body"_ls, html}
+        };
+        // clang-format on
+
+        postJson("m.room.message"_ls, json);
+        return;
+    }
+
+    if (isEdit) {
+        QJsonObject json{
+            {"type"_ls, "m.room.message"_ls},
+            {"msgtype"_ls, msgTypeToString(type)},
+            {"body"_ls, "* %1"_ls.arg(text)},
+            {"format"_ls, "org.matrix.custom.html"_ls},
+            {"formatted_body"_ls, html},
+            {"m.new_content"_ls,
+             QJsonObject{{"body"_ls, text}, {"msgtype"_ls, msgTypeToString(type)}, {"format"_ls, "org.matrix.custom.html"_ls}, {"formatted_body"_ls, html}}},
+            {"m.relates_to"_ls, QJsonObject{{"rel_type"_ls, "m.replace"_ls}, {"event_id"_ls, relateToEventId}}}};
+
+        postJson("m.room.message"_ls, json);
+        return;
+    }
+
+    if (isReply) {
+        const auto &replyEvt = **replyIt;
+
+        // clang-format off
+        QJsonObject json{
+          {"msgtype"_ls, msgTypeToString(type)},
+          {"body"_ls, "> <%1> %2\n\n%3"_ls.arg(replyEvt.senderId(), EventHandler::plainBody(this, &replyEvt), text)},
+          {"format"_ls, "org.matrix.custom.html"_ls},
+          {"m.relates_to"_ls,
+            QJsonObject {
+              {"m.in_reply_to"_ls,
+                QJsonObject {
+                  {"event_id"_ls, replyEventId}
+                }
+              }
+            }
+          },
+          {"formatted_body"_ls,
+              "<mx-reply><blockquote><a href=\"https://matrix.to/#/%1/%2\">In reply to</a> <a href=\"https://matrix.to/#/%3\">%4</a><br>%5</blockquote></mx-reply>%6"_ls.arg(id(), replyEventId, replyEvt.senderId(), replyEvt.senderId(), EventHandler::richBody(this, &replyEvt), html)
+          }
+        };
+        // clang-format on
+
+        postJson("m.room.message"_ls, json);
+
+        return;
+    }
+
+    Room::postHtmlMessage(text, html, type);
+}
+
 void NeoChatRoom::toggleReaction(const QString &eventId, const QString &reaction)
 {
     if (eventId.isEmpty() || reaction.isEmpty()) {
@@ -639,7 +747,10 @@ QList<QString> NeoChatRoom::restrictedIds() const
 
 QString NeoChatRoom::historyVisibility() const
 {
-    return currentState().get("m.room.history_visibility"_ls)->contentJson()["history_visibility"_ls].toString();
+    if (auto stateEvent = currentState().get("m.room.history_visibility"_ls)) {
+        return stateEvent->contentJson()["history_visibility"_ls].toString();
+    }
+    return {};
 }
 
 void NeoChatRoom::setHistoryVisibility(const QString &historyVisibilityRule)
@@ -1638,31 +1749,25 @@ void NeoChatRoom::downloadEventFromServer(const QString &eventId)
     });
 }
 
-std::pair<const Quotient::RoomEvent *, bool> NeoChatRoom::getEvent(const QString &eventId) const
+const RoomEvent *NeoChatRoom::getEvent(const QString &eventId) const
 {
     if (eventId.isEmpty()) {
-        return {};
+        return nullptr;
     }
     const auto timelineIt = findInTimeline(eventId);
     if (timelineIt != historyEdge()) {
-        return std::make_pair(timelineIt->get(), false);
+        return timelineIt->get();
     }
 
-    auto pendingIt = findPendingEvent(eventId);
+    const auto pendingIt = findPendingEvent(eventId);
     if (pendingIt != pendingEvents().end()) {
-        return std::make_pair(pendingIt->event(), true);
-    }
-    // findPendingEvent() searches by transaction ID, we also need to check event ID.
-    for (const auto &event : pendingEvents()) {
-        if (event->id() == eventId || event->transactionId() == eventId) {
-            return std::make_pair(event.event(), true);
-        }
+        return pendingIt->event();
     }
 
     auto extraIt = std::find_if(m_extraEvents.begin(), m_extraEvents.end(), [eventId](const Quotient::event_ptr_tt<Quotient::RoomEvent> &event) {
         return event->id() == eventId;
     });
-    return std::make_pair(extraIt != m_extraEvents.end() ? extraIt->get() : nullptr, false);
+    return extraIt != m_extraEvents.end() ? extraIt->get() : nullptr;
 }
 
 const RoomEvent *NeoChatRoom::getReplyForEvent(const RoomEvent &event) const

src/neochatroom.h

@@ -570,7 +570,7 @@ public:
      *
      * The result will be nullptr if not found so needs to be managed.
      */
-    std::pair<const Quotient::RoomEvent *, bool> getEvent(const QString &eventId) const;
+    const Quotient::RoomEvent *getEvent(const QString &eventId) const;
 
     /**
      * @brief Returns the event that is being replied to. This includes events that were manually loaded using NeoChatRoom::loadReply.
@@ -654,14 +654,6 @@ Q_SIGNALS:
      */
     void showMessage(MessageType::Type messageType, const QString &message);
 
-    /**
-     * @brief Request a notification be shown for an invite to this room.
-     *
-     * @note This may later be blocked if there are any rules on where invites can
-     * come from, but this is not NeoChatRoom's responsibility.
-     */
-    void showInviteNotification(NeoChatRoom *room);
-
 public Q_SLOTS:
     /**
      * @brief Upload a file to the matrix server and post the file to the room.
@@ -691,6 +683,40 @@ public Q_SLOTS:
      */
     void sendTypingNotification(bool isTyping);
 
+    /**
+     * @brief Send a message to the room.
+     *
+     * @param rawText the text as it was typed.
+     * @param cleanedText the text marked up as html.
+     * @param type the type of message being sent.
+     * @param replyEventId the id of the message being replied to if a reply.
+     * @param relateToEventId the id of the message being edited if an edit.
+     */
+    void postMessage(const QString &rawText,
+                     const QString &cleanedText,
+                     Quotient::MessageEventType type = Quotient::MessageEventType::Text,
+                     const QString &replyEventId = QString(),
+                     const QString &relateToEventId = QString(),
+                     const QString &threadRootId = QString(),
+                     const QString &fallbackId = QString());
+
+    /**
+     * @brief Send an html message to the room.
+     *
+     * @param text the text as it was typed.
+     * @param html the text marked up as html.
+     * @param type the type of message being sent.
+     * @param replyEventId the id of the message being replied to if a reply.
+     * @param relateToEventId the id of the message being edited if an edit.
+     */
+    void postHtmlMessage(const QString &text,
+                         const QString &html,
+                         Quotient::MessageEventType type = Quotient::MessageEventType::Text,
+                         const QString &replyEventId = QString(),
+                         const QString &relateToEventId = QString(),
+                         const QString &threadRootId = QString(),
+                         const QString &fallbackId = QString());
+
     /**
      * @brief Set the room avatar.
      */

src/neochatroommember.cpp

@@ -161,5 +161,3 @@ QUrl NeochatRoomMember::avatarUrl() const
 
     return m_room->member(m_memberId).avatarUrl();
 }
-
-#include "moc_neochatroommember.cpp"

src/notificationsmanager.cpp

@@ -127,9 +127,8 @@ void NotificationsManager::processNotificationJob(QPointer<NeoChatConnection> co
         }
         auto sender = room->member(notification["event"_ls]["sender"_ls].toString());
 
-        // Don't display notifications for events in invited rooms
-        // This should prevent empty notifications from appearing when they shouldn't
         if (room->joinState() == JoinState::Invite) {
+            postInviteNotification(qobject_cast<NeoChatRoom *>(room));
             continue;
         }
 
@@ -248,9 +247,7 @@ void NotificationsManager::postNotification(NeoChatRoom *room,
         connect(replyAction.get(), &KNotificationReplyAction::replied, this, [room, replyEventId](const QString &text) {
             TextHandler textHandler;
             textHandler.setData(text);
-            auto content = std::make_unique<Quotient::EventContent::TextContent>(textHandler.handleSendText(), u"text/html"_s);
-            EventRelation relatesTo = EventRelation::replyTo(replyEventId);
-            room->post<Quotient::RoomMessageEvent>(text, MessageEventType::Text, std::move(content), relatesTo);
+            room->postMessage(text, textHandler.handleSendText(), RoomMessageEvent::MsgType::Text, replyEventId, QString());
         });
         notification->setReplyAction(std::move(replyAction));
     }

src/plasma-runner-neochat.desktop

@@ -77,7 +77,7 @@ Comment[ru]=Поиск комнат NeoChat
 Comment[sl]=Najdi sobe v NeoChatu
 Comment[sv]=Sök efter rum i NeoChat
 Comment[ta]=நியோச்சாட்டில் அரங்குகளை கண்டுபிடிக்கும்
-Comment[tr]=NeoChat'te odalar bulun
+Comment[tr]=NeoChat’te odalar bulun
 Comment[uk]=Пошук кімнат у NeoChat
 Comment[x-test]=xxFind rooms in NeoChatxx
 Comment[zh_CN]=在 NeoChat 查找聊天室

src/pollhandler.cpp

@@ -168,8 +168,9 @@ void PollHandler::sendPollAnswer(const QString &eventId, const QString &answerId
         ownAnswers.insert(0, answerId);
     }
 
-    const auto &response = room->post<PollResponseEvent>(eventId, ownAnswers);
+    auto response = new PollResponseEvent(eventId, ownAnswers);
     handleAnswer(response->contentJson(), room->localMember().id(), QDateTime::currentDateTime());
+    room->postEvent(response);
 }
 
 bool PollHandler::hasEnded() const

src/purpose/purposeplugin.json

@@ -25,6 +25,7 @@
                 "Name[nl]": "Tobias Fella",
                 "Name[nn]": "Tobias Fella",
                 "Name[pl]": "Tobias Fella",
+                "Name[pt_BR]": "Tobias Fella",
                 "Name[ru]": "Tobias Fella",
                 "Name[sk]": "Tobias Fella",
                 "Name[sl]": "Tobias Fella",
@@ -33,6 +34,7 @@
                 "Name[tr]": "Tobias Fella",
                 "Name[uk]": "Tobias Fella",
                 "Name[x-test]": "xxTobias Fellaxx",
+                "Name[zh_CN]": "Tobias Fella",
                 "Name[zh_TW]": "Tobias Fella"
             }
         ],
@@ -59,6 +61,7 @@
         "Description[nl]": "Delen via NeoChat",
         "Description[nn]": "Del via NeoChat",
         "Description[pl]": "Udostępnij przez NeoChat",
+        "Description[pt_BR]": "Compartilhar via NeoChat",
         "Description[ru]": "Опубликовать в NeoChat",
         "Description[sl]": "Deli prek NeoChat",
         "Description[sv]": "Dela via NeoChat",
@@ -66,8 +69,9 @@
         "Description[tr]": "NeoChat ile Paylaş",
         "Description[uk]": "Оприлюднити за допомогою NeoChat",
         "Description[x-test]": "xxShare via NeoChatxx",
+        "Description[zh_CN]": "通过 NeoChat 分享",
         "Description[zh_TW]": "透過 NeoChat 分享",
-        "Icon": "org.kde.neochat",
+        "Icon": "org.kde.neochat.tray",
         "License": "GPL",
         "Name": "NeoChat",
         "Name[ar]": "نيوتشات",
@@ -93,6 +97,7 @@
         "Name[nl]": "NeoChat",
         "Name[nn]": "NeoChat",
         "Name[pl]": "NeoChat",
+        "Name[pt_BR]": "NeoChat",
         "Name[ru]": "NeoChat",
         "Name[sk]": "NeoChat",
         "Name[sl]": "NeoChat",
@@ -101,6 +106,7 @@
         "Name[tr]": "NeoChat",
         "Name[uk]": "NeoChat",
         "Name[x-test]": "xxNeoChatxx",
+        "Name[zh_CN]": "NeoChat",
         "Name[zh_TW]": "NeoChat",
         "X-Purpose-ActionDisplay": "NeoChat"
     },

src/qml/AccountMenu.qml

@@ -20,7 +20,7 @@ QQC2.Menu {
     margins: Kirigami.Units.smallSpacing
 
     QQC2.MenuItem {
-        text: i18nc("@action:button", "Show QR Code")
+        text: i18nc("@action:button", "Show QR code")
         icon.name: "view-barcode-qr-symbolic"
         onTriggered: {
             let qrMax = Qt.createComponent('org.kde.neochat', 'QrCodeMaximizeComponent').createObject(QQC2.Overlay.overlay, {
@@ -37,7 +37,7 @@ QQC2.Menu {
         }
     }
     QQC2.MenuItem {
-        text: i18n("Edit This Account")
+        text: i18n("Edit this account")
         icon.name: "document-edit"
         onTriggered: pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat.settings', 'AccountEditorPage'), {
             connection: root.connection
@@ -46,7 +46,7 @@ QQC2.Menu {
         })
     }
     QQC2.MenuItem {
-        text: i18n("Notification Settings")
+        text: i18n("Notification settings")
         icon.name: "notifications"
         onTriggered: {
             NeoChatSettingsView.open('notifications');
@@ -60,7 +60,7 @@ QQC2.Menu {
         }
     }
     QQC2.MenuItem {
-        text: i18n("Open Developer Tools")
+        text: i18n("Open developer tools")
         icon.name: "tools"
         visible: NeoChatConfig.developerTools
         onTriggered: pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat.devtools', 'DevtoolsPage'), {
@@ -80,7 +80,7 @@ QQC2.Menu {
         })
     }
     QQC2.MenuItem {
-        text: i18nc("@action:inmenu", "Verify This Device")
+        text: i18nc("@action:inmenu", "Verify this Device")
         icon.name: "security-low"
         onTriggered: root.connection.startSelfVerification()
         enabled: Controller.csSupported

src/qml/ChooseRoomDialog.qml

@@ -23,11 +23,7 @@ SearchPage {
 
     model: RoomManager.sortFilterRoomListModel
     modelDelegate: RoomDelegate {
-        onClicked: {
-            root.chosen(currentRoom.id);
-            root.closeDialog();
-        }
+        onClicked: root.chosen(currentRoom.id)
         connection: root.connection
-        openOnClick: false
     }
 }

src/qml/ContextMenu.qml

@@ -27,17 +27,38 @@ Loader {
     Component {
         id: regularMenu
         QQC2.Menu {
+            QQC2.MenuItem {
+                text: room.isFavourite ? i18n("Remove from Favorites") : i18n("Add to Favorites")
+                icon.name: room.isFavourite ? "bookmark-remove" : "bookmark-new"
+                onTriggered: room.isFavourite ? room.removeTag("m.favourite") : room.addTag("m.favourite", 1.0)
+            }
+
+            QQC2.MenuItem {
+                text: room.isLowPriority ? i18n("Reprioritize") : i18n("Deprioritize")
+                icon.name: room.isLowPriority ? "arrow-up-symbolic" : "arrow-down-symbolic"
+                onTriggered: room.isLowPriority ? room.removeTag("m.lowpriority") : room.addTag("m.lowpriority", 1.0)
+            }
+
             QQC2.MenuItem {
                 text: i18n("Mark as Read")
                 icon.name: "checkmark"
-                enabled: room.notificationCount > 0
                 onTriggered: room.markAllMessagesAsRead()
             }
 
-            QQC2.MenuSeparator {}
+            QQC2.MenuItem {
+                text: room.isDirectChat() ? i18nc("@action:inmenu", "Copy user's Matrix ID to Clipboard") : i18nc("@action:inmenu", "Copy Address to Clipboard")
+                icon.name: "edit-copy"
+                onTriggered: if (room.isDirectChat()) {
+                    Clipboard.saveText(room.directChatRemoteMember.id);
+                } else if (room.canonicalAlias.length === 0) {
+                    Clipboard.saveText(room.id);
+                } else {
+                    Clipboard.saveText(room.canonicalAlias);
+                }
+            }
 
             QQC2.Menu {
-                title: i18nc("@action:inmenu", "Notifications")
+                title: i18n("Notification State")
                 icon.name: "notifications"
 
                 QQC2.MenuItem {
@@ -86,32 +107,6 @@ Loader {
                 }
             }
 
-            QQC2.MenuItem {
-                text: room.isFavourite ? i18n("Remove from Favorites") : i18n("Add to Favorites")
-                icon.name: room.isFavourite ? "rating" : "rating-unrated"
-                onTriggered: room.isFavourite ? room.removeTag("m.favourite") : room.addTag("m.favourite", 1.0)
-            }
-
-            QQC2.MenuItem {
-                text: room.isLowPriority ? i18n("Reprioritize") : i18n("Deprioritize")
-                icon.name: room.isLowPriority ? "arrow-up-symbolic" : "arrow-down-symbolic"
-                onTriggered: room.isLowPriority ? room.removeTag("m.lowpriority") : room.addTag("m.lowpriority", 1.0)
-            }
-
-            QQC2.MenuSeparator {}
-
-            QQC2.MenuItem {
-                text: room.isDirectChat() ? i18nc("@action:inmenu", "Copy user's Matrix ID to Clipboard") : i18nc("@action:inmenu", "Copy Address to Clipboard")
-                icon.name: "edit-copy"
-                onTriggered: if (room.isDirectChat()) {
-                    Clipboard.saveText(room.directChatRemoteMember.id);
-                } else if (room.canonicalAlias.length === 0) {
-                    Clipboard.saveText(room.id);
-                } else {
-                    Clipboard.saveText(room.canonicalAlias);
-                }
-            }
-
             QQC2.MenuItem {
                 text: i18nc("@action:inmenu", "Room Settings")
                 icon.name: 'settings-configure-symbolic'

src/qml/DelegateContextMenu.qml

@@ -57,11 +57,6 @@ Loader {
      */
     property string selectedText: ""
 
-    /**
-     * @brief The link the user has currently hovered.
-     */
-    property string hoveredLink: ""
-
     /**
      * @brief The list of menu item actions that have sub-actions.
      *
@@ -217,7 +212,7 @@ Loader {
                     model: WebShortcutModel {
                         id: webshortcutmodel
                         selectedText: root.selectedText.length > 0 ? root.selectedText : root.plainText
-                        onOpenUrl: RoomManager.resolveResource(url)
+                        onOpenUrl: url => RoomManager.resolveResource(url.toString())
                     }
                     delegate: QQC2.MenuItem {
                         text: model.display