GIT_SILENT Sync po/docbooks with svn

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

CMakeLists.txt

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

README.md

@@ -11,7 +11,7 @@ A Qt/QML based Matrix client.
 
 <a href='https://matrix.org'><img src='https://matrix.org/docs/legacy/made-for-matrix.png' alt='Made for Matrix' height=64 target=_blank /></a>
 <a href='https://flathub.org/apps/details/org.kde.neochat'><img width='190px' alt='Download on Flathub' src='https://flathub.org/assets/badges/flathub-badge-i-en.png'/></a>
-<a href='https://snapcraft.io/neochat'><img width='190px' alt='Download on the Snap Store' src='https://snapcraft.io/static/images/badges/en/snap-store-black.svg'/></a>
+<a href='https://snapcraft.io/neochat'><img width='190px' alt='Download on the Snap Store' src='https://apps.kde.org/store_badges/snapstore/en.svg'/></a>
 
 ## Introduction
 

android/build.gradle

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

appiumtests/data/sync_response_rooms.json

@@ -5,6 +5,26 @@
             "!room_id_1234:localhost:1234": {
                 "state": {
                     "events": [
+                        {
+                            "content": {
+                                "m.federate": true,
+                                "predecessor": {
+                                    "event_id": "$something:example.org",
+                                    "room_id": "!oldroom:example.org"
+                                },
+                                "room_version": "11"
+                            },
+                            "event_id": "$143273582443PhrSn:example.org",
+                            "origin_server_ts": 1432735824653,
+                            "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
+                            "sender": "@example:example.org",
+                            "state_key": "",
+                            "type": "m.room.create",
+                            "unsigned": {
+                                "age": 1234,
+                                "membership": "join"
+                            }
+                        },
                         {
                             "type": "m.room.member",
                             "state_key": "@user:localhost:1234",
@@ -26,6 +46,26 @@
                 },
                 "timeline": {
                     "events": [
+                        {
+                            "content": {
+                                "m.federate": true,
+                                "predecessor": {
+                                    "event_id": "$something:example.org",
+                                    "room_id": "!oldroom:example.org"
+                                },
+                                "room_version": "11"
+                            },
+                            "event_id": "$143273582443PhrSn:example.org",
+                            "origin_server_ts": 1432735824653,
+                            "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
+                            "sender": "@example:example.org",
+                            "state_key": "",
+                            "type": "m.room.create",
+                            "unsigned": {
+                                "age": 1234,
+                                "membership": "join"
+                            }
+                        },
                         {
                             "type": "m.room.message",
                             "sender": "@user:localhost:1234",

autotests/texthandlertest.cpp

@@ -63,6 +63,7 @@ private Q_SLOTS:
     void receiveRichEdited();
     void receiveLineSeparator();
     void receiveRichCodeUrl();
+    void receiveRichColor();
 
     void componentOutput_data();
     void componentOutput();
@@ -520,6 +521,25 @@ void TextHandlerTest::receiveRichCodeUrl()
     QCOMPARE(testTextHandler.handleRecieveRichText(), input);
 }
 
+void TextHandlerTest::receiveRichColor()
+{
+    const QString testInputString = QStringLiteral(
+        "<span data-mx-color=\"#ff00be\">¯</span><span data-mx-color=\"#ff3b1d\">\\</span><span data-mx-color=\"#ffa600\">_</span><span "
+        "data-mx-color=\"#64d200\">(</span><span data-mx-color=\"#00e261\">ツ</span><span data-mx-color=\"#00e7ff\">)</span><span "
+        "data-mx-color=\"#00e1ff\">_</span><span data-mx-color=\"#00bdff\">/</span><span data-mx-color=\"#ff60ff\">¯</span>");
+    const QString testOutputString = QStringLiteral(
+        "<span style=\"color: #ff00be;\">¯</span><span style=\"color: #ff3b1d;\">\\</span><span style=\"color: #ffa600;\">_</span><span style=\"color: "
+        "#64d200;\">(</span><span style=\"color: #00e261;\">ツ</span><span style=\"color: #00e7ff;\">)</span><span style=\"color: #00e1ff;\">_</span><span "
+        "style=\"color: #00bdff;\">/</span><span style=\"color: #ff60ff;\">¯</span>");
+
+    TextHandler testTextHandler;
+    testTextHandler.setData(testInputString);
+
+    qInfo() << testTextHandler.handleRecieveRichText();
+
+    QCOMPARE(testTextHandler.handleRecieveRichText(), testOutputString);
+}
+
 void TextHandlerTest::componentOutput_data()
 {
     QTest::addColumn<QString>("testInputString");
@@ -535,7 +555,7 @@ void TextHandlerTest::componentOutput_data()
                                                                       QVariantMap{{QStringLiteral("class"), QStringLiteral("html")}}}};
     QTest::newRow("quote") << QStringLiteral("<p>Text</p>\n<blockquote>\n<p>blockquote</p>\n</blockquote>")
                            << QList<MessageComponent>{MessageComponent{MessageComponentType::Text, QStringLiteral("Text"), {}},
-                                                      MessageComponent{MessageComponentType::Quote, QStringLiteral("\"blockquote\""), {}}};
+                                                      MessageComponent{MessageComponentType::Quote, QStringLiteral("“blockquote”"), {}}};
     QTest::newRow("no tag first paragraph") << QStringLiteral("Text\n<p>Text</p>")
                                             << QList<MessageComponent>{MessageComponent{MessageComponentType::Text, QStringLiteral("Text"), {}},
                                                                        MessageComponent{MessageComponentType::Text, QStringLiteral("Text"), {}}};

org.kde.neochat.appdata.xml

@@ -54,10 +54,16 @@
   <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="eo">Babilo en Matrix</summary>
   <summary xml:lang="es">Charle en Matrix</summary>
   <summary xml:lang="eu">Berriketa Matrix-en</summary>
+  <summary xml:lang="fi">Keskustelu Matrixissä</summary>
   <summary xml:lang="fr">Discuter sur Matrix</summary>
+  <summary xml:lang="gl">Charlar en Matrix</summary>
+  <summary xml:lang="he">התכתבות דרך Matrix</summary>
+  <summary xml:lang="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>
@@ -65,6 +71,7 @@
   <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>
@@ -112,7 +119,7 @@
     <p xml:lang="eu">«NeoChat»ek «Matrix» zehaztapenaren ezaugarri guztiak eskaintzen dituen aplikazio bat izan nahi du. Beraz, egungo zehaztapen egonkorrean dagoen guztiaren euskarria du, VoIP, hariak eta muturren artean zifratzeko salbuespen nabarmenekin. Badira beste ez-betetze txikiago batzuk, «Matrix»en zehaztapena etengabe eboluzioan dagoelako, baina azken helburua zehaztapen osoaren euskarria ematea izaten jarraitzen du.</p>
     <p xml:lang="fi">NeoChat pyrkii olemaan Matrix-määritelmän täysominaisuuksinen sovellus, joten se tukee kaikkea nykyisessä vakaassa määritelmässä muutamaa huomattavaa poikkeusta lukuun ottamatta (VoIP, säikeet ja jotkin piirteet päästä päähän -salauksessa). Joitakin pienempiäkin puutteita on Matrix-määritelmän jatkuvan kehityksen vuoksi, mutta lopputavoitteena on tarjota määritelmän täysi tuki.</p>
     <p xml:lang="fr">L'objectif de NeoChat est d'être une application complète pour le protocole Matrix. En tant que tel, tout dans la spécification stable actuelle avec les exceptions notables de VoIP, les processus et certains aspects du chiffrement de bout en bout sont pris en charge. Il y a quelques autres petites omissions en raison du fait que la spécification du protocole Matrix est en constante évolution. Cependant, l'objectif reste de fournir un soutien éventuel pour l'ensemble de la spécification.</p>
-    <p xml:lang="gl">NeoChat pretende ser unha aplicación completa para a especificación de Matrix. Coas excepcións de VoIP, conversas fiadas e algúns aspectos da cifraxe de extremo a extremo, a versión estábel segue as especificacións. Existen algunhas outras pequenas omisións debido ao feito de que Matrix está en continua evolución pero a intención é implementar a especificación completa.</p>
+    <p xml:lang="gl">NeoChat pretende ser unha aplicación completa para a especificación de Matrix. Coas excepcións de VoIP, conversas fiadas e algúns aspectos da cifraxe de extremo a extremo, a versión estábel segue as especificacións. Existen algunhas outras pequenas omisións debido ao feito de que Matrix está en continua evolución pero a intención é fornecer compatibilidade coa especificación completa.</p>
     <p xml:lang="he">NeoChat מתיימר להיות יישום עתיר יכולות לפי מפרט Matrix. כיוון שזה ייעודו, כל מה שבמפרט היציב עם חריגות משמעותיות כגון VoIP, שרשורים ועוד מגוון היבטים של הצפנה מקצה לקצה נתמכים גם הם. יש מספר השמטות קטן עקב העובדה שהמפרט של Matrix ממשיך להתפתח אך המטרה היא להמשיך לספק תמיכה בסופו של דבר לכל המפרט.</p>
     <p xml:lang="hu">A NeoChat célja, hogy a Matrix specifikációnak megfelelő teljes funkcionalitású alkalmazás legyen. Mint ilyen, a jelenlegi stabil specifikáció támogatott a VoIP, a szálak és a végpontok közötti titkosítás egyes elemeinek kivételével. Van még néhány kisebb hiányosság annak köszönhetően, hogy a Matrix specifikáció folyamatosan fejlődik, de végső cél a teljes specifikáció megvalósítása.</p>
     <p xml:lang="ia">NeoChat aspira a esser un application plenmente eminente per le specification de Matrix. Tal como omne cosas in le specification currentemente stabile con le exceptiones notabile de VOIP, threads e alcun aspectos del cryptation End-to-End es supportate. Il ha ltere pauc omissiones, debite al facto que le specification de Matrix es in evolution constante ma le aspiration remane a fornir supporto eventual per le integre specification.</p>
@@ -440,6 +447,8 @@
     <content_attribute id="social-chat">intense</content_attribute>
   </content_rating>
   <releases>
+    <release version="24.12.1" date="2025-01-09"/>
+    <release version="24.12.0" date="2024-12-12"/>
     <release version="24.08.3" date="2024-11-07"/>
     <release version="24.08.2" date="2024-10-10"/>
     <release version="24.08.1" date="2024-09-12"/>

org.kde.neochat.desktop

@@ -87,47 +87,30 @@ GenericName[uk]=Клієнт Matrix
 GenericName[x-test]=xxMatrix Clientxx
 GenericName[zh_CN]=Matrix 客户端
 GenericName[zh_TW]=Matrix 用戶端
-Comment=Client for the Matrix protocol
+Comment=Chat on Matrix
-Comment[ar]=عميل لميفاق ماتركس
+Comment[ar]=دردش على ماتركس
-Comment[az]=Matrix protokolu üçün müştəri
+Comment[ca]=Xat a Matrix
-Comment[ca]=Client per al protocol Matrix
+Comment[ca@valencia]=Xat a Matrix
-Comment[ca@valencia]=Client per al protocol Matrix
+Comment[de]=Über Matrix unterhalten
-Comment[de]=Programm für das Matrix-Protokoll
+Comment[en_GB]=Chat on Matrix
-Comment[el]=Πελάτης για το πρωτόκολλο Matrix
+Comment[eo]=Babilo en Matrix
-Comment[en_GB]=Client for the Matrix protocol
+Comment[es]=Chat en Matrix
-Comment[eo]=Kliento por la Matrix-protokolo
+Comment[eu]=Berriketa Matrix-en
-Comment[es]=Cliente para el protocolo Matrix
+Comment[fi]=Keskustele Matrixissä
-Comment[eu]=Matrix protokolorako bezeroa
+Comment[fr]=Clavarder sur Matrix
-Comment[fi]=Asiakas Matrix-yhteyskäytännölle
+Comment[gl]=Charle en Matrix
-Comment[fr]=Client pour le protocole « Matrix »
+Comment[he]=התכתבות דרך Matrix
-Comment[gl]=Cliente para o protocolo Matrix.
+Comment[hu]=Csevegés Matrixon
-Comment[he]=לקוח לפרוטוקול Matrix
+Comment[ia]=Conversation en ditecto sur Matrix
-Comment[hu]=Kliens a Matrix protokollhoz
+Comment[it]= su Matrix
-Comment[ia]=Cliente per le protocollo de Matrix
+Comment[ka]=საუბარი Matrix-ზე
-Comment[id]=Klien untuk protokol Matrix
+Comment[pl]=Rozmawiaj na Matriksie
-Comment[ie]=Un cliente del protocol Matrix
+Comment[sl]=Klepet na Matrixu
-Comment[it]=Client per il protocollo Matrix
+Comment[sv]=Chatta på Matrix
-Comment[ka]=კლიენტი Matrix-ის პროტოკოლისთვის
+Comment[ta]=மேட்ரிக்ஸில் உரையாட உதவும்
-Comment[ko]=Matrix 프로토콜용 클라이언트
+Comment[tr]=Matrix üzerinde sohbet edin
-Comment[lt]=Matrix protokolo kliento programa
+Comment[uk]=Спілкування у Matrix
-Comment[lv]=Klients „Matrix“ protokolam
+Comment[zh_TW]=在 Matrix 上聊天
-Comment[nl]=Client voor het Matrix-protocol
-Comment[nn]=Klient for Matrix-protokollen
-Comment[pa]=ਮੈਟਰਿਕਸ ਪਰੋਟੋਕਾਲ ਲਈ ਕਲਾਈਂਟ ਹੈ
-Comment[pl]=Program obsługi protokołu Matriksa
-Comment[pt]=Cliente para o protocolo Matrix
-Comment[pt_BR]=Cliente para o protocolo Matrix
-Comment[ro]=Client pentru protocolul Matrix
-Comment[ru]=Клиент для протокола Matrix
-Comment[sk]=Klient protokolu Matrix
-Comment[sl]=Odjemalec za protokol Matrix
-Comment[sv]=Klient för protokollet Matrix
-Comment[ta]=Matrix நெறிமுறைக்கான வாங்கி
-Comment[tr]=Matrix protokolü için istemci
-Comment[uk]=Клієнт протоколу Matrix
-Comment[x-test]=xxClient for the Matrix protocolxx
-Comment[zh_CN]=为 Matrix 协议打造的客户端
-Comment[zh_TW]=Matrix 通訊協定的用戶端
 MimeType=x-scheme-handler/matrix;
 Exec=neochat %u
 Terminal=false

snapcraft.yaml

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

src/CMakeLists.txt

@@ -200,6 +200,12 @@ 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
@@ -311,13 +317,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)

src/chatbar/ChatBar.qml

@@ -176,13 +176,14 @@ QQC2.Control {
         RowLayout {
             QQC2.ScrollView {
                 id: chatBarScrollView
+                Layout.topMargin: Kirigami.Units.smallSpacing
+                Layout.bottomMargin: Kirigami.Units.smallSpacing
+                Layout.leftMargin: Kirigami.Units.largeSpacing
+                Layout.rightMargin: Kirigami.Units.largeSpacing
 
                 Layout.fillWidth: true
                 Layout.maximumHeight: Kirigami.Units.gridUnit * 8
-
+                Layout.minimumHeight: Kirigami.Units.gridUnit * 3
-                Layout.topMargin: Kirigami.Units.smallSpacing
-                Layout.bottomMargin: Kirigami.Units.smallSpacing
-                Layout.minimumHeight: Kirigami.Units.gridUnit * 2
 
                 // HACK: This is to stop the ScrollBar flickering on and off as the height is increased
                 QQC2.ScrollBar.vertical.policy: chatBarHeightAnimation.running && implicitHeight <= height ? QQC2.ScrollBar.AlwaysOff : QQC2.ScrollBar.AsNeeded
@@ -320,12 +321,11 @@ QQC2.Control {
                 id: actionsRow
                 spacing: 0
                 Layout.alignment: Qt.AlignBottom
-                Layout.bottomMargin: Kirigami.Units.smallSpacing * 1.5
+                Layout.bottomMargin: Kirigami.Units.smallSpacing * 4
 
                 Repeater {
                     model: root.actions
                     delegate: QQC2.ToolButton {
-                        Layout.alignment: Qt.AlignVCenter
                         icon.name: modelData.isBusy ? "" : (modelData.icon.name.length > 0 ? modelData.icon.name : modelData.icon.source)
                         onClicked: modelData.trigger()
 
@@ -342,7 +342,6 @@ QQC2.Control {
             }
         }
     }
-
     DelegateSizeHelper {
         id: chatBarSizeHelper
         startBreakpoint: Kirigami.Units.gridUnit * 46

src/chatbar/EmojiDelegate.qml

@@ -43,6 +43,9 @@ QQC2.ItemDelegate {
             anchors.fill: parent
             visible: root.emoji.startsWith("mxc") || root.isImage
             source: visible ? root.emoji : ""
+            fillMode: Image.PreserveAspectFit
+            sourceSize.width: width
+            sourceSize.height: height
         }
     }
 

src/chatbar/EmojiGrid.qml

@@ -84,6 +84,7 @@ QQC2.ScrollView {
 
         Kirigami.PlaceholderMessage {
             anchors.centerIn: parent
+            icon.name: root.stickers ? "stickers" : "preferences-desktop-emoticons"
             text: root.stickers ? i18n("No stickers") : i18n("No emojis")
             visible: emojis.count === 0
         }

src/chatbar/EmojiPicker.qml

@@ -66,6 +66,7 @@ ColumnLayout {
         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
 
         ListView {
             id: categories
@@ -201,8 +202,13 @@ ColumnLayout {
             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

src/chatbarcache.cpp

@@ -319,7 +319,8 @@ void ChatBarCache::postMessage()
         return;
     }
 
-    room->postMessage(text(), sendText, *std::get<std::optional<Quotient::RoomMessageEvent::MsgType>>(result), replyId(), editId(), threadId());
+    auto type = std::get<std::optional<Quotient::RoomMessageEvent::MsgType>>(result);
+    room->postMessage(text(), sendText, type ? *type : Quotient::RoomMessageEvent::MsgType::Text, replyId(), editId(), threadId());
     clearCache();
 }
 

src/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]) {
+    // When loadAccessTokenFromKeyChain() fails m_connectionsLoading won't have an
-        auto connection = m_connectionsLoading[userId];
+    // 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/devtools/AccountData.qml

@@ -4,6 +4,7 @@
 import QtQuick
 import QtQuick.Controls as QQC2
 import QtQuick.Layouts
+import QtQuick.Window
 
 import org.kde.kirigami as Kirigami
 import org.kde.kirigamiaddons.formcard as FormCard
@@ -23,7 +24,7 @@ ColumnLayout {
             model: root.connection.accountDataEventTypes
             delegate: FormCard.FormButtonDelegate {
                 text: modelData
-                onClicked: applicationWindow().pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'MessageSourceSheet'), {
+                onClicked: root.Window.window.pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'MessageSourceSheet'), {
                     sourceText: root.connection.accountDataJsonString(modelData)
                 }, {
                     title: i18nc("@title:window", "Event Source"),

src/devtools/RoomData.qml

@@ -3,6 +3,7 @@
 
 import QtQuick
 import QtQuick.Layouts
+import QtQuick.Window
 
 import org.kde.kirigami as Kirigami
 import org.kde.kirigamiaddons.formcard as FormCard
@@ -47,7 +48,7 @@ ColumnLayout {
             model: root.room.accountDataEventTypes
             delegate: FormCard.FormButtonDelegate {
                 text: modelData
-                onClicked: applicationWindow().pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'MessageSourceSheet'), {
+                onClicked: root.Window.window.pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'MessageSourceSheet'), {
                     sourceText: root.room.roomAcountDataJson(text)
                 }, {
                     title: i18n("Event Source"),
@@ -77,7 +78,7 @@ ColumnLayout {
                     if (model.eventCount === 1) {
                         openEventSource(model.type, model.stateKey);
                     } else {
-                        pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat.devtools', 'StateKeys'), {
+                        root.Window.window.pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat.devtools', 'StateKeys'), {
                             room: root.room,
                             eventType: model.type
                         }, {
@@ -89,7 +90,7 @@ ColumnLayout {
         }
     }
     function openEventSource(type: string, stateKey: string): void {
-        onClicked: applicationWindow().pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'MessageSourceSheet'), {
+        onClicked: root.Window.window.pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'MessageSourceSheet'), {
             model: stateModel,
             allowEdit: true,
             room: root.room,

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")
+    m_deviceName = QStringLiteral("NeoChat");
-                       .arg(QSysInfo::machineHostName(), QSysInfo::productType(), QSysInfo::productVersion(), QSysInfo::currentCpuArchitecture());
     m_supportsSso = false;
     m_supportsPassword = false;
     m_ssoUrl = QUrl();

src/login/Loading.qml

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

src/login/WelcomePage.qml

@@ -7,6 +7,7 @@ import QtQuick.Layouts
 
 import org.kde.kirigami as Kirigami
 import org.kde.kirigamiaddons.formcard as FormCard
+import org.kde.kirigamiaddons.labs.components as KirigamiComponents
 
 import org.kde.neochat
 import org.kde.neochat.settings
@@ -90,11 +91,27 @@ Kirigami.Page {
                     id: loadedAccounts
                     model: AccountRegistry
                     delegate: FormCard.FormButtonDelegate {
-                        text: model.userId
+                        id: delegate
+
+                        required property string userId
+                        required property NeoChatConnection connection
+
+                        text: QmlUtils.escapeString(connection.localUser.displayName)
+                        description: connection.localUser.id
+                        leadingPadding: Kirigami.Units.largeSpacing
+
                         onClicked: {
-                            Controller.activeConnection = model.connection;
+                            Controller.activeConnection = delegate.connection;
                             root.connectionChosen();
                         }
+                        leading: KirigamiComponents.Avatar {
+                            id: avatar
+                            name: delegate.text
+                            // Note: User::avatarUrl does not set user_id, and thus cannot be used directly here. Hence the makeMediaUrl.
+                            source: delegate.connection.localUser.avatarUrl.toString().length > 0 ? delegate.connection.makeMediaUrl(delegate.connection.localUser.avatarUrl) : ""
+                            implicitWidth: Kirigami.Units.iconSizes.medium
+                            implicitHeight: Kirigami.Units.iconSizes.medium
+                        }
                     }
                 }
                 Repeater {

src/main.cpp

@@ -140,7 +140,7 @@ int main(int argc, char *argv[])
     KAboutData about(QStringLiteral("neochat"),
                      i18n("NeoChat"),
                      QStringLiteral(NEOCHAT_VERSION_STRING),
-                     i18n("Matrix client"),
+                     i18n("Chat on Matrix"),
                      KAboutLicense::GPL_V3,
                      i18n("© 2018-2020 Black Hat, 2020-2024 KDE Community"));
     about.addAuthor(i18n("Carl Schwan"),

src/models/actionsmodel.cpp

@@ -600,14 +600,19 @@ bool ActionsModel::handleQuickEditAction(NeoChatRoom *room, const QString &messa
                         } else {
                             originalString = event->plainBody();
                         }
+                        QString replaceId = event->id();
+                        const auto eventRelation = event->relatesTo();
+                        if (eventRelation && eventRelation->type == "m.replace"_L1) {
+                            replaceId = eventRelation->eventId;
+                        }
                         if (flags == "/g"_L1) {
-                            room->postHtmlMessage(messageText, originalString.replace(regex, replacement), event->msgtype(), {}, event->id());
+                            room->postHtmlMessage(messageText, originalString.replace(regex, replacement), event->msgtype(), {}, replaceId);
                         } else {
                             room->postHtmlMessage(messageText,
                                                   originalString.replace(originalString.indexOf(regex), regex.size(), replacement),
                                                   event->msgtype(),
                                                   {},
-                                                  event->id());
+                                                  replaceId);
                         }
                         return true;
                     }

src/models/completionmodel.cpp

@@ -85,13 +85,7 @@ QVariant CompletionModel::data(const QModelIndex &index, int role) const
             return m_filterModel->data(filterIndex, RoomListModel::CanonicalAliasRole);
         }
         if (role == IconNameRole) {
-            auto mediaId = m_filterModel->data(filterIndex, RoomListModel::AvatarRole).toString();
+            return m_filterModel->data(filterIndex, RoomListModel::AvatarRole).toString();
-            if (mediaId.isEmpty()) {
-                return QVariant();
-            }
-            if (m_room) {
-                return m_room->connection()->makeMediaUrl(QUrl(QStringLiteral("mxc://%1").arg(mediaId)));
-            }
         }
     }
     if (m_autoCompletionType == Emoji) {

src/models/messagecontentmodel.cpp

@@ -569,15 +569,22 @@ QList<MessageComponent> MessageContentModel::componentsForType(MessageComponentT
     case MessageComponentType::Video: {
         if (!event->is<StickerEvent>()) {
             const auto roomMessageEvent = eventCast<const Quotient::RoomMessageEvent>(event);
-            QList<MessageComponent> components;
+            const auto fileContent = roomMessageEvent->get<EventContent::FileContentBase>();
-            components += MessageComponent{type, QString(), {}};
+            if (fileContent != nullptr) {
-            auto body = EventHandler::rawMessageBody(*roomMessageEvent);
+                const auto fileInfo = fileContent->commonInfo();
-            components += TextHandler().textComponents(body,
+                const auto body = EventHandler::rawMessageBody(*roomMessageEvent);
-                                                       EventHandler::messageBodyInputFormat(*roomMessageEvent),
+                // Do not attach the description to the image, if it's the same as the original filename.
-                                                       m_room,
+                if (fileInfo.originalName != body) {
-                                                       roomMessageEvent,
+                    QList<MessageComponent> components;
-                                                       roomMessageEvent->isReplaced());
+                    components += MessageComponent{type, QString(), {}};
-            return components;
+                    components += TextHandler().textComponents(body,
+                                                               EventHandler::messageBodyInputFormat(*roomMessageEvent),
+                                                               m_room,
+                                                               roomMessageEvent,
+                                                               roomMessageEvent->isReplaced());
+                    return components;
+                }
+            }
         }
     }
     default:
@@ -635,7 +642,7 @@ QList<MessageComponent> MessageContentModel::addLinkPreviews(QList<MessageCompon
 
 void MessageContentModel::closeLinkPreview(int row)
 {
-    if (row < 0 || row > m_components.size()) {
+    if (row < 0 || row >= m_components.size()) {
         qWarning() << "closeLinkPreview() called with row" << row << "which does not exist. m_components.size() =" << m_components.size();
         return;
     }
@@ -645,6 +652,7 @@ void MessageContentModel::closeLinkPreview(int row)
         m_removedLinkPreviews += m_components[row].attributes["link"_ls].toUrl();
         m_components.remove(row);
         m_components.squeeze();
+        endResetModel();
         resetContent();
     }
 }

src/models/roomlistmodel.cpp

@@ -212,7 +212,7 @@ QVariant RoomListModel::data(const QModelIndex &index, int role) const
         return room->displayName().toHtmlEscaped();
     }
     if (role == AvatarRole) {
-        return room->avatarMediaId();
+        return room->avatarMediaUrl();
     }
     if (role == CanonicalAliasRole) {
         return room->canonicalAlias();

src/models/roomtreemodel.cpp

@@ -286,6 +286,7 @@ QHash<int, QByteArray> RoomTreeModel::roleNames() const
     roles[IconRole] = "icon";
     roles[AttentionRole] = "attention";
     roles[FavouriteRole] = "favourite";
+    roles[RoomTypeRole] = "roomType";
     return roles;
 }
 
@@ -323,7 +324,7 @@ QVariant RoomTreeModel::data(const QModelIndex &index, int role) const
         return room->displayName();
     }
     if (role == AvatarRole) {
-        return room->avatarMediaId();
+        return room->avatarMediaUrl();
     }
     if (role == CanonicalAliasRole) {
         return room->canonicalAlias();
@@ -385,6 +386,11 @@ QVariant RoomTreeModel::data(const QModelIndex &index, int role) const
     if (role == FavouriteRole) {
         return room->isFavourite();
     }
+    if (role == RoomTypeRole) {
+        if (room->creation()) {
+            return room->creation()->contentPart<QString>("type"_L1);
+        }
+    }
 
     return {};
 }

src/models/roomtreemodel.h

@@ -50,6 +50,7 @@ public:
         IconRole,
         AttentionRole, /**< Whether there are any notifications. */
         FavouriteRole, /**< Whether the room is favourited. */
+        RoomTypeRole, /**< The room's type. */
     };
     Q_ENUM(EventRoles)
     explicit RoomTreeModel(QObject *parent = nullptr);

src/models/sortfilterroomtreemodel.cpp

@@ -157,6 +157,11 @@ bool SortFilterRoomTreeModel::filterAcceptsRow(int source_row, const QModelIndex
         return false;
     }
 
+    // Hide rooms with defined types, assuming that data-holding rooms have a defined type
+    if (!sourceModel()->data(index, RoomTreeModel::RoomTypeRole).toString().isEmpty()) {
+        return false;
+    }
+
     static auto config = NeoChatConfig::self();
     if (config->allRoomsInHome() && RoomManager::instance().currentSpace().isEmpty()) {
         return acceptRoom;

src/neochat.notifyrc

@@ -261,7 +261,7 @@ Action=Popup
 Name=Share
 Name[ar]=شارك
 Name[ca]=Compartició
-Name[ca@valencia]=Compartició
+Name[ca@valencia]=Compartiu
 Name[cs]=Sdílet
 Name[de]=Teilen
 Name[el]=Κοινοποίηση

src/neochatroom.cpp

@@ -431,9 +431,9 @@ QDateTime NeoChatRoom::lastActiveTime()
     return messageEvents().rbegin()->get()->originTimestamp();
 }
 
-QString NeoChatRoom::avatarMediaId() const
+QUrl NeoChatRoom::avatarMediaUrl() const
 {
-    if (const auto avatar = Room::avatarMediaId(); !avatar.isEmpty()) {
+    if (const auto avatar = Room::avatarUrl(); !avatar.isEmpty()) {
         return avatar;
     }
 
@@ -441,7 +441,7 @@ QString NeoChatRoom::avatarMediaId() const
     const auto directChatMembers = this->directChatMembers();
     for (const auto member : directChatMembers) {
         if (member != localMember()) {
-            return member.avatarMediaId();
+            return member.avatarUrl();
         }
     }
 

src/neochatroom.h

@@ -69,9 +69,9 @@ class NeoChatRoom : public Quotient::Room
     Q_PROPERTY(bool readMarkerLoaded READ readMarkerLoaded NOTIFY readMarkerLoadedChanged)
 
     /**
-     * @brief The avatar image to be used for the room.
+     * @brief The avatar image to be used for the room, as a mxc:// URL.
      */
-    Q_PROPERTY(QString avatarMediaId READ avatarMediaId NOTIFY avatarChanged STORED false)
+    Q_PROPERTY(QUrl avatarMediaUrl READ avatarMediaUrl NOTIFY avatarChanged STORED false)
 
     /**
      * @brief Get a RoomMember object for the other person in a direct chat.
@@ -320,7 +320,7 @@ public:
 
     [[nodiscard]] bool readMarkerLoaded() const;
 
-    [[nodiscard]] QString avatarMediaId() const;
+    [[nodiscard]] QUrl avatarMediaUrl() const;
 
     NeochatRoomMember *directChatRemoteMember();
 

src/neochatroommember.cpp

@@ -153,15 +153,6 @@ QColor NeochatRoomMember::color() const
     return m_room->member(m_memberId).color();
 }
 
-QString NeochatRoomMember::avatarMediaId() const
-{
-    if (m_room == nullptr || m_memberId.isEmpty()) {
-        return {};
-    }
-
-    return m_room->member(m_memberId).avatarMediaId();
-}
-
 QUrl NeochatRoomMember::avatarUrl() const
 {
     if (m_room == nullptr || m_memberId.isEmpty()) {

src/neochatroommember.h

@@ -70,7 +70,6 @@ public:
     int hue() const;
     qreal hueF() const;
     QColor color() const;
-    QString avatarMediaId() const;
     QUrl avatarUrl() const;
 
 Q_SIGNALS:

src/plasma-runner-neochat.desktop

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

src/pollhandler.h

@@ -30,6 +30,7 @@ class PollHandler : public QObject
 {
     Q_OBJECT
     QML_ELEMENT
+    QML_UNCREATABLE("Use NeoChatRoom::poll")
 
     /**
      * @brief The question for the poll.
@@ -91,7 +92,7 @@ Q_SIGNALS:
     void hasEndedChanged();
 
 private:
-    const Quotient::PollStartEvent *m_pollStartEvent;
+    const Quotient::PollStartEvent *m_pollStartEvent = nullptr;
 
     void updatePoll(Quotient::RoomEventsRange events);
 

src/purpose/purposeplugin.json

@@ -26,6 +26,7 @@
                 "Name[nn]": "Tobias Fella",
                 "Name[pl]": "Tobias Fella",
                 "Name[ru]": "Tobias Fella",
+                "Name[sk]": "Tobias Fella",
                 "Name[sl]": "Tobias Fella",
                 "Name[sv]": "Tobias Fella",
                 "Name[ta]": "டோபியாஸ் ஃபெல்லா",
@@ -66,7 +67,7 @@
         "Description[uk]": "Оприлюднити за допомогою NeoChat",
         "Description[x-test]": "xxShare via NeoChatxx",
         "Description[zh_TW]": "透過 NeoChat 分享",
-        "Icon": "org.kde.neochat",
+        "Icon": "org.kde.neochat.tray",
         "License": "GPL",
         "Name": "NeoChat",
         "Name[ar]": "نيوتشات",
@@ -93,6 +94,7 @@
         "Name[nn]": "NeoChat",
         "Name[pl]": "NeoChat",
         "Name[ru]": "NeoChat",
+        "Name[sk]": "NeoChat",
         "Name[sl]": "NeoChat",
         "Name[sv]": "NeoChat",
         "Name[ta]": "நியோச்சாட்",

src/qml/AccountMenu.qml

@@ -27,7 +27,8 @@ QQC2.Menu {
                 text: "https://matrix.to/#/" + root.connection.localUser.id,
                 title: root.connection.localUser.displayName,
                 subtitle: root.connection.localUser.id,
-                avatarSource: root.connection.makeMediaUrl(root.connection.localUser.avatarUrl)
+                // Note: User::avatarUrl does not set user_id, and thus cannot be used directly here. Hence the makeMediaUrl.
+                avatarSource: root.connection.localUser.avatarUrl.toString().length > 0 ? root.connection.makeMediaUrl(root.connection.localUser.avatarUrl) : ""
             });
             if (typeof root.closeDialog === "function") {
                 root.closeDialog();

src/qml/AccountSwitchDialog.qml

@@ -125,7 +125,7 @@ Kirigami.Dialog {
                         width: Kirigami.Units.gridUnit + Kirigami.Units.largeSpacing
                         height: Kirigami.Units.gridUnit + Kirigami.Units.largeSpacing
                     }
-                    source: userDelegate.connection.localUser.avatarMediaId ? userDelegate.connection.makeMediaUrl("mxc://" + userDelegate.connection.localUser.avatarMediaId) : ""
+                    source: userDelegate.connection.localUser.avatarUrl.toString().length > 0 ? userDelegate.connection.makeMediaUrl(userDelegate.connection.localUser.avatarUrl) : ""
                     name: userDelegate.connection.localUser.displayName ?? userDelegate.connection.localUser.id
                 }
 

src/qml/CollapsedRoomDelegate.qml

@@ -18,7 +18,7 @@ QQC2.ItemDelegate {
     required property NeoChatRoom currentRoom
     required property bool categoryVisible
     required property string filterText
-    required property string avatar
+    required property url avatar
     required property string displayName
 
     topPadding: Kirigami.Units.largeSpacing
@@ -32,7 +32,7 @@ QQC2.ItemDelegate {
     visible: root.categoryVisible || filterText.length > 0
 
     contentItem: KirigamiComponents.Avatar {
-        source: root.avatar ? root.currentRoom.connection.makeMediaUrl("mxc://" + root.avatar) : ""
+        source: root.avatar
         name: root.displayName
 
         sourceSize {

src/qml/ContextMenu.qml

@@ -163,7 +163,7 @@ Loader {
                     spacing: Kirigami.Units.largeSpacing
                     KirigamiComponents.Avatar {
                         id: avatar
-                        source: room.avatarMediaId ? root.connection.makeMediaUrl("mxc://" + room.avatarMediaId) : ""
+                        source: room.avatarMediaUrl
                         name: room.displayName
                         Layout.preferredWidth: Kirigami.Units.gridUnit * 3
                         Layout.preferredHeight: Kirigami.Units.gridUnit * 3

src/qml/DelegateContextMenu.qml

@@ -5,6 +5,7 @@
 import QtQuick
 import QtQuick.Controls as QQC2
 import QtQuick.Layouts
+import Qt.labs.qmlmodels
 import org.kde.kirigami as Kirigami
 import org.kde.kirigamiaddons.components as KirigamiComponents
 import org.kde.kirigamiaddons.formcard as FormCard
@@ -177,10 +178,25 @@ Loader {
 
             Repeater {
                 model: root.actions
-                QQC2.MenuItem {
+                DelegateChooser {
-                    visible: modelData.visible
+                    role: "separator"
-                    action: modelData
+                    DelegateChoice {
-                    onClicked: root.item.close()
+                        roleValue: true
+
+                        QQC2.MenuSeparator {
+                            visible: modelData.visible
+                        }
+                    }
+
+                    DelegateChoice {
+                        roleValue: false
+
+                        QQC2.MenuItem {
+                            visible: modelData.visible
+                            action: modelData
+                            onClicked: root.item.close()
+                        }
+                    }
                 }
             }
             QQC2.Menu {
@@ -196,7 +212,7 @@ Loader {
                     model: WebShortcutModel {
                         id: webshortcutmodel
                         selectedText: root.selectedText.length > 0 ? root.selectedText : root.plainText
-                        onOpenUrl: RoomManager.resolveResource(url)
+                        onOpenUrl: url => RoomManager.resolveResource(url.toString())
                     }
                     delegate: QQC2.MenuItem {
                         text: model.display
@@ -341,15 +357,30 @@ Loader {
                         id: listViewAction
                         model: root.actions
 
-                        FormCard.FormButtonDelegate {
+                        DelegateChooser {
-                            icon.name: modelData.icon.name
+                            role: "separator"
-                            icon.color: modelData.icon.color ?? undefined
+                            DelegateChoice {
-                            enabled: modelData.enabled
+                                roleValue: true
-                            visible: modelData.visible
+
-                            text: modelData.text
+                                FormCard.FormDelegateSeparator {
-                            onClicked: {
+                                    visible: modelData.visible
-                                modelData.triggered();
+                                }
-                                root.item.close();
+                            }
+
+                            DelegateChoice {
+                                roleValue: false
+
+                                FormCard.FormButtonDelegate {
+                                    icon.name: modelData.icon.name
+                                    icon.color: modelData.icon.color ?? undefined
+                                    enabled: modelData.enabled
+                                    visible: modelData.visible
+                                    text: modelData.text
+                                    onClicked: {
+                                        modelData.triggered();
+                                        root.item.close();
+                                    }
+                                }
                             }
                         }
                     }

src/qml/DirectChatDrawerHeader.qml

@@ -38,7 +38,7 @@ ColumnLayout {
 
         contentItem: KirigamiComponents.Avatar {
             name: root.room ? root.room.displayName : ""
-            source: root.room ? root.room.connection.makeMediaUrl("mxc://" + root.room.avatarMediaId) : ""
+            source: root.room ? root.room.avatarMediaUrl : ""
 
             Rectangle {
                 visible: root.room.usesEncryption

src/qml/FileDelegateContextMenu.qml

@@ -54,8 +54,8 @@ DelegateContextMenu {
             icon.name: "document-save"
             onTriggered: {
                 var dialog = saveAsDialog.createObject(QQC2.Overlay.overlay);
+                dialog.selectedFile = currentRoom.fileNameToDownload(eventId);
                 dialog.open();
-                dialog.currentFile = dialog.folder + "/" + currentRoom.fileNameToDownload(eventId);
             }
         },
         DelegateContextMenu.ReplyMessageAction {},

src/qml/GlobalMenu.qml

@@ -102,7 +102,7 @@ Labs.MenuBar {
         }
         Labs.MenuItem {
             text: i18nc("menu", "About KDE")
-            onTriggered: pageStack.pushDialogLayer(Qt.createComponent("org.kde.kirigamiaddons.formcard", "AboutKDE"))
+            onTriggered: pageStack.pushDialogLayer(Qt.createComponent("org.kde.kirigamiaddons.formcard", "AboutKDEPage"))
         }
     }
 }

src/qml/GroupChatDrawerHeader.qml

@@ -34,7 +34,7 @@ ColumnLayout {
             Layout.preferredHeight: Kirigami.Units.iconSizes.large
 
             name: root.room ? root.room.displayName : ""
-            source: root.room ? root.room.connection.makeMediaUrl("mxc://" + root.room.avatarMediaId) : ""
+            source: root.room ? root.room.avatarMediaUrl : ""
 
             Rectangle {
                 visible: room.usesEncryption
@@ -75,6 +75,7 @@ ColumnLayout {
                 textFormat: TextEdit.PlainText
                 visible: root.room && root.room.canonicalAlias
                 text: root.room && root.room.canonicalAlias ? root.room.canonicalAlias : ""
+                color: Kirigami.Theme.disabledTextColor
             }
         }
         QQC2.AbstractButton {
@@ -92,7 +93,7 @@ ColumnLayout {
                     text: barcode.content,
                     title: root.room ? root.room.displayName : "",
                     subtitle: root.room ? root.room.id : "",
-                    avatarSource: root.room && root.room.avatarMediaId ? root.room.connection.makeMediaUrl("mxc://" + root.room.avatarMediaId) : ""
+                    avatarSource: root.room ? root.room.avatarMediaUrl : ""
                 });
                 map.open();
             }

src/qml/ImageEditorPage.qml

@@ -7,7 +7,6 @@ import QtQuick.Layouts
 import QtCore as Core
 
 import org.kde.kirigami as Kirigami
-import org.kde.kirigamiaddons.labs.components as KirigamiComponents
 import org.kde.kquickimageeditor as KQuickImageEditor
 
 Kirigami.Page {
@@ -168,10 +167,11 @@ Kirigami.Page {
         }
     }
 
-    footer: KirigamiComponents.Banner {
+    footer: Kirigami.InlineMessage {
         id: msg
         type: Kirigami.MessageType.Error
         showCloseButton: true
         visible: false
+        position: Kirigami.InlineMessage.Position.Header
     }
 }

src/qml/NeochatMaximizeComponent.qml

@@ -104,12 +104,14 @@ Components.AlbumMaximizeComponent {
         }
     }
 
+    onOpened: forceActiveFocus()
+
     onItemRightClicked: RoomManager.viewEventMenu(root.currentEventId, root.currentRoom)
 
     onSaveItem: {
         var dialog = saveAsDialog.createObject(QQC2.Overlay.overlay);
+        dialog.selectedFile = currentRoom.fileNameToDownload(root.currentEventId);
         dialog.open();
-        dialog.currentFile = dialog.folder + "/" + currentRoom.fileNameToDownload(root.currentEventId);
     }
 
     Connections {

src/qml/QrCodeMaximizeComponent.qml

@@ -12,7 +12,9 @@ Components.AbstractMaximizeComponent {
 
     required property string text
     property color avatarColor
-    required property string avatarSource
+    required property url avatarSource
+
+    onOpened: forceActiveFocus()
 
     Shortcut {
         sequences: [StandardKey.Cancel]

src/qml/QuickSwitcher.qml

@@ -27,6 +27,7 @@ Kirigami.SearchDialog {
     onTextChanged: RoomManager.sortFilterRoomListModel.filterText = text
     model: RoomManager.sortFilterRoomListModel
     emptyText: i18nc("Placeholder message", "No room found")
+    parent: QQC2.Overlay.overlay
 
     delegate: RoomDelegate {
         connection: root.connection

src/qml/RecommendedSpaceDialog.qml

@@ -30,9 +30,9 @@ Kirigami.Dialog {
         FormCard.AbstractFormDelegate {
             background: null
             contentItem: RowLayout {
-                spacing: Kirigami.Units.largeSpacing * 4
+                spacing: Kirigami.Units.largeSpacing
                 Avatar {
-                    source: root.connection.makeMediaUrl(SpaceHierarchyCache.recommendedSpaceAvatar)
+                    source: SpaceHierarchyCache.recommendedSpaceAvatar.toString().length > 0 ? root.connection.makeMediaUrl(SpaceHierarchyCache.recommendedSpaceAvatar) : 0
                     name: SpaceHierarchyCache.recommendedSpaceDisplayName
                 }
                 ColumnLayout {
@@ -51,6 +51,7 @@ Kirigami.Dialog {
         FormCard.FormDelegateSeparator {}
         FormCard.FormButtonDelegate {
             text: i18nc("@action:button", "Join")
+            icon.name: "list-add-symbolic"
             onClicked: {
                 SpaceHierarchyCache.recommendedSpaceHidden = true;
                 RoomManager.resolveResource(SpaceHierarchyCache.recommendedSpaceId, "join");
@@ -58,6 +59,7 @@ Kirigami.Dialog {
             }
         }
         FormCard.FormButtonDelegate {
+            icon.name: "mail-thread-ignored-symbolic"
             text: i18nc("@action:button", "Ignore")
             onClicked: {
                 SpaceHierarchyCache.recommendedSpaceHidden = true;

src/qml/RoomDelegate.qml

@@ -21,7 +21,7 @@ Delegates.RoundedItemDelegate {
     required property bool hasHighlightNotifications
     required property NeoChatRoom currentRoom
     required property NeoChatConnection connection
-    required property string avatar
+    required property url avatar
     required property string subtitleText
     required property string displayName
 
@@ -55,7 +55,7 @@ Delegates.RoundedItemDelegate {
         spacing: Kirigami.Units.largeSpacing
 
         AvatarNotification {
-            source: root.avatar ? root.connection.makeMediaUrl("mxc://" + root.avatar) : ""
+            source: root.avatar
             name: root.displayName
             visible: NeoChatConfig.showAvatarInRoomDrawer
             implicitHeight: Kirigami.Units.gridUnit + (NeoChatConfig.compactRoomList ? 0 : Kirigami.Units.largeSpacing * 2)

src/qml/RoomDrawer.qml

@@ -99,8 +99,11 @@ Kirigami.OverlayDrawer {
                     Layout.preferredHeight: pageStack.globalToolBar.preferredHeight
 
                     contentItem: RowLayout {
+                        spacing: 0
+
                         Kirigami.Heading {
                             Layout.fillWidth: true
+                            Layout.leftMargin: Kirigami.Units.largeSpacing
                             text: drawerItemLoader.item ? drawerItemLoader.item.title : ""
                         }
 

src/qml/RoomInformation.qml

@@ -219,7 +219,7 @@ QQC2.ScrollView {
             required property int index
             required property string name
             required property string userId
-            required property string avatar
+            required property url avatar
             required property int powerLevel
             required property string powerLevelString
 

src/qml/RoomPage.qml

@@ -7,7 +7,6 @@ import QtQuick.Controls as QQC2
 import QtQuick.Layouts
 import QtQuick.Window
 
-import org.kde.kirigamiaddons.labs.components as KirigamiComponents
 import org.kde.kirigami as Kirigami
 import org.kde.kitemmodels
 
@@ -99,11 +98,12 @@ Kirigami.Page {
         }
     }
 
-    header: KirigamiComponents.Banner {
+    header: Kirigami.InlineMessage {
         id: banner
 
         showCloseButton: true
         visible: false
+        position: Kirigami.InlineMessage.Position.Header
     }
 
     Loader {
@@ -198,7 +198,7 @@ Kirigami.Page {
     Shortcut {
         sequence: StandardKey.Cancel
         onActivated: {
-            if (!timelineViewLoader.item.atYEnd || root.currentRoom.hasUnreadMessages) {
+            if (!timelineViewLoader.item.atYEnd || !root.currentRoom.partiallyReadStats.empty()) {
                 timelineViewLoader.item.goToLastMessage();
                 root.currentRoom.markAllMessagesAsRead();
             } else {
@@ -253,7 +253,6 @@ Kirigami.Page {
                 messageComponentType: messageComponentType,
                 plainText: plainText,
                 htmlText: htmlText,
-                isThread: isThread
             });
             contextMenu.open();
         }
@@ -265,7 +264,6 @@ Kirigami.Page {
                 plainText: plainText,
                 mimeType: mimeType,
                 progressInfo: progressInfo,
-                isThread: isThread
             });
             contextMenu.open();
         }

src/qml/SpaceDrawer.qml

@@ -182,7 +182,7 @@ QQC2.Control {
                         id: spaceDelegate
 
                         required property string displayName
-                        required property string avatar
+                        required property url avatar
                         required property string roomId
                         required property var currentRoom
 
@@ -191,7 +191,7 @@ QQC2.Control {
                         Layout.maximumHeight: width - Kirigami.Units.smallSpacing
 
                         text: displayName
-                        source: avatar ? root.connection.makeMediaUrl("mxc://" + avatar) : ""
+                        source: avatar
 
                         notificationCount: spaceDelegate.currentRoom.childrenNotificationCount
                         notificationHighlight: spaceDelegate.currentRoom.childrenHaveHighlightNotifications
@@ -219,7 +219,7 @@ QQC2.Control {
                     visible: SpaceHierarchyCache.recommendedSpaceId.length > 0 && !root.connection.room(SpaceHierarchyCache.recommendedSpaceId) && !SpaceHierarchyCache.recommendedSpaceHidden
 
                     text: i18nc("Join <name of a space>", "Join %1", SpaceHierarchyCache.recommendedSpaceDisplayName)
-                    source: SpaceHierarchyCache.recommendedSpaceAvatar.length > 0 ? root.connection.makeMediaUrl(SpaceHierarchyCache.recommendedSpaceAvatar) : ""
+                    source: SpaceHierarchyCache.recommendedSpaceAvatar.toString().length > 0 ? root.connection.makeMediaUrl(SpaceHierarchyCache.recommendedSpaceAvatar) : ""
                     onSelected: {
                         recommendedSpaceDialogComponent.createObject(QQC2.Overlay.overlay, {
                             connection: root.connection

src/qml/SpaceListContextMenu.qml

@@ -96,7 +96,7 @@ Loader {
 
                     KirigamiComponents.Avatar {
                         id: avatar
-                        source: room.avatarMediaId ? root.room.connection.makeMediaUrl("mxc://" + room.avatarMediaId) : ""
+                        source: room.avatarMediaUrl
                         Layout.preferredWidth: Kirigami.Units.gridUnit * 3
                         Layout.preferredHeight: Kirigami.Units.gridUnit * 3
                         Layout.alignment: Qt.AlignTop

src/qml/TimelineView.qml

@@ -186,7 +186,7 @@ QQC2.ScrollView {
             padding: Kirigami.Units.largeSpacing
 
             z: 2
-            visible: (root.currentRoom?.hasUnreadMessages ?? false)
+            visible: (!root.currentRoom?.partiallyReadStats.empty())
 
             text: root.currentRoom.readMarkerLoaded ? i18n("Jump to first unread message") : i18n("Jump to oldest loaded message")
             action: Kirigami.Action {
@@ -195,7 +195,7 @@ QQC2.ScrollView {
                         root.focusChatBar();
                     }
                     goReadMarkerFab.textChanged()
-                    messageListView.goToEvent(root.currentRoom.readMarkerEventId);
+                    messageListView.goToEvent(root.currentRoom.lastFullyReadEventId);
                 }
                 icon.name: "go-up"
                 shortcut: "Shift+PgUp"
@@ -354,7 +354,7 @@ QQC2.ScrollView {
         }
 
         function allUnreadVisible() {
-            let readMarkerRow = eventToIndex(root.currentRoom.readMarkerEventId);
+            let readMarkerRow = eventToIndex(root.currentRoom.lastFullyReadEventId);
             if (readMarkerRow >= 0 && readMarkerRow < firstVisibleIndex() && messageListView.atYEnd) {
                 return true;
             }

src/qml/UnlockSSSSDialog.qml

@@ -7,7 +7,6 @@ import QtQuick.Layouts
 
 import org.kde.kirigami as Kirigami
 import org.kde.kirigamiaddons.formcard as FormCard
-import org.kde.kirigamiaddons.labs.components as KirigamiComponents
 
 import org.kde.neochat
 
@@ -20,11 +19,12 @@ FormCard.FormCardPage {
     leftPadding: 0
     rightPadding: 0
 
-    header: KirigamiComponents.Banner {
+    header: Kirigami.InlineMessage {
         id: banner
         showCloseButton: true
         visible: false
         type: Kirigami.MessageType.Error
+        position: Kirigami.InlineMessage.Position.Header
     }
 
     property SSSSHandler ssssHandler: SSSSHandler {