Ton down the intensity of the background on dark theme

Similar to What's App, Telegram and Kaidan.

.reuse/dep5

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

REUSE.toml

@@ -0,0 +1,84 @@
+# 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"

appiumtests/login-server.py

@@ -83,6 +83,15 @@ 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/eventhandlertest.cpp

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

@@ -11,6 +11,7 @@
 #include <qnamespace.h>
 
 #include "enums/messagecomponenttype.h"
+#include "models/customemojimodel.h"
 #include "neochatconnection.h"
 
 #include "testutils.h"
@@ -76,6 +77,7 @@ void TextHandlerTest::initTestCase()
                                                          QJsonObject{{"body"_ls, "Test custom emoji"_ls},
                                                                      {"url"_ls, "mxc://example.org/test"_ls},
                                                                      {"usage"_ls, QJsonArray{"emoticon"_ls}}}}}}});
+    CustomEmojiModel::instance().setConnection(static_cast<NeoChatConnection *>(connection));
 
     room = new TestUtils::TestRoom(connection, QStringLiteral("#myroom:kde.org"), QLatin1String("test-texthandler-sync.json"));
 }

org.kde.neochat.appdata.xml

@@ -54,19 +54,24 @@
   <summary xml:lang="ar">دردش على ماتركس</summary>
   <summary xml:lang="ca">Xat a Matrix</summary>
   <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="es">Charle en Matrix</summary>
   <summary xml:lang="eu">Berriketa Matrix-en</summary>
+  <summary xml:lang="fi">Keskustelu Matrixissä</summary>
   <summary xml:lang="fr">Discuter sur Matrix</summary>
   <summary xml:lang="gl">Charlar en Matrix</summary>
+  <summary xml:lang="he">התכתבות דרך Matrix</summary>
   <summary xml:lang="hu">Csevegés Matrixon</summary>
   <summary xml:lang="ia">Conversation en ditecto sur Matrix</summary>
   <summary xml:lang="it">Chat su Matrix</summary>
   <summary xml:lang="ka">ისაუბრეთ Matrix-ზე</summary>
+  <summary xml:lang="lv">Tērzējiet „Matrix“ tīklā</summary>
   <summary xml:lang="nl">Chat op Matrix</summary>
   <summary xml:lang="nn">Prat med via Matrix</summary>
   <summary xml:lang="pl">Rozmawiaj na Matriksie</summary>
   <summary xml:lang="sl">Klepet na Matrixu</summary>
+  <summary xml:lang="sv">Chatta på Matrix</summary>
   <summary xml:lang="ta">மேட்ரிக்ஸுக்கான உரையாடல் செயலி</summary>
   <summary xml:lang="tr">Matrix Üzerinde Sohbet</summary>
   <summary xml:lang="uk">Спілкування у Matrix</summary>
@@ -288,7 +293,7 @@
     <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</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>
@@ -443,6 +448,7 @@
     <content_attribute id="social-chat">intense</content_attribute>
   </content_rating>
   <releases>
+    <release version="24.12.0" date="2024-12-12"/>
     <release version="24.08.3" date="2024-11-07"/>
     <release version="24.08.2" date="2024-10-10"/>
     <release version="24.08.1" date="2024-09-12"/>

org.kde.neochat.desktop

@@ -88,24 +88,31 @@ GenericName[x-test]=xxMatrix Clientxx
 GenericName[zh_CN]=Matrix 客户端
 GenericName[zh_TW]=Matrix 用戶端
 Comment=Chat on Matrix
+Comment[ar]=دردش على ماتركس
 Comment[ca]=Xat a Matrix
 Comment[ca@valencia]=Xat a Matrix
+Comment[de]=Über Matrix unterhalten
 Comment[en_GB]=Chat on Matrix
 Comment[es]=Chat en Matrix
 Comment[eu]=Berriketa Matrix-en
+Comment[fi]=Keskustele Matrixissä
 Comment[fr]=Clavarder sur Matrix
 Comment[gl]=Charle en Matrix
+Comment[he]=התכתבות דרך Matrix
 Comment[hu]=Csevegés Matrixon
 Comment[ia]=Conversation en ditecto sur Matrix
 Comment[it]= su Matrix
 Comment[ka]=ჩატი Matrix-ზე
+Comment[lv]=Tērzējiet „Matrix“ tīklā
 Comment[nl]=Chat op Matrix
 Comment[pl]=Rozmawiaj na Matriksie
 Comment[sl]=Klepet na Matrixu
+Comment[sv]=Chatta på Matrix
 Comment[ta]=மேட்ரிக்ஸில் உரையாட உதவும்
 Comment[tr]=Matrix Üzerinde Sohbet Et
 Comment[uk]=Спілкування у Matrix
 Comment[x-test]=xxChat on Matrixxx
+Comment[zh_TW]=在 Matrix 上聊天
 MimeType=x-scheme-handler/matrix;
 Exec=neochat %u
 Terminal=false

snapcraft.yaml

@@ -92,7 +92,7 @@ parts:
       - olm
       - qtkeychain
     source: https://github.com/quotient-im/libQuotient.git
-    source-tag: 0.9.0
+    source-tag: 0.9.1
     source-depth: 1
     plugin: cmake
     build-packages:

src/CMakeLists.txt

@@ -10,6 +10,12 @@ endif()
 add_library(neochat STATIC
     controller.cpp
     controller.h
+    models/emojimodel.cpp
+    models/emojimodel.h
+    emojitones.cpp
+    emojitones.h
+    models/customemojimodel.cpp
+    models/customemojimodel.h
     clipboard.cpp
     clipboard.h
     models/messageeventmodel.cpp
@@ -20,6 +26,8 @@ add_library(neochat STATIC
     models/roomlistmodel.h
     models/sortfilterspacelistmodel.cpp
     models/sortfilterspacelistmodel.h
+    models/accountemoticonmodel.cpp
+    models/accountemoticonmodel.h
     spacehierarchycache.cpp
     spacehierarchycache.h
     roommanager.cpp
@@ -42,6 +50,8 @@ add_library(neochat STATIC
     models/userdirectorylistmodel.h
     models/pushrulemodel.cpp
     models/pushrulemodel.h
+    models/emoticonfiltermodel.cpp
+    models/emoticonfiltermodel.h
     notificationsmanager.cpp
     notificationsmanager.h
     models/sortfilterroomlistmodel.cpp
@@ -91,6 +101,10 @@ add_library(neochat STATIC
     texthandler.h
     logger.cpp
     logger.h
+    models/stickermodel.cpp
+    models/stickermodel.h
+    models/imagepacksmodel.cpp
+    models/imagepacksmodel.h
     events/imagepackevent.cpp
     events/imagepackevent.h
     events/joinrulesevent.cpp
@@ -180,38 +194,20 @@ add_library(neochat STATIC
     models/threadmodel.h
     enums/messagetype.h
     messagecomponent.h
-    imagecontentmanager.h
-    imagecontentmanager.cpp
-    models/imagecontentmodel.cpp
-    models/imagecontentmodel.h
-    models/emojipacksmodel.cpp
-    models/emojipacksmodel.h
-    models/accountimagepackmodel.cpp
-    models/accountimagepackmodel.h
-    models/historyimagepackmodel.cpp
-    models/historyimagepackmodel.h
-    models/imagepacksproxymodel.cpp
-    models/imagepacksproxymodel.h
-    models/imagepacksmodel.cpp
-    models/imagepacksmodel.h
-    models/recentimagecontentmodel.h
-    models/recentimagecontentmodel.cpp
-    models/recentimagecontentproxymodel.h
-    models/recentimagecontentproxymodel.cpp
-    models/allimagecontentmodel.h
-    models/allimagecontentmodel.cpp
-    models/roomimagepacksmodel.h
-    models/roomimagepacksmodel.cpp
-    models/imagepackroomsmodel.h
-    models/imagepackroomsmodel.cpp
-    models/imagecontentfiltermodel.h
-    models/imagecontentfiltermodel.cpp
+    enums/roomsortparameter.cpp
+    enums/roomsortparameter.h
 )
 
 set_source_files_properties(qml/OsmLocationPlugin.qml PROPERTIES
     QT_QML_SINGLETON_TYPE TRUE
 )
 
+if(ANDROID OR WIN32)
+    set_source_files_properties(qml/ShareActionStub.qml PROPERTIES
+        QT_QML_SOURCE_TYPENAME ShareAction
+    )
+endif()
+
 ecm_add_qml_module(neochat URI org.kde.neochat GENERATE_PLUGIN_SOURCE
     OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/src/org/kde/neochat
     QML_FILES
@@ -294,9 +290,6 @@ ecm_add_qml_module(neochat URI org.kde.neochat GENERATE_PLUGIN_SOURCE
         qml/ConfirmLeaveDialog.qml
         qml/CodeMaximizeComponent.qml
         qml/EditStateDialog.qml
-        qml/EmojiPickerTypeHeader.qml
-        qml/EmojiPickerPackHeader.qml
-        qml/QuickReaction.qml
         qml/ConsentDialog.qml
         qml/AskDirectChatConfirmation.qml
         qml/HoverLinkIndicator.qml
@@ -313,12 +306,6 @@ ecm_add_qml_module(neochat URI org.kde.neochat GENERATE_PLUGIN_SOURCE
         org.kde.neochat.chatbar
 )
 
-qt_add_resources(neochat "emoji"
-    PREFIX "/"
-    FILES
-        data/emojis.json
-)
-
 add_subdirectory(settings)
 add_subdirectory(timeline)
 add_subdirectory(devtools)
@@ -332,13 +319,9 @@ if(NOT ANDROID AND NOT WIN32)
         qml/EditMenu.qml
     )
 else()
-    set_source_files_properties(qml/ShareActionStub.qml PROPERTIES
-        QT_RESOURCE_ALIAS qml/ShareAction.qml
-    )
     qt_target_qml_sources(neochat QML_FILES qml/ShareActionStub.qml)
 endif()
 
-
 configure_file(config-neochat.h.in ${CMAKE_CURRENT_BINARY_DIR}/config-neochat.h)
 
 if(WIN32)
@@ -552,6 +535,7 @@ if(ANDROID)
         "kde"
         "list-remove-symbolic"
         "edit-delete"
+        "user-home-symbolic"
     )
     ecm_add_android_apk(neochat-app ANDROID_DIR ${CMAKE_SOURCE_DIR}/android)
 else()

src/chatbar/ChatBar.qml

@@ -519,6 +519,7 @@ QQC2.Control {
         y: -implicitHeight
 
         modal: false
+        includeCustom: true
         closeOnChosen: false
 
         currentRoom: root.currentRoom

src/chatbar/EmojiDelegate.qml

@@ -5,30 +5,59 @@ import QtQuick
 import QtQuick.Controls as QQC2
 import org.kde.kirigami as Kirigami
 
-QQC2.Button {
+QQC2.ItemDelegate {
     id: root
 
-    required property string toolTip
+    property string name
+    property string emoji
     property bool showTones: false
+    property bool isImage: false
 
-    QQC2.ToolTip.text: toolTip
-    QQC2.ToolTip.visible: hovered
+    QQC2.ToolTip.text: root.name
+    QQC2.ToolTip.visible: hovered && root.name !== ""
     QQC2.ToolTip.delay: Kirigami.Units.toolTipDelay
+    leftInset: Kirigami.Units.smallSpacing
+    topInset: Kirigami.Units.smallSpacing
+    rightInset: Kirigami.Units.smallSpacing
+    bottomInset: Kirigami.Units.smallSpacing
 
-    flat: true
+    contentItem: Item {
+        Kirigami.Heading {
+            anchors.fill: parent
+            visible: !root.emoji.startsWith("mxc") && !root.isImage
+            text: root.emoji
+            horizontalAlignment: Text.AlignHCenter
+            verticalAlignment: Text.AlignVCenter
+            font.family: "emoji"
 
-    contentItem: Kirigami.Heading {
-        text: root.text
-        horizontalAlignment: Text.AlignHCenter
-        verticalAlignment: Text.AlignVCenter
+            Kirigami.Icon {
+                width: Kirigami.Units.gridUnit * 0.5
+                height: Kirigami.Units.gridUnit * 0.5
+                source: "arrow-down-symbolic"
+                anchors.bottom: parent.bottom
+                anchors.right: parent.right
+                visible: root.showTones
+            }
+        }
+        Image {
+            anchors.fill: parent
+            visible: root.emoji.startsWith("mxc") || root.isImage
+            source: visible ? root.emoji : ""
+            fillMode: Image.PreserveAspectFit
+            sourceSize.width: width
+            sourceSize.height: height
+        }
+    }
 
-        Kirigami.Icon {
-            width: Kirigami.Units.gridUnit * 0.5
-            height: Kirigami.Units.gridUnit * 0.5
-            source: "arrow-down-symbolic"
-            anchors.bottom: parent.bottom
-            anchors.right: parent.right
-            visible: root.showTones
+    background: Rectangle {
+        color: root.checked ? Kirigami.Theme.highlightColor : Kirigami.Theme.backgroundColor
+        radius: Kirigami.Units.cornerRadius
+
+        Rectangle {
+            radius: Kirigami.Units.cornerRadius
+            anchors.fill: parent
+            color: Kirigami.Theme.highlightColor
+            opacity: root.hovered && !root.pressed ? 0.2 : 0
         }
     }
 }

src/chatbar/EmojiDialog.qml

@@ -16,7 +16,9 @@ QQC2.Popup {
      */
     property NeoChatRoom currentRoom
 
+    property bool includeCustom: false
     property bool closeOnChosen: true
+    property bool showQuickReaction: false
 
     signal chosen(string emoji)
 
@@ -62,15 +64,15 @@ QQC2.Popup {
     padding: 2
 
     implicitHeight: Kirigami.Units.gridUnit * 20 + 2 * padding
-    width: Math.min(contentItem.implicitWidth + 2 * padding, applicationWindow().width)
-
+    width: Math.min(contentItem.categoryIconSize * 11 + 2 * padding, applicationWindow().width)
     contentItem: EmojiPicker {
         id: emojiPicker
         height: 400
         currentRoom: root.currentRoom
+        includeCustom: root.includeCustom
+        showQuickReaction: root.showQuickReaction
         onChosen: emoji => {
             root.chosen(emoji);
-            ImageContentManager.emojiUsed(emoji)
             if (root.closeOnChosen) {
                 root.close();
             }

src/chatbar/EmojiGrid.qml

@@ -1,17 +1,20 @@
-// SPDX-FileCopyrightText: 2024 Tobias Fella <tobias.fella@kde.org>
+// SPDX-FileCopyrightText: 2022 Tobias Fella
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 import QtQuick
 import QtQuick.Controls as QQC2
 import org.kde.kirigami as Kirigami
-
 import org.kde.neochat
-import org.kde.textaddons.emoticons
 
 QQC2.ScrollView {
     id: root
 
-    readonly property int emojisPerRow: emojis.width / Kirigami.Units.iconSizes.large
+    property alias model: emojis.model
+    property alias count: emojis.count
+    required property int targetIconSize
+    readonly property int emojisPerRow: emojis.width / targetIconSize
+    required property bool withCustom
+    readonly property var searchCategory: withCustom ? EmojiModel.Search : EmojiModel.SearchNoCustom
     required property QtObject header
     property bool stickers: false
 
@@ -22,8 +25,6 @@ QQC2.ScrollView {
         emojis.forceActiveFocus();
     }
 
-    width: Kirigami.Units.gridUnit * 24
-
     GridView {
         id: emojis
 
@@ -40,9 +41,7 @@ QQC2.ScrollView {
         onModelChanged: currentIndex = -1
 
         cellWidth: emojis.width / root.emojisPerRow
-        cellHeight: Kirigami.Units.iconSizes.large
-
-        model: EmojiModelManager.emojiModel
+        cellHeight: root.targetIconSize
 
         KeyNavigation.up: root.header
 
@@ -50,49 +49,50 @@ QQC2.ScrollView {
 
         delegate: EmojiDelegate {
             id: emojiDelegate
-
-            required property string unicode
-            required property string identifier
-            required property int index
-
-            text: emojiDelegate.unicode
-            toolTip: emojiDelegate.identifier
-            checked: emojis.currentIndex === emojiDelegate.index
+            checked: emojis.currentIndex === model.index
+            emoji: !!modelData ? modelData.unicode : model.url
+            name: !!modelData ? modelData.shortName : model.body
 
             width: emojis.cellWidth
             height: emojis.cellHeight
 
+            isImage: root.stickers
             Keys.onEnterPressed: clicked()
             Keys.onReturnPressed: clicked()
-            // onClicked: {
-            //     if (root.stickers) {
-            //         root.stickerChosen(model.index);
-            //     }
-            //     root.chosen(modelData.isCustom ? modelData.shortName : modelData.unicode);
-            //     EmojiModel.emojiUsed(modelData);
-            // }
-            // Keys.onSpacePressed: pressAndHold()
-            // onPressAndHold: {
-            //     if (!showTones) {
-            //         return;
-            //     }
-            //     let tones = Qt.createComponent("org.kde.neochat", "EmojiTonesPicker").createObject(emojiDelegate, {
-            //         shortName: modelData.shortName,
-            //         unicode: modelData.unicode,
-            //         categoryIconSize: root.targetIconSize,
-            //         onChosen: root.chosen(emoji => root.chosen(emoji))
-            //     });
-            //     tones.open();
-            //     tones.forceActiveFocus();
-            // }
-            // showTones: model.hasTones
+            onClicked: {
+                if (root.stickers) {
+                    root.stickerChosen(model.index);
+                }
+                root.chosen(modelData.isCustom ? modelData.shortName : modelData.unicode);
+                EmojiModel.emojiUsed(modelData);
+            }
+            Keys.onSpacePressed: pressAndHold()
+            onPressAndHold: {
+                if (EmojiModel.tones(modelData.shortName).length === 0) {
+                    return;
+                }
+                let tones = tonesPopupComponent.createObject(emojiDelegate, {
+                    shortName: modelData.shortName,
+                    unicode: modelData.unicode,
+                    categoryIconSize: root.targetIconSize
+                });
+                tones.open();
+                tones.forceActiveFocus();
+            }
+            showTones: !!modelData && EmojiModel.tones(modelData.shortName).length > 0
         }
 
         Kirigami.PlaceholderMessage {
             anchors.centerIn: parent
             icon.name: root.stickers ? "stickers" : "preferences-desktop-emoticons"
-            text: root.stickers ? i18nc("@info", "No stickers") : i18nc("@info", "No emojis")
+            text: root.stickers ? i18n("No stickers") : i18n("No emojis")
             visible: emojis.count === 0
         }
     }
+    Component {
+        id: tonesPopupComponent
+        EmojiTonesPicker {
+            onChosen: root.chosen(emoji)
+        }
+    }
 }

src/chatbar/EmojiPicker.qml

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2022-2023 Tobias Fella <tobias.fella@kde.org>
+// SPDX-FileCopyrightText: 2022 Tobias Fella <tobias.fella@kde.org>
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 import QtQuick
@@ -6,7 +6,6 @@ import QtQuick.Controls as QQC2
 import QtQuick.Layouts
 import org.kde.kirigami as Kirigami
 import org.kde.neochat
-import org.kde.textaddons.emoticons
 
 ColumnLayout {
     id: root
@@ -14,29 +13,87 @@ ColumnLayout {
     /**
      * @brief The current room that user is viewing.
      */
-    required property NeoChatRoom currentRoom
+    property NeoChatRoom currentRoom
+
+    property bool includeCustom: false
+    property bool showQuickReaction: false
+
+    readonly property var currentEmojiModel: {
+        if (includeCustom) {
+            EmojiModel.categoriesWithCustom;
+        } else {
+            EmojiModel.categories;
+        }
+    }
+
+    readonly property int categoryIconSize: Math.round(Kirigami.Units.gridUnit * 2.5)
+    readonly property var currentCategory: currentEmojiModel[categories.currentIndex].category
+    readonly property alias categoryCount: categories.count
+    property int selectedType: 0
 
     signal chosen(string emoji)
 
-    spacing: 0
-
     onActiveFocusChanged: if (activeFocus) {
         searchField.forceActiveFocus();
     }
 
-    EmojiPickerTypeHeader {
-        id: emoticonPickerTypeHeader
+    spacing: 0
 
+    Kirigami.NavigationTabBar {
+        id: types
         Layout.fillWidth: true
-        onSelectedTypeChanged: emoticonPickerCategoryHeader.currentIndex = 0
+        Kirigami.Theme.colorSet: Kirigami.Theme.View
+
+        background: null
+        actions: [
+            Kirigami.Action {
+                id: emojis
+                icon.name: "smiley"
+                text: i18n("Emojis")
+                checked: true
+                onTriggered: root.selectedType = 0
+            },
+            Kirigami.Action {
+                id: stickers
+                icon.name: "stickers"
+                text: i18n("Stickers")
+                onTriggered: root.selectedType = 1
+            }
+        ]
     }
 
-    EmojiPickerPackHeader {
-        id: emoticonPickerCategoryHeader
-
+    QQC2.ScrollView {
         Layout.fillWidth: true
+        Layout.preferredHeight: root.categoryIconSize + QQC2.ScrollBar.horizontal.height
+        QQC2.ScrollBar.horizontal.height: QQC2.ScrollBar.horizontal.visible ? QQC2.ScrollBar.horizontal.implicitHeight : 0
+        visible: categories.count !== 0
 
-        model: UnicodeEmoticonManager.categories
+        ListView {
+            id: categories
+            clip: true
+            focus: true
+            orientation: ListView.Horizontal
+
+            Keys.onReturnPressed: if (emojiGrid.count > 0) {
+                emojiGrid.focus = true;
+            }
+            Keys.onEnterPressed: if (emojiGrid.count > 0) {
+                emojiGrid.focus = true;
+            }
+
+            KeyNavigation.down: emojiGrid.count > 0 ? emojiGrid : categories
+            KeyNavigation.tab: emojiGrid.count > 0 ? emojiGrid : categories
+
+            keyNavigationEnabled: true
+            keyNavigationWraps: true
+            Keys.forwardTo: searchField
+            interactive: width !== contentWidth
+
+            model: root.selectedType === 0 ? root.currentEmojiModel : stickerPackModel
+            Component.onCompleted: categories.forceActiveFocus()
+
+            delegate: root.selectedType === 0 ? emojiDelegate : stickerDelegate
+        }
     }
 
     Kirigami.Separator {
@@ -48,34 +105,119 @@ ColumnLayout {
         id: searchField
         Layout.margins: Kirigami.Units.smallSpacing
         Layout.fillWidth: true
+        visible: selectedType === 0
 
+        /**
+         * The focus is manged by the parent and we don't want to use the standard
+         * shortcut as it could block other SearchFields from using it.
+         */
         focusSequence: ""
     }
 
     EmojiGrid {
         id: emojiGrid
-
+        targetIconSize: root.currentCategory === EmojiModel.Custom ? Kirigami.Units.gridUnit * 3 : root.categoryIconSize  // Custom emojis are bigger
+        model: root.selectedType === 1 ? emoticonFilterModel : searchField.text.length === 0 ? EmojiModel.emojis(root.currentCategory) : (root.includeCustom ? EmojiModel.filterModel(searchField.text, false) : EmojiModel.filterModelNoCustom(searchField.text, false))
         Layout.fillWidth: true
         Layout.fillHeight: true
+        withCustom: root.includeCustom
         onChosen: unicode => root.chosen(unicode)
-        header: emoticonPickerCategoryHeader
+        header: categories
         Keys.forwardTo: searchField
-        stickers: emoticonPickerTypeHeader.selectedType === EmojiPickerTypeHeader.EmoticonType.Sticker
+        stickers: root.selectedType === 1
         onStickerChosen: stickerModel.postSticker(emoticonFilterModel.mapToSource(emoticonFilterModel.index(index, 0)).row)
     }
 
     Kirigami.Separator {
+        visible: showQuickReaction
         Layout.fillWidth: true
         Layout.preferredHeight: 1
     }
 
-    QuickReaction {
-        id: quickReaction
-        onChosen: root.chosen(text)
+    QQC2.ScrollView {
+        visible: showQuickReaction
         Layout.fillWidth: true
+        Layout.preferredHeight: root.categoryIconSize + QQC2.ScrollBar.horizontal.height
+        QQC2.ScrollBar.horizontal.height: QQC2.ScrollBar.horizontal.visible ? QQC2.ScrollBar.horizontal.implicitHeight : 0
+
+        ListView {
+            id: quickReactions
+            Layout.fillWidth: true
+
+            model: ["👍", "👎", "😄", "🎉", "😕", "❤", "🚀", "👀"]
+
+            delegate: EmojiDelegate {
+                emoji: modelData
+
+                height: root.categoryIconSize
+                width: height
+
+                onClicked: root.chosen(modelData)
+            }
+
+            orientation: Qt.Horizontal
+        }
+    }
+
+    ImagePacksModel {
+        id: stickerPackModel
+        room: root.currentRoom
+        showStickers: true
+        showEmoticons: false
+    }
+
+    StickerModel {
+        id: stickerModel
+        model: stickerPackModel
+        packIndex: 0
+        room: root.currentRoom
+    }
+
+    EmoticonFilterModel {
+        id: emoticonFilterModel
+        sourceModel: stickerModel
+        showStickers: true
+    }
+
+    Component {
+        id: emojiDelegate
+        Kirigami.NavigationTabButton {
+            width: root.categoryIconSize
+            height: width
+            checked: categories.currentIndex === model.index
+            text: modelData ? modelData.emoji : ""
+            QQC2.ToolTip.text: modelData ? modelData.name : ""
+            QQC2.ToolTip.delay: Kirigami.Units.toolTipDelay
+            QQC2.ToolTip.visible: hovered
+            onClicked: {
+                categories.currentIndex = index;
+                categories.focus = true;
+            }
+        }
+    }
+
+    Component {
+        id: stickerDelegate
+        Kirigami.NavigationTabButton {
+            width: root.categoryIconSize
+            height: width
+            checked: stickerModel.packIndex === model.index
+            padding: Kirigami.Units.largeSpacing
+
+            contentItem: Image {
+                source: model.avatarUrl
+                fillMode: Image.PreserveAspectFit
+                sourceSize.width: width
+                sourceSize.height: height
+            }
+            QQC2.ToolTip.text: model.name
+            QQC2.ToolTip.delay: Kirigami.Units.toolTipDelay
+            QQC2.ToolTip.visible: hovered && !!model.name
+            onClicked: stickerModel.packIndex = model.index
+        }
     }
 
     function clearSearchField() {
-        searchField.text = ""
+        searchField.text = "";
     }
 }

src/chatbar/EmojiTonesPicker.qml

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2024 Tobias Fella <tobias.fella@kde.org>
+// SPDX-FileCopyrightText: 2022 Tobias Fella <tobias.fella@kde.org>
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 import QtQuick
@@ -54,8 +54,8 @@ QQC2.Popup {
         delegate: EmojiDelegate {
             id: emojiDelegate
             checked: tonesList.currentIndex === model.index
-            text: modelData.unicode
-            toolTip: modelData.shortName
+            emoji: modelData.unicode
+            name: modelData.shortName
 
             width: root.categoryIconSize
             height: width

src/chatbarcache.cpp

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

src/colorschemer.cpp

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

src/colorschemer.h

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

src/controller.cpp

@@ -423,10 +423,14 @@ void Controller::setTestMode(bool test)
 
 void Controller::removeConnection(const QString &userId)
 {
-    if (m_connectionsLoading.contains(userId) && m_connectionsLoading[userId]) {
-        auto connection = m_connectionsLoading[userId];
+    // When loadAccessTokenFromKeyChain() fails m_connectionsLoading won't have an
+    // entry for it so we need to check both separately.
+    if (m_accountsLoading.contains(userId)) {
         m_accountsLoading.removeAll(userId);
         Q_EMIT accountsLoadingChanged();
+    }
+    if (m_connectionsLoading.contains(userId) && m_connectionsLoading[userId]) {
+        auto connection = m_connectionsLoading[userId];
         SettingsGroup("Accounts"_ls).remove(userId);
     }
 }

src/data/emojis.json.license

@@ -1,2 +0,0 @@
-SPDX-FileCopyrightText: 2024 Emojibase
-SPDX-License-Identifier: MIT

src/devtools/AccountData.qml

@@ -33,4 +33,28 @@ 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,19 +21,22 @@ ColumnLayout {
         title: i18nc("@title", "Choose Room")
     }
     FormCard.FormCard {
-        FormCard.FormComboBoxDelegate {
-            id: roomComboBox
-            text: i18n("Room")
-            textRole: "escapedDisplayName"
-            valueRole: "roomId"
-            displayText: RoomManager.roomListModel.data(RoomManager.roomListModel.index(currentIndex, 0), RoomListModel.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.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.FormTextDelegate {
+            visible: root.room
             text: i18n("Room Id: %1", root.room.id)
         }
     }

src/devtools/StateKeys.qml

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

src/emojitones.cpp

@@ -0,0 +1,9 @@
+// SPDX-FileCopyrightText: None
+// SPDX-License-Identifier: LGPL-2.0-or-later
+
+#include "emojitones.h"
+#include "models/emojimodel.h"
+
+QMultiHash<QString, QVariant> EmojiTones::_tones = {
+#include "emojitones_data.h"
+};

src/emojitones.h

@@ -0,0 +1,21 @@
+// SPDX-FileCopyrightText: None
+// SPDX-License-Identifier: LGPL-2.0-or-later
+
+#pragma once
+
+#include <QVariant>
+
+/**
+ * @class EmojiTones
+ *
+ * This class provides a _tones variable with the available emoji tones to EmojiModel.
+ *
+ * @sa EmojiModel
+ */
+class EmojiTones
+{
+private:
+    static QMultiHash<QString, QVariant> _tones;
+
+    friend class EmojiModel;
+};

src/enums/roomsortparameter.cpp

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

@@ -0,0 +1,122 @@
+// 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,16 +49,6 @@ 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) {
@@ -70,7 +60,7 @@ QString EventHandler::authorDisplayName(const NeoChatRoom *room, const Quotient:
         return {};
     }
 
-    if (is<RoomMemberEvent>(*event) && !event->unsignedJson()[QStringLiteral("prev_content")][QStringLiteral("displayname")].isNull()
+    if (is<RoomMemberEvent>(*event) && event->unsignedJson()[QStringLiteral("prev_content")].toObject().contains("displayname"_L1)
         && event->stateKey() == event->senderId()) {
         auto previousDisplayName = event->unsignedJson()[QStringLiteral("prev_content")][QStringLiteral("displayname")].toString().toHtmlEscaped();
         if (previousDisplayName.isEmpty()) {
@@ -291,7 +281,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()) {
+    if (event->isRedacted() && !event->isStateEvent()) {
         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());
     }
@@ -508,7 +498,7 @@ QString EventHandler::genericBody(const NeoChatRoom *room, const Quotient::RoomE
         qCWarning(EventHandling) << "genericBody called with event set to nullptr.";
         return {};
     }
-    if (event->isRedacted()) {
+    if (event->isRedacted() && !event->isStateEvent()) {
         return i18n("<i>[This message was deleted]</i>");
     }
 
@@ -834,31 +824,6 @@ 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) {
@@ -877,38 +842,6 @@ 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,14 +37,6 @@ 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.
      *
@@ -220,20 +212,6 @@ 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.
      *
@@ -249,20 +227,6 @@ 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/imagecontentmanager.cpp

@@ -1,334 +0,0 @@
-// SPDX-FileCopyrightText: 2024 Tobias Fella <tobias.fella@kde.org>
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "imagecontentmanager.h"
-
-#include <QDebug>
-#include <QFile>
-
-#include <KConfigGroup>
-#include <KSharedConfig>
-
-#include "controller.h"
-#include "events/imagepackevent.h"
-#include "neochatroom.h"
-
-#include <Quotient/connection.h>
-
-#define connection Controller::instance().activeConnection()
-
-using namespace Quotient;
-
-ImageContentManager::ImageContentManager(QObject *parent)
-    : QObject(parent)
-{
-    connect(&Controller::instance(), &Controller::activeConnectionChanged, this, [this]() {
-        static Connection *oldActiveConnection = nullptr;
-        disconnect(oldActiveConnection, nullptr, this, nullptr);
-        oldActiveConnection = Controller::instance().activeConnection();
-        setupConnection();
-    });
-
-    loadEmojis();
-    loadEmojiHistory();
-
-    setupConnection();
-}
-
-void ImageContentManager::loadEmojis()
-{
-    QFile file(":/data/emojis.json"_ls);
-    file.open(QFile::ReadOnly);
-    Q_ASSERT(file.isOpen());
-    auto data = QJsonDocument::fromJson(file.readAll()).array();
-
-    for (const auto &emoji : data) {
-        // TODO
-        // m_emojiPacks += ImagePackDescription{
-        //     .description = parts[1],
-        //     .attribution = {},
-        //     .icon = parts[0],
-        //     .type = ImagePackDescription::Emoji,
-        //     .roomId = {},
-        //     .stateKey = parts[2],
-        // };
-
-        m_emojis[u"TODO"_s] += Emoji{
-            .text = emoji[u"icon"_s].toString(),
-            .displayName = emoji[u"label"_s].toString(),
-            .shortName = emoji[u"label"_s].toString(), // TODO
-        };
-    }
-}
-
-void ImageContentManager::loadEmojiHistory()
-{
-    auto config = KSharedConfig::openStateConfig();
-    auto group = config->group("RecentEmojis"_ls);
-    for (const auto &key : group.keyList()) {
-        m_usages[key] = group.readEntry(key).toInt();
-    }
-}
-
-void ImageContentManager::setupConnection()
-{
-    if (!connection) {
-        return;
-    }
-    connect(Controller::instance().activeConnection(), &Connection::accountDataChanged, this, [this](const QString &type) {
-        if (type == "im.ponies.user_emotes"_ls) {
-            loadAccountImages();
-        }
-        if (type == "im.ponies.emote_rooms"_ls) {
-            loadGlobalPacks();
-        }
-    });
-    loadAccountImages();
-    loadGlobalPacks();
-
-    m_roomPacks.clear();
-
-    for (const auto &room : connection->allRooms()) {
-        setupRoom(static_cast<NeoChatRoom *>(room));
-    }
-    connect(connection, &Connection::joinedRoom, this, [this](const auto &room) {
-        setupRoom(static_cast<NeoChatRoom *>(room));
-    });
-    connect(connection, &Connection::leftRoom, this, [this](const auto &room) {
-        cleanupRoom(static_cast<NeoChatRoom *>(room));
-    });
-}
-
-const QVector<ImagePackDescription> &ImageContentManager::emojiPacks() const
-{
-    return m_emojiPacks;
-}
-
-const QHash<QString, QVector<Emoji>> &ImageContentManager::emojis() const
-{
-    return m_emojis;
-}
-
-void ImageContentManager::loadAccountImages()
-{
-    m_accountImages.clear();
-    if (connection->hasAccountData("im.ponies.user_emotes"_ls)) {
-        m_accountImages = ImagePackEventContent(connection->accountData("im.ponies.user_emotes"_ls)->contentJson()).images;
-    }
-    Q_EMIT accountImagesChanged();
-}
-
-const QVector<ImagePackEventContent::ImagePackImage> &ImageContentManager::accountImages() const
-{
-    return m_accountImages;
-}
-
-void ImageContentManager::emojiUsed(const QString &text)
-{
-    if (!m_usages.contains(text)) {
-        m_usages[text] = 0;
-    }
-    m_usages[text]++;
-    Q_EMIT recentEmojisChanged();
-    auto config = KSharedConfig::openStateConfig();
-    auto group = config->group("RecentEmojis"_ls);
-    for (const auto &key : m_usages.keys()) {
-        group.writeEntry(key, m_usages[key]);
-    }
-}
-
-Emoji ImageContentManager::emojiForText(const QString &text)
-{
-    for (const auto &category : m_emojis.values()) {
-        for (const auto &emoji : category) {
-            if (emoji.text == text) {
-                return emoji;
-            }
-        }
-    }
-    const auto &withSelector = QString::fromUtf8(text.toUtf8() + QByteArrayLiteral("\xEF\xB8\x8F"));
-    for (const auto &category : m_emojis.values()) {
-        for (const auto &emoji : category) {
-            if (emoji.text == withSelector) {
-                return emoji;
-            }
-        }
-    }
-    return {};
-}
-
-const QMap<QString, uint32_t> &ImageContentManager::recentEmojis() const
-{
-    return m_usages;
-}
-
-const QMap<QString, QMap<QString, ImagePackDescription>> &ImageContentManager::roomImagePacks() const
-{
-    return m_roomPacks;
-}
-
-void ImageContentManager::loadRoomImagePacks(NeoChatRoom *room)
-{
-    const auto &events = room->currentState().eventsOfType("im.ponies.room_emotes"_ls);
-    m_roomPacks[room->id()].clear();
-    for (const auto &event : events) {
-        auto content = ImagePackEventContent(event->contentJson());
-        auto avatarMxc = event->contentPart<QJsonObject>("pack"_ls)["avatar_url"_ls].toString();
-        if (avatarMxc.isEmpty()) {
-            const auto &images = event->contentPart<QJsonObject>("images"_ls);
-            if (images.size() > 0) {
-                avatarMxc = images[images.keys()[0]]["url"_ls].toString();
-            }
-        }
-        const auto &avatarUrl = avatarMxc.isEmpty() ? QString() : Controller::instance().activeConnection()->makeMediaUrl(QUrl(avatarMxc)).toString();
-
-        ImagePackDescription::Type type = ImagePackDescription::Both;
-        if (!content.pack || !content.pack->usage || content.pack->usage->isEmpty()
-            || (content.pack->usage->contains("emoticon"_ls) && content.pack->usage->contains("sticker"_ls))) {
-            type = ImagePackDescription::Both;
-        } else if (content.pack->usage->contains("sticker"_ls)) {
-            type = ImagePackDescription::Sticker;
-        } else {
-            type = ImagePackDescription::CustomEmoji;
-        }
-
-        m_roomPacks[room->id()][event->stateKey()] = ImagePackDescription{
-            .description = event->contentPart<QJsonObject>("pack"_ls)["display_name"_ls].toString(),
-            .attribution = {},
-            .icon = QStringLiteral("<img src=\"%1\" width=\"32\" height=\"32\"/>").arg(avatarUrl),
-            .type = type,
-            .roomId = room->id(),
-            .stateKey = event->stateKey(),
-        };
-        m_roomImages[{room->id(), event->stateKey()}] = content.images;
-    }
-    Q_EMIT roomImagePacksChanged(room);
-}
-
-const RoomImages &ImageContentManager::roomImages() const
-{
-    return m_roomImages;
-}
-
-const QVector<std::pair<QString, QString>> &ImageContentManager::globalPacks() const
-{
-    return m_globalPacks;
-}
-
-void ImageContentManager::loadGlobalPacks()
-{
-    if (!connection->hasAccountData("im.ponies.emote_rooms"_ls)) {
-        return;
-    }
-    m_globalPacks.clear();
-    const auto &rooms = Controller::instance().activeConnection()->accountData("im.ponies.emote_rooms"_ls)->contentPart<QJsonObject>("rooms"_ls);
-    for (const auto &roomId : rooms.keys()) {
-        for (const auto &stateKey : rooms[roomId].toObject().keys()) {
-            m_globalPacks += {roomId, stateKey};
-        }
-    }
-    Q_EMIT globalPacksChanged();
-}
-
-void ImageContentManager::setupRoom(NeoChatRoom *room)
-{
-    connect(room, &Room::changed, this, [this, room]() {
-        loadRoomImagePacks(room);
-    });
-    loadRoomImagePacks(room);
-}
-
-void ImageContentManager::cleanupRoom(NeoChatRoom *room)
-{
-    m_roomPacks.remove(room->id());
-    Q_EMIT roomImagePacksChanged(room);
-}
-
-QString ImageContentManager::mxcForShortCode(const QString &shortcode) const
-{
-    for (const auto &image : m_accountImages) {
-        if (image.shortcode == shortcode) {
-            return Controller::instance().activeConnection()->makeMediaUrl(image.url).toString();
-        }
-    }
-    for (const auto &id : m_roomImages.keys()) {
-        for (const auto &image : m_roomImages[id]) {
-            if (image.shortcode == shortcode) {
-                return Controller::instance().activeConnection()->makeMediaUrl(image.url).toString();
-            }
-        }
-    }
-    return {};
-}
-
-QString ImageContentManager::bodyForShortCode(const QString &shortcode) const
-{
-    for (const auto &image : m_accountImages) {
-        if (image.shortcode == shortcode) {
-            return image.body.value_or(QString());
-        }
-    }
-    for (const auto &id : m_roomImages.keys()) {
-        for (const auto &image : m_roomImages[id]) {
-            if (image.shortcode == shortcode) {
-                return image.body.value_or(QString());
-            }
-        }
-    }
-    return {};
-}
-
-bool ImageContentManager::isEmojiShortCode(const QString &shortCode) const
-{
-    for (const auto &image : m_accountImages) {
-        if (image.shortcode == shortCode) {
-            return !image.usage || image.usage->isEmpty() || image.usage->contains("emoticon"_ls);
-        }
-    }
-    for (const auto &id : m_roomImages.keys()) {
-        for (const auto &image : m_roomImages[id]) {
-            if (image.shortcode == shortCode) {
-                const auto pack = m_roomPacks[id.first][id.second];
-                return pack.type == ImagePackDescription::Emoji || pack.type == ImagePackDescription::Both;
-            }
-        }
-    }
-    return true;
-}
-
-bool ImageContentManager::isStickerShortCode(const QString &shortCode) const
-{
-    for (const auto &image : m_accountImages) {
-        if (image.shortcode == shortCode) {
-            return !image.usage || image.usage->isEmpty() || image.usage->contains("sticker"_ls);
-        }
-    }
-    for (const auto &id : m_roomImages.keys()) {
-        for (const auto &image : m_roomImages[id]) {
-            if (image.shortcode == shortCode) {
-                const auto pack = m_roomPacks[id.first][id.second];
-                return pack.type == ImagePackDescription::Sticker || pack.type == ImagePackDescription::Both;
-            }
-        }
-    }
-    return true;
-}
-
-QString ImageContentManager::accountImagesAvatar() const
-{
-    if (!connection->hasAccountData("im.ponies.user_emotes"_ls)) {
-        return {};
-    }
-    const auto &event = ImagePackEventContent(connection->accountData("im.ponies.user_emotes"_ls)->contentJson());
-    QString avatarUrl;
-    if (event.pack) {
-        avatarUrl = event.pack->avatarUrl.value_or(QUrl()).toString();
-    }
-    if (avatarUrl.isEmpty()) {
-        //TODO avatarUrl = Controller::instance().activeConnection()->user()->avatarUrl().toString();
-    }
-    if (avatarUrl.isEmpty()) {
-        avatarUrl = event.images[0].url.toString();
-    }
-    return QStringLiteral("👤");
-}

src/imagecontentmanager.h

@@ -1,172 +0,0 @@
-// SPDX-FileCopyrightText: 2023 Tobias Fella <tobias.fella@kde.org>
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include <QHash>
-#include <QObject>
-#include <QQmlEngine>
-
-#include "events/imagepackevent.h"
-#include "neochatroom.h"
-
-#define imageContentManager ImageContentManager::instance()
-
-class ImageContentRole : public QObject
-{
-    Q_OBJECT
-public:
-    enum ImageRoles {
-        DisplayNameRole = Qt::DisplayRole, /**< The name of the emoji. */
-        EmojiRole, /**< The unicode character of the emoji. */
-        ShortCodeRole,
-        IsCustomRole,
-        IsStickerRole,
-        IsEmojiRole,
-        UsageCountRole,
-        HasTonesRole,
-    };
-    Q_ENUM(ImageRoles);
-};
-
-class ImageContentPackRole : public QObject
-{
-    Q_OBJECT
-    QML_ELEMENT
-    QML_UNCREATABLE("")
-
-public:
-    //! Roles for the various models providing image packs.
-    enum ImagePackRoles {
-        DisplayNameRole = Qt::DisplayRole, //! Textual desription of the pack.
-        IconRole, //! Icon for the pack. For emojis, this is a unicode emoji; For custom emojis and stickers, this is a HTML image.
-        IdentifierRole, //! An internal, mostly opaque identifier for the model.
-        IsEmojiRole, //! Whether this pack contains emojis (including custom). For the account pack, this is true if the pack contains any emojis; for room
-                     //! packs, this *only* considers the pack-level usage parameter
-        IsStickerRole, //! Equivalent to IsEmojiRole, but for stickers.
-        IsEmptyRole, //! Whether this image pack is empty.
-        IsGlobalPackRole, //! Whether this pack is enabled globally.
-    };
-    Q_ENUM(ImagePackRoles);
-};
-
-using RoomImages = QMap<std::pair<QString, QString>, QVector<Quotient::ImagePackEventContent::ImagePackImage>>;
-
-struct Emoji {
-    Q_GADGET
-    Q_PROPERTY(QString text MEMBER text)
-    Q_PROPERTY(QString displayName MEMBER displayName)
-    Q_PROPERTY(QString shortName MEMBER shortName)
-public:
-    QString text;
-    QString displayName;
-    QString shortName;
-};
-Q_DECLARE_METATYPE(Emoji)
-
-struct ImagePackDescription {
-    enum Type {
-        Emoji,
-        CustomEmoji,
-        Sticker,
-        Both,
-    };
-    QString description;
-    QString attribution;
-    QString icon;
-    Type type;
-    // Only relevant for packs coming from rooms
-    QString roomId;
-    QString stateKey;
-};
-
-/**
- * This class manages emojis, custom emojis, and stickers. Because naming things is hard, it has the most generic name possible.
- */
-class ImageContentManager : public QObject
-{
-    Q_OBJECT
-    QML_ELEMENT
-    QML_SINGLETON
-
-public:
-    // Returns the global instance of ImageContentManager.
-    static ImageContentManager &instance()
-    {
-        static ImageContentManager _instance;
-        return _instance;
-    }
-
-    //! Returns a list of emoji packs (categories, e.g., food, smileys, etc.)
-    const QVector<ImagePackDescription> &emojiPacks() const;
-    //! Returns a map roomId -> stateKey -> description for all image packs that exist in rooms.
-    const QMap<QString, QMap<QString, ImagePackDescription>> &roomImagePacks() const;
-    //! Returns an list (roomId, stateKey) for all globally enabled room packs.
-    //! This is not filtered for rooms or stateKeys that do not exist. This is left to ImagePacksProxyModel
-    const QVector<std::pair<QString, QString>> &globalPacks() const;
-
-    //! Returns a map pack key -> [emoji] for all (normal) emojis.
-    const QHash<QString, QVector<Emoji>> &emojis() const;
-
-    //! Returns a list of all account images.
-    const QVector<Quotient::ImagePackEventContent::ImagePackImage> &accountImages() const;
-
-    //! Returns a map roomId -> stateKey -> [image] of all images part of a room image pack.
-    const RoomImages &roomImages() const;
-
-    //! Returns a map emoji -> usage count to be used as an emoji history.
-    const QMap<QString, uint32_t> &recentEmojis() const;
-
-    //! Returns the emoji object for the given unicode symbol.
-    Emoji emojiForText(const QString &text);
-
-    //! Updates the history when an emoji is used.
-    Q_INVOKABLE void emojiUsed(const QString &text);
-
-    QString mxcForShortCode(const QString &shortcode) const;
-    QString bodyForShortCode(const QString &shortcode) const;
-    bool isEmojiShortCode(const QString &shortCode) const;
-    bool isStickerShortCode(const QString &shortCode) const;
-
-    QString accountImagesAvatar() const;
-
-Q_SIGNALS:
-    void accountImagesChanged();
-    void recentEmojisChanged();
-    void roomImagePacksChanged(NeoChatRoom *room);
-    void globalPacksChanged();
-
-private:
-    // Packs
-    QVector<ImagePackDescription> m_emojiPacks;
-    // [roomId, stateKey]
-    QVector<std::pair<QString, QString>> m_globalPacks;
-    // roomId -> stateKey -> description
-    QMap<QString, QMap<QString, ImagePackDescription>> m_roomPacks;
-
-    // Emojis
-    // pack name -> emojis
-    QHash<QString, QVector<Emoji>> m_emojis;
-    QVector<Quotient::ImagePackEventContent::ImagePackImage> m_accountImages;
-    RoomImages m_roomImages;
-
-    // History
-    // emoji -> usage count
-    QMap<QString, uint32_t> m_usages;
-
-    // Loads both emojis and emoji packs
-    void loadEmojis();
-    void loadGlobalPacks();
-    void loadRoomImagePacks(NeoChatRoom *room);
-
-    void loadEmojiHistory();
-
-    void loadAccountImages();
-    void loadRoomImages();
-
-    ImageContentManager(QObject *parent = nullptr);
-
-    void setupConnection();
-    void setupRoom(NeoChatRoom *room);
-    void cleanupRoom(NeoChatRoom *room);
-};

src/linkpreviewer.cpp

@@ -4,11 +4,12 @@
 #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;
@@ -61,7 +62,13 @@ void LinkPreviewer::loadUrlPreview()
         if (conn == nullptr) {
             return;
         }
-        GetUrlPreviewJob *job = conn->callApi<GetUrlPreviewJob>(m_url);
+
+        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);)
+        }
 
         connect(job, &BaseJob::success, this, [this, job, conn]() {
             const auto json = job->jsonData();

src/login.cpp

@@ -25,8 +25,7 @@ void LoginHelper::init()
     m_connection = new NeoChatConnection();
     m_matrixId = QString();
     m_password = QString();
-    m_deviceName = QStringLiteral("NeoChat %1 %2 %3 %4")
-                       .arg(QSysInfo::machineHostName(), QSysInfo::productType(), QSysInfo::productVersion(), QSysInfo::currentCpuArchitecture());
+    m_deviceName = QStringLiteral("NeoChat");
     m_supportsSso = false;
     m_supportsPassword = false;
     m_ssoUrl = QUrl();

src/main.cpp

@@ -62,8 +62,6 @@
 #include "fakerunner.h"
 #endif
 
-#include "imagecontentmanager.h"
-
 #ifdef Q_OS_WINDOWS
 #include <Windows.h>
 #endif
@@ -273,7 +271,6 @@ 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/accountemoticonmodel.h

@@ -0,0 +1,104 @@
+// SPDX-FileCopyrightText: 2023 Tobias Fella <tobias.fella@kde.org>
+// SPDX-License-Identifier: LGPL-2.0-or-later
+
+#pragma once
+
+#include "events/imagepackevent.h"
+
+#include <QAbstractListModel>
+#include <QCoroTask>
+#include <QList>
+#include <QObject>
+#include <QPointer>
+#include <QQmlEngine>
+
+class NeoChatConnection;
+
+/**
+ * @class AccountEmoticonModel
+ *
+ * This class defines the model for visualising the account stickers and emojis.
+ *
+ * This is based upon the im.ponies.user_emotes spec (MSC2545).
+ */
+class AccountEmoticonModel : public QAbstractListModel
+{
+    Q_OBJECT
+    QML_ELEMENT
+
+    /**
+     * @brief The connection to get emoticons from.
+     */
+    Q_PROPERTY(NeoChatConnection *connection READ connection WRITE setConnection NOTIFY connectionChanged)
+
+public:
+    enum Roles {
+        UrlRole = Qt::UserRole + 1, /**< The URL for the emoticon. */
+        ShortCodeRole, /**< The shortcode for the emoticon. */
+        BodyRole, //**< A textual description of the emoticon */
+        IsStickerRole, //**< Whether this emoticon is a sticker */
+        IsEmojiRole, //**< Whether this emoticon is an emoji */
+    };
+
+    explicit AccountEmoticonModel(QObject *parent = nullptr);
+
+    /**
+     * @brief Number of rows in the model.
+     *
+     * @sa QAbstractItemModel::rowCount
+     */
+    [[nodiscard]] int rowCount(const QModelIndex &index) const override;
+
+    /**
+     * @brief Get the given role value at the given index.
+     *
+     * @sa QAbstractItemModel::data
+     */
+    [[nodiscard]] QVariant data(const QModelIndex &index, int role) const override;
+
+    /**
+     * @brief Returns a mapping from Role enum values to role names.
+     *
+     * @sa Roles, QAbstractItemModel::roleNames()
+     */
+    [[nodiscard]] QHash<int, QByteArray> roleNames() const override;
+
+    [[nodiscard]] NeoChatConnection *connection() const;
+    void setConnection(NeoChatConnection *connection);
+
+    /**
+     * @brief Deletes the emoticon at the given index.
+     */
+    Q_INVOKABLE void deleteEmoticon(int index);
+
+    /**
+     * @brief Changes the description for the emoticon at the given index.
+     */
+    Q_INVOKABLE void setEmoticonBody(int index, const QString &text);
+
+    /**
+     * @brief Changes the shortcode for the emoticon at the given index.
+     */
+    Q_INVOKABLE void setEmoticonShortcode(int index, const QString &shortCode);
+
+    /**
+     * @brief Changes the image for the emoticon at the given index.
+     */
+    Q_INVOKABLE void setEmoticonImage(int index, const QUrl &source);
+
+    /**
+     * @brief Add an emoticon with the given parameters.
+     */
+    Q_INVOKABLE void addEmoticon(const QUrl &source, const QString &shortcode, const QString &description, const QString &type);
+
+Q_SIGNALS:
+    void connectionChanged();
+
+private:
+    std::optional<Quotient::ImagePackEventContent> m_images;
+    QPointer<NeoChatConnection> m_connection;
+    QCoro::Task<void> doSetEmoticonImage(int index, QUrl source);
+    QCoro::Task<void> doAddEmoticon(QUrl source, QString shortcode, QString description, QString type);
+
+    void reloadEmoticons();
+};

src/models/accountimagepackmodel.cpp

@@ -1,66 +0,0 @@
-// SPDX-FileCopyrightText: 2023 Tobias Fella <tobias.fella@kde.org>
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "accountimagepackmodel.h"
-
-#include <KLocalizedString>
-
-#include "imagecontentmanager.h"
-
-QVariant AccountImagePackModel::data(const QModelIndex &index, int role) const
-{
-    Q_UNUSED(index);
-    if (role == ImageContentPackRole::DisplayNameRole) {
-        return i18n("Your Emojis");
-    }
-    if (role == ImageContentPackRole::IconRole) {
-        return imageContentManager.accountImagesAvatar();
-    }
-    if (role == ImageContentPackRole::IdentifierRole) {
-        return QStringLiteral("account");
-    }
-    if (role == ImageContentPackRole::IsEmojiRole) {
-        for (const auto &image : imageContentManager.accountImages()) {
-            if (!image.usage || image.usage->isEmpty() || image.usage->contains(QStringLiteral("emoticon"))) {
-                return true;
-            }
-        }
-        return false;
-    }
-    if (role == ImageContentPackRole::IsStickerRole) {
-        for (const auto &image : imageContentManager.accountImages()) {
-            if (!image.usage || image.usage->isEmpty() || image.usage->contains(QStringLiteral("sticker"))) {
-                return true;
-            }
-        }
-        return false;
-    }
-    if (role == ImageContentPackRole::IsEmptyRole) {
-        return imageContentManager.accountImages().size() == 0;
-    }
-    return {};
-}
-
-int AccountImagePackModel::rowCount(const QModelIndex &index) const
-{
-    Q_UNUSED(index);
-    return ImageContentManager::instance().accountImages().size() > 0 ? 1 : 0;
-}
-
-QHash<int, QByteArray> AccountImagePackModel::roleNames() const
-{
-    return {
-        {ImageContentPackRole::DisplayNameRole, "displayName"},
-        {ImageContentPackRole::IconRole, "emoji"},
-        {ImageContentPackRole::IdentifierRole, "identifier"},
-    };
-}
-
-AccountImagePackModel::AccountImagePackModel(QObject *parent)
-    : QAbstractListModel(parent)
-{
-    connect(&ImageContentManager::instance(), &ImageContentManager::accountImagesChanged, this, [this]() {
-        beginResetModel();
-        endResetModel();
-    });
-}

src/models/accountimagepackmodel.h

@@ -1,38 +0,0 @@
-// SPDX-FileCopyrightText: 2023 Tobias Fella <tobias.fella@kde.org>
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include <QAbstractListModel>
-
-class AccountImagePackModel : public QAbstractListModel
-{
-    Q_OBJECT
-
-    /**
-     * Note: This model uses the ImagePackRoles from ImageContentManager as roles.
-     */
-public:
-    explicit AccountImagePackModel(QObject *parent = nullptr);
-
-    /**
-     * @brief Get the given role value at the given index.
-     *
-     * @sa QAbstractItemModel::data
-     */
-    [[nodiscard]] QVariant data(const QModelIndex &index, int role) const override;
-
-    /**
-     * @brief Number of rows in the model.
-     *
-     * @sa QAbstractItemModel::rowCount
-     */
-    [[nodiscard]] int rowCount(const QModelIndex &index) const override;
-
-    /**
-     * @brief Returns a mapping from Role enum values to role names.
-     *
-     * @sa Roles, QAbstractItemModel::roleNames()
-     */
-    [[nodiscard]] QHash<int, QByteArray> roleNames() const override;
-};

src/models/actionsmodel.cpp

@@ -109,11 +109,10 @@ 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.
-            room->postMessage(QStringLiteral("/rainbow %1").arg(text),
-                              rainbowText,
-                              RoomMessageEvent::MsgType::Text,
-                              chatBarCache->replyId(),
-                              chatBarCache->editId());
+            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);
             return QString();
         },
         false,
@@ -129,11 +128,10 @@ 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.
-            room->postMessage(QStringLiteral("/rainbow %1").arg(text),
-                              rainbowText,
-                              RoomMessageEvent::MsgType::Emote,
-                              chatBarCache->replyId(),
-                              chatBarCache->editId());
+            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);
             return QString();
         },
         false,
@@ -144,7 +142,7 @@ QList<ActionsModel::Action> actions{
     Action{
         QStringLiteral("plain"),
         [](const QString &text, NeoChatRoom *room, ChatBarCache *) {
-            room->postMessage(text, text.toHtmlEscaped(), RoomMessageEvent::MsgType::Text, {}, {});
+            room->postPlainText(text.toHtmlEscaped());
             return QString();
         },
         false,
@@ -156,11 +154,10 @@ 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.
-            room->postMessage(QStringLiteral("/spoiler %1").arg(text),
-                              QStringLiteral("<span data-mx-spoiler>%1</span>").arg(text),
-                              RoomMessageEvent::MsgType::Text,
-                              chatBarCache->replyId(),
-                              chatBarCache->editId());
+            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);
             return QString();
         },
         false,
@@ -605,15 +602,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) {
-                            room->postHtmlMessage(messageText, originalString.replace(regex, replacement), event->msgtype(), {}, replaceId);
+                            content = std::make_unique<Quotient::EventContent::TextContent>(originalString.replace(regex, replacement), u"text/html"_s);
                         } else {
-                            room->postHtmlMessage(messageText,
-                                                  originalString.replace(originalString.indexOf(regex), regex.size(), replacement),
-                                                  event->msgtype(),
-                                                  {},
-                                                  replaceId);
+                            content = std::make_unique<Quotient::EventContent::TextContent>(originalString.replace(regex, replacement), u"text/html"_s);
                         }
+                        Quotient::EventRelation relatesTo = Quotient::EventRelation::replace(replaceId);
+                        room->post<Quotient::RoomMessageEvent>(messageText, event->msgtype(), std::move(content), relatesTo);
                         return true;
                     }
                 }

src/models/allimagecontentmodel.cpp

@@ -1,56 +0,0 @@
-// SPDX-FileCopyrightText: 2023 Tobias Fella <tobias.fella@kde.org>
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "allimagecontentmodel.h"
-
-#include "imagecontentmanager.h"
-
-// TODO custom emojis
-
-AllImageContentModel::AllImageContentModel(QObject *parent)
-    : QAbstractListModel(parent)
-{
-    // TODO connect to custom emojis changing;
-}
-
-QVariant AllImageContentModel::data(const QModelIndex &index, int role) const
-{
-    auto row = index.row();
-    for (const auto &category : ImageContentManager::instance().emojis()) {
-        if (row >= category.size()) {
-            row -= category.size();
-            continue;
-        }
-        if (role == ImageContentRole::DisplayNameRole) {
-            return category[row].displayName;
-        }
-        if (role == ImageContentRole::EmojiRole) {
-            return category[row].text;
-        }
-        if (role == ImageContentRole::IsStickerRole) {
-            return false;
-        }
-        if (role == ImageContentRole::IsEmojiRole) {
-            return true;
-        }
-    }
-    return {};
-}
-
-int AllImageContentModel::rowCount(const QModelIndex &index) const
-{
-    Q_UNUSED(index);
-    auto sum = 0;
-    for (const auto &category : ImageContentManager::instance().emojis()) {
-        sum += category.size();
-    }
-    return sum;
-}
-
-QHash<int, QByteArray> AllImageContentModel::roleNames() const
-{
-    return {
-        {ImageContentRole::DisplayNameRole, "displayName"},
-        {ImageContentRole::EmojiRole, "text"},
-    };
-}

src/models/allimagecontentmodel.h

@@ -1,35 +0,0 @@
-// SPDX-FileCopyrightText: 2023 Tobias Fella <tobias.fella@kde.org>
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include <QAbstractListModel>
-
-class AllImageContentModel : public QAbstractListModel
-{
-    Q_OBJECT
-
-public:
-    explicit AllImageContentModel(QObject *parent = nullptr);
-
-    /**
-     * @brief Get the given role value at the given index.
-     *
-     * @sa QAbstractItemModel::data
-     */
-    [[nodiscard]] QVariant data(const QModelIndex &index, int role) const override;
-
-    /**
-     * @brief Number of rows in the model.
-     *
-     * @sa QAbstractItemModel::rowCount
-     */
-    [[nodiscard]] int rowCount(const QModelIndex &index) const override;
-
-    /**
-     * @brief Returns a mapping from Role enum values to role names.
-     *
-     * @sa Roles, QAbstractItemModel::roleNames()
-     */
-    [[nodiscard]] QHash<int, QByteArray> roleNames() const override;
-};

src/models/completionmodel.cpp

@@ -6,7 +6,8 @@
 
 #include "actionsmodel.h"
 #include "completionproxymodel.h"
-// #include "emojimodel.h"
+#include "customemojimodel.h"
+#include "emojimodel.h"
 #include "neochatroom.h"
 #include "roommanager.h"
 #include "userlistmodel.h"
@@ -15,13 +16,11 @@ CompletionModel::CompletionModel(QObject *parent)
     : QAbstractListModel(parent)
     , m_filterModel(new CompletionProxyModel())
     , m_userListModel(RoomManager::instance().userListModel())
-//, m_emojiModel(new QConcatenateTablesProxyModel(this))
+    , m_emojiModel(new QConcatenateTablesProxyModel(this))
 {
     connect(this, &CompletionModel::textChanged, this, &CompletionModel::updateCompletion);
-    connect(this, &CompletionModel::roomChanged, this, [this]() {
-        m_userListModel->setRoom(m_room);
-    });
-    // TODO m_emojiModel->addSourceModel(&EmojiModel::instance());
+    m_emojiModel->addSourceModel(&CustomEmojiModel::instance());
+    m_emojiModel->addSourceModel(&EmojiModel::instance());
 }
 
 QString CompletionModel::text() const
@@ -89,20 +88,20 @@ QVariant CompletionModel::data(const QModelIndex &index, int role) const
             return m_filterModel->data(filterIndex, RoomListModel::AvatarRole).toString();
         }
     }
-    // if (m_autoCompletionType == Emoji) {
-    //     if (role == DisplayNameRole) {
-    //         return m_filterModel->data(filterIndex, CustomEmojiModel::DisplayRole);
-    //     }
-    //     if (role == IconNameRole) {
-    //         return m_filterModel->data(filterIndex, CustomEmojiModel::MxcUrl);
-    //     }
-    //     if (role == ReplacedTextRole) {
-    //         return m_filterModel->data(filterIndex, CustomEmojiModel::ReplacedTextRole);
-    //     }
-    //     if (role == SubtitleRole) {
-    //         // TODO return m_filterModel->data(filterIndex, EmojiModel::DescriptionRole);
-    //     }
-    // }
+    if (m_autoCompletionType == Emoji) {
+        if (role == DisplayNameRole) {
+            return m_filterModel->data(filterIndex, CustomEmojiModel::DisplayRole);
+        }
+        if (role == IconNameRole) {
+            return m_filterModel->data(filterIndex, CustomEmojiModel::MxcUrl);
+        }
+        if (role == ReplacedTextRole) {
+            return m_filterModel->data(filterIndex, CustomEmojiModel::ReplacedTextRole);
+        }
+        if (role == SubtitleRole) {
+            return m_filterModel->data(filterIndex, EmojiModel::DescriptionRole);
+        }
+    }
 
     return {};
 }
@@ -148,8 +147,8 @@ void CompletionModel::updateCompletion()
                    || (m_fullText.indexOf(QLatin1Char(' ')) != -1 && m_fullText.indexOf(QLatin1Char(':'), 1) > m_fullText.indexOf(QLatin1Char(' '), 1)))) {
         m_filterModel->setSourceModel(m_emojiModel);
         m_autoCompletionType = Emoji;
-        // m_filterModel->setFilterRole(CustomEmojiModel::Name);
-        //  TODO m_filterModel->setSecondaryFilterRole(EmojiModel::DescriptionRole);
+        m_filterModel->setFilterRole(CustomEmojiModel::Name);
+        m_filterModel->setSecondaryFilterRole(EmojiModel::DescriptionRole);
         m_filterModel->setFullText(m_fullText);
         m_filterModel->setFilterText(m_text);
         m_filterModel->invalidate();

src/models/customemojimodel.h

@@ -0,0 +1,116 @@
+// SPDX-FileCopyrightText: 2021 Carson Black <uhhadd@gmail.com>
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include <QAbstractListModel>
+#include <QQmlEngine>
+#include <QRegularExpression>
+
+#include "neochatconnection.h"
+
+struct CustomEmoji {
+    QString name; // with :semicolons:
+    QString url; // mxc://
+    QRegularExpression regexp;
+
+    Q_GADGET
+    Q_PROPERTY(QString unicode MEMBER url)
+    Q_PROPERTY(QString name MEMBER name)
+};
+
+/**
+ * @class CustomEmojiModel
+ *
+ * This class defines the model for custom user emojis.
+ *
+ * This is based upon the im.ponies.user_emotes spec (MSC2545).
+ */
+class CustomEmojiModel : public QAbstractListModel
+{
+    Q_OBJECT
+    QML_ELEMENT
+    QML_SINGLETON
+
+    Q_PROPERTY(NeoChatConnection *connection READ connection WRITE setConnection NOTIFY connectionChanged)
+
+public:
+    /**
+     * @brief Defines the model roles.
+     */
+    enum Roles {
+        Name = Qt::DisplayRole, /**< The name of the emoji. */
+        ImageURL, /**< The URL for the custom emoji. */
+        ModelData, /**< for emulating the regular emoji model's usage, otherwise the UI code would get too complicated. */
+        MxcUrl = 50, /**< The mxc source URL for the custom emoji. */
+        DisplayRole = 51, /**< The name of the emoji. For compatibility with EmojiModel. */
+        ReplacedTextRole = 52, /**< The name of the emoji. For compatibility with EmojiModel. */
+        DescriptionRole = 53, /**< Invalid, reserved. For compatibility with EmojiModel. */
+    };
+    Q_ENUM(Roles)
+
+    static CustomEmojiModel &instance()
+    {
+        static CustomEmojiModel _instance;
+        return _instance;
+    }
+    static CustomEmojiModel *create(QQmlEngine *engine, QJSEngine *)
+    {
+        engine->setObjectOwnership(&instance(), QQmlEngine::CppOwnership);
+        return &instance();
+    }
+
+    /**
+     * @brief Get the given role value at the given index.
+     *
+     * @sa QAbstractItemModel::data
+     */
+    QVariant data(const QModelIndex &idx, int role = Qt::DisplayRole) const override;
+
+    /**
+     * @brief Number of rows in the model.
+     *
+     * @sa  QAbstractItemModel::rowCount
+     */
+    int rowCount(const QModelIndex &parent = QModelIndex()) const override;
+
+    /**
+     * @brief Returns a mapping from Role enum values to role names.
+     *
+     * @sa Roles, QAbstractItemModel::roleNames()
+     */
+    QHash<int, QByteArray> roleNames() const override;
+
+    /**
+     * @brief Substitute any custom emojis for an image in the input text.
+     */
+    Q_INVOKABLE QString preprocessText(QString text);
+
+    /**
+     * @brief Return a list of custom emojis where the name contains the filter text.
+     */
+    Q_INVOKABLE QVariantList filterModel(const QString &filter);
+
+    /**
+     * @brief Add a new emoji to the model.
+     */
+    Q_INVOKABLE void addEmoji(const QString &name, const QUrl &location);
+
+    /**
+     * @brief Remove an emoji from the model.
+     */
+    Q_INVOKABLE void removeEmoji(const QString &name);
+
+    void setConnection(NeoChatConnection *connection);
+    NeoChatConnection *connection() const;
+
+Q_SIGNALS:
+    void connectionChanged();
+
+private:
+    explicit CustomEmojiModel(QObject *parent = nullptr);
+    QList<CustomEmoji> m_emojis;
+    QPointer<NeoChatConnection> m_connection;
+
+    void fetchEmojis();
+};

src/models/emojipacksmodel.cpp

@@ -1,56 +0,0 @@
-// SPDX-FileCopyrightText: 2023 Tobias Fella <tobias.fella@kde.org>
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "emojipacksmodel.h"
-
-#include <QDebug>
-
-#include <KLocalizedString>
-
-#include "imagecontentmanager.h"
-
-EmojiPacksModel::EmojiPacksModel(QObject *parent)
-    : QAbstractListModel(parent)
-{
-}
-
-QVariant EmojiPacksModel::data(const QModelIndex &index, int role) const
-{
-    const auto row = index.row();
-
-    const auto &category = ImageContentManager::instance().emojiPacks()[row];
-    if (role == ImageContentPackRole::DisplayNameRole) {
-        return category.description;
-    }
-    if (role == ImageContentPackRole::IconRole) {
-        return category.icon;
-    }
-    if (role == ImageContentPackRole::IdentifierRole) {
-        return category.stateKey;
-    }
-    if (role == ImageContentPackRole::IsStickerRole) {
-        return false;
-    }
-    if (role == ImageContentPackRole::IsEmojiRole) {
-        return true;
-    }
-    if (role == ImageContentPackRole::IsEmptyRole) {
-        return false;
-    }
-    return {};
-}
-
-int EmojiPacksModel::rowCount(const QModelIndex &index) const
-{
-    Q_UNUSED(index);
-    return ImageContentManager::instance().emojiPacks().count();
-}
-
-QHash<int, QByteArray> EmojiPacksModel::roleNames() const
-{
-    return {
-        {ImageContentPackRole::DisplayNameRole, "displayName"},
-        {ImageContentPackRole::IconRole, "icon"},
-        {ImageContentPackRole::IdentifierRole, "identifier"},
-    };
-}

src/models/emojipacksmodel.h

@@ -1,35 +0,0 @@
-// SPDX-FileCopyrightText: 2023 Tobias Fella <tobias.fella@kde.org>
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include <QAbstractListModel>
-
-class EmojiPacksModel : public QAbstractListModel
-{
-    Q_OBJECT
-
-public:
-    explicit EmojiPacksModel(QObject *parent = nullptr);
-
-    /**
-     * @brief Get the given role value at the given index.
-     *
-     * @sa QAbstractItemModel::data
-     */
-    [[nodiscard]] QVariant data(const QModelIndex &index, int role) const override;
-
-    /**
-     * @brief Number of rows in the model.
-     *
-     * @sa QAbstractItemModel::rowCount
-     */
-    [[nodiscard]] int rowCount(const QModelIndex &index) const override;
-
-    /**
-     * @brief Returns a mapping from Role enum values to role names.
-     *
-     * @sa Roles, QAbstractItemModel::roleNames()
-     */
-    [[nodiscard]] QHash<int, QByteArray> roleNames() const override;
-};

src/models/emoticonfiltermodel.cpp

@@ -0,0 +1,57 @@
+// SPDX-FileCopyrightText: 2023 Tobias Fella <tobias.fella@kde.org>
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "emoticonfiltermodel.h"
+
+#include "accountemoticonmodel.h"
+#include "stickermodel.h"
+
+EmoticonFilterModel::EmoticonFilterModel(QObject *parent)
+    : QSortFilterProxyModel(parent)
+{
+    connect(this, &EmoticonFilterModel::sourceModelChanged, this, [this]() {
+        if (dynamic_cast<StickerModel *>(sourceModel())) {
+            m_stickerRole = StickerModel::IsStickerRole;
+            m_emojiRole = StickerModel::IsEmojiRole;
+        } else {
+            m_stickerRole = AccountEmoticonModel::IsStickerRole;
+            m_emojiRole = AccountEmoticonModel::IsEmojiRole;
+        }
+    });
+}
+
+bool EmoticonFilterModel::filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const
+{
+    Q_UNUSED(sourceParent);
+    auto stickerUsage = sourceModel()->data(sourceModel()->index(sourceRow, 0), m_stickerRole).toBool();
+    auto emojiUsage = sourceModel()->data(sourceModel()->index(sourceRow, 0), m_emojiRole).toBool();
+    return (stickerUsage && m_showStickers) || (emojiUsage && m_showEmojis);
+}
+
+bool EmoticonFilterModel::showStickers() const
+{
+    return m_showStickers;
+}
+
+void EmoticonFilterModel::setShowStickers(bool showStickers)
+{
+    beginResetModel();
+    m_showStickers = showStickers;
+    endResetModel();
+    Q_EMIT showStickersChanged();
+}
+
+bool EmoticonFilterModel::showEmojis() const
+{
+    return m_showEmojis;
+}
+
+void EmoticonFilterModel::setShowEmojis(bool showEmojis)
+{
+    beginResetModel();
+    m_showEmojis = showEmojis;
+    endResetModel();
+    Q_EMIT showEmojisChanged();
+}
+
+#include "moc_emoticonfiltermodel.cpp"

src/models/historyimagepackmodel.cpp

@@ -1,53 +0,0 @@
-// SPDX-FileCopyrightText: 2023 Tobias Fella <tobias.fella@kde.org>
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "historyimagepackmodel.h"
-
-#include <KLocalizedString>
-
-#include "imagecontentmanager.h"
-
-QVariant HistoryImagePackModel::data(const QModelIndex &index, int role) const
-{
-    Q_UNUSED(index);
-    if (role == ImageContentPackRole::DisplayNameRole) {
-        return i18n("History");
-    }
-    if (role == ImageContentPackRole::IconRole) {
-        return QStringLiteral("⌛");
-    }
-    if (role == ImageContentPackRole::IdentifierRole) {
-        return QStringLiteral("history");
-    }
-    if (role == ImageContentPackRole::IsStickerRole) {
-        return true;
-    }
-    if (role == ImageContentPackRole::IsEmojiRole) {
-        return true;
-    }
-    if (role == ImageContentPackRole::IsEmptyRole) {
-        //TODO listen?
-        return imageContentManager.recentEmojis().size() == 0;
-    }
-    return {};
-}
-
-int HistoryImagePackModel::rowCount(const QModelIndex &index) const
-{
-    Q_UNUSED(index);
-    return 1;
-}
-
-QHash<int, QByteArray> HistoryImagePackModel::roleNames() const
-{
-    return {
-        {ImageContentPackRole::DisplayNameRole, "displayName"},
-        {ImageContentPackRole::IconRole, "emoji"},
-        {ImageContentPackRole::IdentifierRole, "identifier"},
-    };
-}
-
-HistoryImagePackModel::HistoryImagePackModel(QObject *parent)
-    : QAbstractListModel(parent)
-{
-}

src/models/historyimagepackmodel.h

@@ -1,35 +0,0 @@
-// SPDX-FileCopyrightText: 2023 Tobias Fella <tobias.fella@kde.org>
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include <QAbstractListModel>
-
-class HistoryImagePackModel : public QAbstractListModel
-{
-    Q_OBJECT
-
-public:
-    explicit HistoryImagePackModel(QObject *parent = nullptr);
-
-    /**
-     * @brief Get the given role value at the given index.
-     *
-     * @sa QAbstractItemModel::data
-     */
-    [[nodiscard]] QVariant data(const QModelIndex &index, int role) const override;
-
-    /**
-     * @brief Number of rows in the model.
-     *
-     * @sa QAbstractItemModel::rowCount
-     */
-    [[nodiscard]] int rowCount(const QModelIndex &index) const override;
-
-    /**
-     * @brief Returns a mapping from Role enum values to role names.
-     *
-     * @sa Roles, QAbstractItemModel::roleNames()
-     */
-    [[nodiscard]] QHash<int, QByteArray> roleNames() const override;
-};

src/models/imagecontentfiltermodel.cpp

@@ -1,91 +0,0 @@
-// SPDX-FileCopyrightText: 2024 Tobias Fella <tobias.fella@kde.org>
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "imagecontentfiltermodel.h"
-
-#include "imagecontentmanager.h"
-
-ImageContentFilterModel::ImageContentFilterModel(QObject *parent)
-    : QSortFilterProxyModel(parent)
-{
-    updateSourceModel();
-}
-
-bool ImageContentFilterModel::filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const
-{
-    Q_UNUSED(sourceParent);
-    auto index = sourceModel()->index(sourceRow, 0);
-    return ((index.data(ImageContentRole::IsEmojiRole).toBool() && emojis()) || (index.data(ImageContentRole::IsStickerRole).toBool() && stickers()))
-        && sourceModel()->index(sourceRow, 0).data(ImageContentRole::DisplayNameRole).toString().contains(m_searchText, Qt::CaseInsensitive);
-}
-
-bool ImageContentFilterModel::stickers() const
-{
-    return m_stickers;
-}
-
-void ImageContentFilterModel::setStickers(bool stickers)
-{
-    m_stickers = stickers;
-    Q_EMIT stickersChanged();
-    invalidateFilter();
-}
-
-bool ImageContentFilterModel::emojis() const
-{
-    return m_emojis;
-}
-
-void ImageContentFilterModel::setEmojis(bool emojis)
-{
-    m_emojis = emojis;
-    Q_EMIT emojisChanged();
-    invalidateFilter();
-}
-
-void ImageContentFilterModel::setCategory(const QString &category)
-{
-    if (category == m_category) {
-        return;
-    }
-    m_category = category;
-    Q_EMIT categoryChanged();
-    updateSourceModel();
-}
-
-QString ImageContentFilterModel::category() const
-{
-    return m_category;
-}
-
-void ImageContentFilterModel::setSearchText(const QString &searchText)
-{
-    if (searchText == m_searchText) {
-        return;
-    }
-    m_searchText = searchText;
-    Q_EMIT searchTextChanged();
-    invalidateFilter();
-    updateSourceModel();
-}
-
-QString ImageContentFilterModel::searchText() const
-{
-    return m_searchText;
-}
-
-void ImageContentFilterModel::updateSourceModel()
-{
-    if (!m_searchText.isEmpty()) {
-        if (sourceModel() != &m_allImageContentModel) {
-            setSourceModel(&m_allImageContentModel);
-        }
-    } else if (m_category == QStringLiteral("history")) {
-        setSourceModel(&m_recentImageContentProxyModel);
-    } else {
-        if (sourceModel() != &m_imageContentModel) {
-            setSourceModel(&m_imageContentModel);
-        }
-        m_imageContentModel.setCategory(m_category);
-    }
-}

src/models/imagecontentfiltermodel.h

@@ -1,57 +0,0 @@
-// SPDX-FileCopyrightText: 2024 Tobias Fella <tobias.fella@kde.org>
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include <QSortFilterProxyModel>
-#include <QQmlEngine>
-
-#include "allimagecontentmodel.h"
-#include "imagecontentmodel.h"
-#include "recentimagecontentproxymodel.h"
-
-class ImageContentFilterModel : public QSortFilterProxyModel
-{
-    Q_OBJECT
-    QML_ELEMENT
-
-    Q_PROPERTY(bool stickers READ stickers WRITE setStickers NOTIFY stickersChanged)
-    Q_PROPERTY(bool emojis READ emojis WRITE setEmojis NOTIFY emojisChanged)
-    Q_PROPERTY(QString category READ category WRITE setCategory NOTIFY categoryChanged)
-    Q_PROPERTY(QString searchText READ searchText WRITE setSearchText NOTIFY searchTextChanged)
-
-public:
-    explicit ImageContentFilterModel(QObject *parent = nullptr);
-
-    bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const override;
-
-    [[nodiscard]] bool stickers() const;
-    void setStickers(bool stickers);
-
-    [[nodiscard]] bool emojis() const;
-    void setEmojis(bool emojis);
-
-    QString category() const;
-    void setCategory(const QString &category);
-
-    QString searchText() const;
-    void setSearchText(const QString &text);
-
-Q_SIGNALS:
-    void stickersChanged();
-    void emojisChanged();
-    void categoryChanged();
-    void searchTextChanged();
-
-private:
-    bool m_stickers = true;
-    bool m_emojis = true;
-    QString m_category;
-    QString m_searchText;
-
-    AllImageContentModel m_allImageContentModel;
-    RecentImageContentProxyModel m_recentImageContentProxyModel;
-    ImageContentModel m_imageContentModel;
-
-    void updateSourceModel();
-};

src/models/imagecontentmodel.cpp

@@ -1,164 +0,0 @@
-// SPDX-FileCopyrightText: 2023 Tobias Fella <tobias.fella@kde.org>
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "imagecontentmodel.h"
-
-#include <QDebug>
-
-#include <Quotient/connection.h>
-
-#include "controller.h"
-#include "imagecontentmanager.h"
-
-ImageContentModel::ImageContentModel(QObject *parent)
-    : QAbstractListModel(parent)
-{
-}
-
-int ImageContentModel::rowCount(const QModelIndex &parent) const
-{
-    Q_UNUSED(parent);
-    if (m_category == QStringLiteral("account")) {
-        return imageContentManager.accountImages().size();
-    }
-    if (m_category.contains(u'@')) {
-        return imageContentManager.roomImages()[{m_roomId, m_stateKey}].size();
-    }
-    return imageContentManager.emojis()[m_category].count();
-}
-
-QVariant ImageContentModel::emojiData(int row, int role) const
-{
-    const auto emoji = imageContentManager.emojis()[m_category][row];
-    if (role == ImageContentRole::DisplayNameRole) {
-        return emoji.displayName;
-    }
-    if (role == ImageContentRole::EmojiRole) {
-        return emoji.text;
-    }
-    if (role == ImageContentRole::IsCustomRole) {
-        return false;
-    }
-    if (role == ImageContentRole::IsEmojiRole) {
-        return true;
-    }
-    if (role == ImageContentRole::IsStickerRole) {
-        return false;
-    }
-    if (role == ImageContentRole::HasTonesRole) {
-        return true; // TODO
-    }
-    return {};
-}
-
-QVariant ImageContentModel::accountData(int row, int role) const
-{
-    const auto &image = imageContentManager.accountImages()[row];
-    if (role == ImageContentRole::DisplayNameRole) {
-        return image.shortcode;
-    }
-    if (role == ImageContentRole::EmojiRole) {
-        return QStringLiteral("<img src=\"%1\" height=\"32\" width=\"32\"/>")
-            .arg(Controller::instance().activeConnection()->makeMediaUrl(image.url).toString());
-    }
-    if (role == ImageContentRole::ShortCodeRole) {
-        return image.shortcode;
-    }
-    if (role == ImageContentRole::IsCustomRole) {
-        return true;
-    }
-    if (role == ImageContentRole::IsEmojiRole) {
-        return !image.usage || image.usage->isEmpty() || image.usage->contains(QStringLiteral("emoticon"));
-    }
-    if (role == ImageContentRole::IsStickerRole) {
-        return !image.usage || image.usage->isEmpty() || image.usage->contains(QStringLiteral("sticker"));
-    }
-    return {};
-}
-
-QVariant ImageContentModel::roomData(int row, int role) const
-{
-    const auto image = imageContentManager.roomImages()[{m_roomId, m_stateKey}][row];
-    if (role == ImageContentRole::DisplayNameRole) {
-        return image.shortcode;
-    }
-    if (role == ImageContentRole::EmojiRole) {
-        return QStringLiteral("<img src=\"%1\" height=\"32\" width=\"32\"/>")
-            .arg(Controller::instance().activeConnection()->makeMediaUrl(image.url).toString());
-    }
-    if (role == ImageContentRole::ShortCodeRole) {
-        return image.shortcode;
-    }
-    if (role == ImageContentRole::IsCustomRole) {
-        return true;
-    }
-    if (role == ImageContentRole::IsEmojiRole) {
-        return true; // For room image packs, we're ignoring the usage of the individual images.
-    }
-    if (role == ImageContentRole::IsStickerRole) {
-        return true;
-    }
-    return {};
-}
-
-QVariant ImageContentModel::data(const QModelIndex &index, int role) const
-{
-    const auto &row = index.row();
-    if (m_category == QStringLiteral("account")) {
-        return accountData(row, role);
-    }
-    if (m_category.contains(u'@')) {
-        return roomData(row, role);
-    }
-    return emojiData(row, role);
-}
-
-QHash<int, QByteArray> ImageContentModel::roleNames() const
-{
-    return {
-        {ImageContentRole::DisplayNameRole, "displayName"},
-        {ImageContentRole::EmojiRole, "text"},
-        {ImageContentRole::ShortCodeRole, "shortCode"},
-        {ImageContentRole::IsCustomRole, "isCustom"},
-        {ImageContentRole::IsStickerRole, "isSticker"},
-        {ImageContentRole::IsEmojiRole, "isEmoji"},
-        {ImageContentRole::HasTonesRole, "hasTones"},
-    };
-}
-
-QString ImageContentModel::category() const
-{
-    return m_category;
-}
-
-void ImageContentModel::setCategory(const QString &category)
-{
-    if (category == m_category) {
-        return;
-    }
-
-    beginResetModel();
-    m_category = category;
-    if (m_category.contains(u'@')) {
-        const auto &split = m_category.split(u'@');
-        m_roomId = split[0];
-        m_stateKey = split[1];
-    } else {
-        m_roomId = QString();
-        m_stateKey = QString();
-    }
-    endResetModel();
-
-    if (m_category == QStringLiteral("account")) {
-        connect(&ImageContentManager::instance(), &ImageContentManager::accountImagesChanged, this, [this]() {
-            beginResetModel();
-            endResetModel();
-        });
-    } else {
-        disconnect(&ImageContentManager::instance(), &ImageContentManager::accountImagesChanged, this, nullptr);
-    }
-
-    Q_EMIT categoryChanged();
-}
-
-#include "moc_imagecontentmodel.cpp"

src/models/imagecontentmodel.h

@@ -1,60 +0,0 @@
-// SPDX-FileCopyrightText: 2023 Tobias Fella <tobias.fella@kde.org>
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include <QAbstractListModel>
-#include <QObject>
-#include <QQmlEngine>
-
-/**
- * @class ImageContentModel
- *
- * This class defines the model for visualising a list of emojis.
- */
-class ImageContentModel : public QAbstractListModel
-{
-    Q_OBJECT
-    QML_ELEMENT
-
-    Q_PROPERTY(QString category READ category WRITE setCategory NOTIFY categoryChanged)
-
-public:
-    ImageContentModel(QObject *parent = nullptr);
-
-    /**
-     * @brief Get the given role value at the given index.
-     *
-     * @sa QAbstractItemModel::data
-     */
-    [[nodiscard]] QVariant data(const QModelIndex &idx, int role = Qt::DisplayRole) const override;
-
-    /**
-     * @brief Number of rows in the model.
-     *
-     * @sa  QAbstractItemModel::rowCount
-     */
-    [[nodiscard]] int rowCount(const QModelIndex &parent = QModelIndex()) const override;
-
-    /**
-     * @brief Returns a mapping from Role enum values to role names.
-     *
-     * @sa RoleNames, QAbstractItemModel::roleNames()
-     */
-    [[nodiscard]] QHash<int, QByteArray> roleNames() const override;
-
-    [[nodiscard]] QString category() const;
-    void setCategory(const QString &category);
-
-    QVariant emojiData(int row, int role) const;
-    QVariant accountData(int row, int role) const;
-    QVariant roomData(int row, int role) const;
-
-Q_SIGNALS:
-    void categoryChanged();
-
-private:
-    QString m_category;
-    QString m_roomId;
-    QString m_stateKey;
-};

src/models/imagepackroomsmodel.cpp

@@ -1,68 +0,0 @@
-// SPDX-FileCopyrightText: 2023 Tobias Fella <tobias.fella@kde.org>
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "imagepackroomsmodel.h"
-
-#include <Quotient/connection.h>
-#include <Quotient/room.h>
-
-#include "controller.h"
-#include "imagecontentmanager.h"
-
-using namespace Quotient;
-
-ImagePackRoomsModel::ImagePackRoomsModel(QObject *parent)
-    : QAbstractListModel(parent)
-{
-    connect(&imageContentManager, &ImageContentManager::globalPacksChanged, this, [this]() {
-        beginResetModel();
-        endResetModel();
-    });
-}
-
-QVariant ImagePackRoomsModel::data(const QModelIndex &index, int role) const
-{
-    const auto &row = index.row();
-    const auto &packKey = imageContentManager.globalPacks()[row];
-    if (!imageContentManager.roomImagePacks().contains(packKey.first) || !imageContentManager.roomImagePacks()[packKey.first].contains(packKey.second)) {
-        return false;
-    }
-    const auto &pack = imageContentManager.roomImagePacks()[packKey.first][packKey.second];
-    if (role == ImageContentPackRole::DisplayNameRole) {
-        return pack.description;
-    }
-    if (role == ImageContentPackRole::IconRole) {
-        return pack.icon;
-    }
-    if (role == ImageContentPackRole::IdentifierRole) {
-        return QStringLiteral("%1@%2").arg(pack.roomId, pack.stateKey);
-    }
-    if (role == ImageContentPackRole::IsStickerRole) {
-        return pack.type == ImagePackDescription::Sticker;
-    }
-    if (role == ImageContentPackRole::IsEmojiRole) {
-        return pack.type == ImagePackDescription::Emoji || pack.type == ImagePackDescription::CustomEmoji;
-    }
-    if (role == ImageContentPackRole::IsEmptyRole) {
-        return imageContentManager.roomImages()[packKey].size() == 0;
-    }
-    if (role == ImageContentPackRole::IsGlobalPackRole) {
-        return true;
-    }
-    return {};
-}
-
-int ImagePackRoomsModel::rowCount(const QModelIndex &index) const
-{
-    Q_UNUSED(index);
-    return imageContentManager.globalPacks().size();
-}
-
-QHash<int, QByteArray> ImagePackRoomsModel::roleNames() const
-{
-    return {
-        {ImageContentPackRole::DisplayNameRole, "displayName"},
-        {ImageContentPackRole::IconRole, "emoji"}, // TODO rename
-        {ImageContentPackRole::IdentifierRole, "identifier"},
-    };
-}

src/models/imagepackroomsmodel.h

@@ -1,42 +0,0 @@
-// SPDX-FileCopyrightText: 2023 Tobias Fella <tobias.fella@kde.org>
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include "imagecontentmanager.h"
-#include <QAbstractListModel>
-
-/**
- * Lists the custom emoji/sticker packs from other rooms as marked in the account data.
- * Not to be confused with the packs for this room (-> RoomEmoticonsCategoryModel)
- *
- * Note: This model uses the ImagePackRoles from ImageContentManager as roles.
- */
-class ImagePackRoomsModel : public QAbstractListModel
-{
-    Q_OBJECT
-
-public:
-    explicit ImagePackRoomsModel(QObject *parent = nullptr);
-
-    /**
-     * @brief Get the given role value at the given index.
-     *
-     * @sa QAbstractItemModel::data
-     */
-    [[nodiscard]] QVariant data(const QModelIndex &index, int role) const override;
-
-    /**
-     * @brief Number of rows in the model.
-     *
-     * @sa QAbstractItemModel::rowCount
-     */
-    [[nodiscard]] int rowCount(const QModelIndex &index) const override;
-
-    /**
-     * @brief Returns a mapping from Role enum values to role names.
-     *
-     * @sa Roles, QAbstractItemModel::roleNames()
-     */
-    [[nodiscard]] QHash<int, QByteArray> roleNames() const override;
-};

src/models/imagepacksmodel.cpp

@@ -1,43 +1,170 @@
-// SPDX-FileCopyrightText: 2023 Tobias Fella <tobias.fella@kde.org>
-// SPDX-License-Identifier: GPL-2.0-or-later
+// SPDX-FileCopyrightText: 2021 Tobias Fella <tobias.fella@kde.org>
+// SPDX-License-Identifier: LGPL-2.0-or-later
 
 #include "imagepacksmodel.h"
+#include "neochatroom.h"
 
-#include "models/accountimagepackmodel.h"
-#include "models/emojipacksmodel.h"
-#include "models/historyimagepackmodel.h"
-#include "models/imagepackroomsmodel.h"
-#include "models/roomimagepacksmodel.h"
+#include <KLocalizedString>
+
+using namespace Quotient;
 
 ImagePacksModel::ImagePacksModel(QObject *parent)
-    : QConcatenateTablesProxyModel(parent)
+    : QAbstractListModel(parent)
 {
-    addSourceModel(new HistoryImagePackModel(parent));
-    addSourceModel(new AccountImagePackModel(parent));
-    m_roomImagePacksModel = new RoomImagePacksModel(parent);
-    addSourceModel(m_roomImagePacksModel);
-    addSourceModel(new ImagePackRoomsModel(parent));
-    addSourceModel(new EmojiPacksModel(parent));
 }
 
-// TODO required?
+int ImagePacksModel::rowCount(const QModelIndex &index) const
+{
+    Q_UNUSED(index);
+    return m_events.count();
+}
+
+QVariant ImagePacksModel::data(const QModelIndex &index, int role) const
+{
+    const auto row = index.row();
+    if (row < 0 || row >= m_events.size()) {
+        return {};
+    }
+    const auto &event = m_events[row];
+    if (role == DisplayNameRole) {
+        if (event.pack->displayName) {
+            return *event.pack->displayName;
+        }
+    }
+    if (role == AvatarUrlRole) {
+        if (event.pack->avatarUrl) {
+            return m_room->connection()->makeMediaUrl(*event.pack->avatarUrl);
+        } else if (!event.images.empty()) {
+            return m_room->connection()->makeMediaUrl(event.images[0].url);
+        }
+    }
+    return {};
+}
+
 QHash<int, QByteArray> ImagePacksModel::roleNames() const
 {
     return {
-        {ImageContentPackRole::DisplayNameRole, "displayName"},
-        {ImageContentPackRole::IconRole, "icon"},
-        {ImageContentPackRole::IdentifierRole, "identifier"},
+        {DisplayNameRole, "displayName"},
+        {AvatarUrlRole, "avatarUrl"},
+        {AttributionRole, "attribution"},
+        {IdRole, "id"},
     };
 }
 
-NeoChatRoom *ImagePacksModel::currentRoom() const
+NeoChatRoom *ImagePacksModel::room() const
 {
-    return m_roomImagePacksModel->currentRoom();
+    return m_room;
 }
 
-void ImagePacksModel::setCurrentRoom(NeoChatRoom *currentRoom)
+void ImagePacksModel::setRoom(NeoChatRoom *room)
 {
-    m_roomImagePacksModel->setCurrentRoom(currentRoom);
-    Q_EMIT currentRoomChanged();
+    if (m_room) {
+        disconnect(m_room, nullptr, this, nullptr);
+        disconnect(m_room->connection(), nullptr, this, nullptr);
+    }
+    m_room = room;
+
+    if (m_room) {
+        connect(m_room->connection(), &Connection::accountDataChanged, this, [this](const QString &type) {
+            if (type == "im.ponies.user_emotes"_ls) {
+                reloadImages();
+            }
+        });
+    }
+    // TODO listen to packs changing
+    reloadImages();
+    Q_EMIT roomChanged();
 }
 
+void ImagePacksModel::reloadImages()
+{
+    if (!m_room) {
+        return;
+    }
+    beginResetModel();
+    m_events.clear();
+
+    // Load emoticons from the account data
+    if (m_room->connection()->hasAccountData("im.ponies.user_emotes"_ls)) {
+        auto json = m_room->connection()->accountData("im.ponies.user_emotes"_ls)->contentJson();
+        json["pack"_ls] = QJsonObject{
+            {"display_name"_ls,
+             m_showStickers ? i18nc("As in 'The user's own Stickers'", "Own Stickers") : i18nc("As in 'The user's own emojis", "Own Emojis")},
+        };
+        const auto &content = ImagePackEventContent(json);
+        if (!content.images.isEmpty()) {
+            m_events += ImagePackEventContent(json);
+        }
+    }
+
+    // Load emoticons from the saved rooms
+    const auto &accountData = m_room->connection()->accountData("im.ponies.emote_rooms"_ls);
+    if (accountData) {
+        const auto &rooms = accountData->contentJson()["rooms"_ls].toObject();
+        for (const auto &roomId : rooms.keys()) {
+            if (roomId == m_room->id()) {
+                continue;
+            }
+            auto packs = rooms[roomId].toObject();
+            const auto &stickerRoom = m_room->connection()->room(roomId);
+            if (!stickerRoom) {
+                continue;
+            }
+            for (const auto &packKey : packs.keys()) {
+                if (const auto &pack = stickerRoom->currentState().get<ImagePackEvent>(packKey)) {
+                    const auto packContent = pack->content();
+                    if ((!packContent.pack || !packContent.pack->usage || (packContent.pack->usage->contains("emoticon"_ls) && showEmoticons())
+                         || (packContent.pack->usage->contains("sticker"_ls) && showStickers()))
+                        && !packContent.images.isEmpty()) {
+                        m_events += packContent;
+                    }
+                }
+            }
+        }
+    }
+
+    // Load emoticons from the current room
+    auto events = m_room->currentState().eventsOfType("im.ponies.room_emotes"_ls);
+    for (const auto &event : events) {
+        auto packContent = eventCast<const ImagePackEvent>(event)->content();
+        if (packContent.pack.has_value()) {
+            if (!packContent.pack->usage || (packContent.pack->usage->contains("emoticon"_ls) && showEmoticons())
+                || (packContent.pack->usage->contains("sticker"_ls) && showStickers())) {
+                m_events += packContent;
+            }
+        }
+    }
+    Q_EMIT imagesLoaded();
+    endResetModel();
+}
+
+bool ImagePacksModel::showStickers() const
+{
+    return m_showStickers;
+}
+
+void ImagePacksModel::setShowStickers(bool showStickers)
+{
+    m_showStickers = showStickers;
+    Q_EMIT showStickersChanged();
+}
+
+bool ImagePacksModel::showEmoticons() const
+{
+    return m_showEmoticons;
+}
+
+void ImagePacksModel::setShowEmoticons(bool showEmoticons)
+{
+    m_showEmoticons = showEmoticons;
+    Q_EMIT showEmoticonsChanged();
+}
+QList<Quotient::ImagePackEventContent::ImagePackImage> ImagePacksModel::images(int index)
+{
+    if (index < 0 || index >= m_events.size()) {
+        return {};
+    }
+    return m_events[index].images;
+}
+
+#include "moc_imagepacksmodel.cpp"