Use AccountSettingsGroup

.flatpak-manifest.json

@@ -2,7 +2,7 @@
     "id": "org.kde.neochat",
     "branch": "master",
     "runtime": "org.kde.Platform",
-    "runtime-version": "6.10",
+    "runtime-version": "6.9",
     "sdk": "org.kde.Sdk",
     "command": "neochat",
     "tags": [
@@ -31,6 +31,19 @@
         "/share/ndk-modules"
     ],
     "modules": [
+        {
+            "name": "kirigamiaddons",
+            "config-opts": [
+                "-DBUILD_TESTING=OFF"
+            ],
+            "buildsystem": "cmake-ninja",
+            "sources": [
+                {
+                    "type": "git",
+                    "url": "https://invent.kde.org/libraries/kirigami-addons.git"
+                }
+            ]
+        },
         {
             "name": "opencv",
             "config-opts": [
@@ -65,7 +78,6 @@
             "name": "olm",
             "buildsystem": "cmake-ninja",
             "config-opts": [
-                "-DCMAKE_POLICY_VERSION_MINIMUM=3.5",
                 "-DOLM_TESTS=OFF"
             ],
             "sources": [
@@ -172,8 +184,8 @@
             "sources": [
                 {
                     "type": "archive",
-                    "url": "https://download.kde.org/stable/release-service/25.08.3/src/kunifiedpush-25.08.3.tar.xz",
-                    "sha256": "e8c924438d5359f0fa0930ab35111012076e3a0ff4e959d6929595571383320a",
+                    "url": "https://download.kde.org/stable/release-service/25.08.0/src/kunifiedpush-25.08.0.tar.xz",
+                    "sha256": "846db6ffc7d93f6afea7ce0d5a9f10b52792157ceb593856542279f4197f3518",
                     "x-checker-data": {
                         "type": "anitya",
                         "project-id": 8763,

.kde-ci.yml

@@ -14,6 +14,7 @@ Dependencies:
       'frameworks/kquickcharts': '@latest-kf6'
       'frameworks/knotifications': '@latest-kf6'
       'frameworks/kcolorscheme': '@latest-kf6'
+      'frameworks/kiconthemes': '@latest-kf6'
       'libraries/kquickimageeditor': '@latest-kf6'
       'frameworks/sonnet': '@latest-kf6'
       'frameworks/prison': '@latest-kf6'
@@ -28,15 +29,12 @@ Dependencies:
       'frameworks/kio': '@latest-kf6'
       'frameworks/kwindowsystem': '@latest-kf6'
       'frameworks/kstatusnotifieritem': '@latest-kf6'
-
-  - 'on': ['Linux', 'FreeBSD', 'Android']
-    'require':
-      'libraries/kunifiedpush': '@latest-kf6'
-
+      'frameworks/kcrash': '@latest-kf6'
   - 'on': ['Linux', 'FreeBSD']
     'require':
       'frameworks/kdbusaddons': '@latest-kf6'
       'frameworks/purpose': '@latest-kf6'
+      'libraries/kunifiedpush': '@latest-kf6'
 
   - 'on': ['Linux']
     'require':

CMakeLists.txt

@@ -7,8 +7,8 @@
 cmake_minimum_required(VERSION 3.16)
 
 # KDE Applications version, managed by release script.
-set(RELEASE_SERVICE_VERSION_MAJOR "26")
-set(RELEASE_SERVICE_VERSION_MINOR "03")
+set(RELEASE_SERVICE_VERSION_MAJOR "25")
+set(RELEASE_SERVICE_VERSION_MINOR "11")
 set(RELEASE_SERVICE_VERSION_MICRO "70")
 set(RELEASE_SERVICE_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE_VERSION_MINOR}.${RELEASE_SERVICE_VERSION_MICRO}")
 
@@ -46,6 +46,10 @@ if (NOT ANDROID)
     include(KDEClangFormat)
 endif()
 
+if(NEOCHAT_FLATPAK)
+    include(cmake/Flatpak.cmake)
+endif()
+
 set(QUOTIENT_FORCE_NAMESPACED_INCLUDES TRUE)
 
 ecm_set_disabled_deprecation_versions(Qt 6.9.0 KF 6.17.0)
@@ -65,7 +69,7 @@ if (QT_KNOWN_POLICY_QTP0004)
 qt_policy(SET QTP0004 NEW)
 endif ()
 
-find_package(KF6 ${KF_MIN_VERSION} COMPONENTS Kirigami I18n Notifications Config CoreAddons Sonnet ItemModels ColorScheme)
+find_package(KF6 ${KF_MIN_VERSION} COMPONENTS Kirigami I18n Notifications Config CoreAddons Sonnet ItemModels IconThemes ColorScheme)
 set_package_properties(KF6 PROPERTIES
     TYPE REQUIRED
     PURPOSE "Basic application components"
@@ -88,7 +92,7 @@ if(ANDROID)
     )
 else()
     find_package(Qt6 ${QT_MIN_VERSION} COMPONENTS Widgets)
-    find_package(KF6 ${KF_MIN_VERSION} REQUIRED COMPONENTS QQC2DesktopStyle KIO WindowSystem StatusNotifierItem)
+    find_package(KF6 ${KF_MIN_VERSION} REQUIRED COMPONENTS QQC2DesktopStyle KIO WindowSystem StatusNotifierItem Crash)
     find_package(KF6SyntaxHighlighting ${KF_MIN_VERSION} REQUIRED)
     set_package_properties(KF6QQC2DesktopStyle PROPERTIES
         TYPE RUNTIME
@@ -148,7 +152,7 @@ set_package_properties(KF6DocTools PROPERTIES DESCRIPTION
 
 option(WITH_UNIFIEDPUSH "Build with KUnifiedPush support" ON)
 
-if (APPLE OR WIN32 OR HAIKU)
+if (ANDROID OR APPLE OR WIN32 OR HAIKU)
     set(WITH_UNIFIEDPUSH OFF)
 endif()
 

cmake/Flatpak.cmake

@@ -0,0 +1,14 @@
+# SPDX-FileCopyrightText: 2020 Carl Schwan <carl@carlschwan.eu>
+# SPDX-License-Identifier: BSD-2-Clause
+
+include(GNUInstallDirs)
+
+# Include FontConfig config which uses the Emoji One font from the
+# KDE Flatpak SDK.
+install(
+    FILES
+        ${CMAKE_CURRENT_SOURCE_DIR}/cmake/Flatpak/99-noto-mono-color-emoji.conf
+    DESTINATION
+        ${CMAKE_INSTALL_SYSCONFDIR}/fonts/local.conf
+)
+

cmake/Flatpak/99-noto-mono-color-emoji.conf

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+  <alias>
+    <family>serif</family>
+    <prefer>
+      <family>Noto Color Emoji</family>
+    </prefer>
+  </alias>
+  <alias>
+    <family>sans-serif</family>
+    <prefer>
+      <family>Noto Color Emoji</family>
+    </prefer>
+  </alias>
+  <alias>
+    <family>monospace</family>
+    <prefer>
+      <family>Noto Color Emoji</family>
+    </prefer>
+  </alias>
+</fontconfig>
+

org.kde.neochat.appdata.xml

@@ -320,6 +320,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">.</value>
   </custom>
   <launchable type="desktop-id">org.kde.neochat.desktop</launchable>
   <screenshots>
@@ -487,8 +488,6 @@
     <content_attribute id="social-chat">intense</content_attribute>
   </content_rating>
   <releases>
-    <release version="25.12.0" date="2025-12-11"/>
-    <release version="25.08.3" date="2025-11-06"/>
     <release version="25.08.2" date="2025-10-09"/>
     <release version="25.08.1" date="2025-09-11"/>
     <release version="25.08.0" date="2025-08-14"/>

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

@@ -1,122 +0,0 @@
-<?xml version="1.0" ?>
-<!DOCTYPE refentry PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [
-<!ENTITY % Brazilian-Portuguese "INCLUDE">
-]>
-<!--
-SPDX-FileCopyrightText: 2022 Carl Schwan <carl@carlschwan.eu>
-SPDX-License-Identifier: CC-BY-SA-4.0
--->
-
-<refentry lang="&language;">
-<refentryinfo>
-<title
->Manual do Usuário do NeoChat</title>
-<author
-><firstname
->Carl</firstname
-><surname
->Schwan</surname
-> <contrib
->NeoChat man page.</contrib
-> <email
->carl@carlschwan.eu</email
-></author>
-<date
->01/11/2022</date>
-<releaseinfo
->22.09</releaseinfo>
-<productname
->NeoChat</productname>
-</refentryinfo>
-
-<refmeta>
-  <refentrytitle>
-    <command
->neochat</command>
-  </refentrytitle>
-  <manvolnum
->1</manvolnum>
-</refmeta>
-
-<refnamediv>
-  <refname
->neochat</refname>
-  <refpurpose
->Cliente para interação com o protocolo de mensagens Matrix.</refpurpose>
-  </refnamediv>
-  <!-- body begins here -->
-  <refsynopsisdiv id='synopsis'>
-  <cmdsynopsis
-><command
->neochat</command
-> <arg choice="opt"
-><replaceable
->URI</replaceable
-></arg
-> </cmdsynopsis>
-</refsynopsisdiv>
-
-
-<refsect1 id="description">
-  <title
->Descrição</title>
-  <para
->O <command
->neochat</command
-> é um aplicativo de bate-papo para o protocolo Matrix. Ele funciona tanto em computadores quanto em dispositivos móveis. </para>
-</refsect1>
-
-<refsect1 id="options"
-><title
->Opções</title>
-<variablelist>
-  <varlistentry>
-  <term
-><option
->URI</option
-></term>
-  <listitem>
-    <para
->O URI da matriz para um usuário ou uma sala. Por exemplo, matrix:u/usuário:exemplo.org e matrix:r/root:exemplo.org. Isso fará com que o NeoChat tente abrir a sala ou conversa especificada. </para>
-  </listitem>
-  </varlistentry>
-</variablelist>
-</refsect1>
-
-<refsect1 id="bug">
-  <title
->Relatar bugs</title>
-  <para
->Você pode reportar erros e solicitar novas funcionalidades em <ulink url="https://bugs.kde.org/enter_bug.cgi?product=NeoChat&amp;component=General"
->https://bugs.kde.org/enter_bug.cgi?product=NeoChat&amp;component=General</ulink
-></para>
-</refsect1>
-
-<refsect1>
-  <title
->Veja também</title>
-  <simplelist>
-    <member
->Lista de perguntas frequentes sobre o Matrix <ulink url="https://matrix.org/faq/"
->https://matrix.org/faq/</ulink
-> </member>
-    <member
->kf5options(7)</member>
-    <member
->qt5options(7)</member>
-  </simplelist>
-</refsect1>
-
-<refsect1 id="copyright"
-><title
->Direitos autorais</title>
-<para
->Direitos autorais &copy; 2020-2022 Tobias Fella </para>
-<para
->Direitos autorais &copy; 2020-2022 Carl Schwan </para>
-<para
->Licença: GNU General Public Versão 3 ou posterior <ulink url="https://www.gnu.org/licenses/gpl-3.0.html"
->https://www.gnu.org/licenses/gpl-3.0.html</ulink
->&gt;</para>
-</refsect1>
-</refentry>

src/app/CMakeLists.txt

@@ -103,7 +103,6 @@ ecm_add_qml_module(neochat URI org.kde.neochat GENERATE_PLUGIN_SOURCE
         qml/ReasonDialog.qml
         qml/NewPollDialog.qml
         qml/UserMenu.qml
-        qml/MeetingDialog.qml
     DEPENDENCIES
         QtCore
         QtQuick
@@ -203,6 +202,7 @@ target_link_libraries(neochat PUBLIC
     KF6::ConfigGui
     KF6::CoreAddons
     KF6::SonnetCore
+    KF6::IconThemes
     KF6::ItemModels
     KF6::I18nQml
     KirigamiApp
@@ -213,6 +213,10 @@ target_link_libraries(neochat PUBLIC
     Spaces
 )
 
+if (TARGET KF6::Crash)
+    target_link_libraries(neochat PUBLIC KF6::Crash)
+endif()
+
 kconfig_target_kcfg_file(neochat FILE neochatconfig.kcfg CLASS_NAME NeoChatConfig MUTATORS GENERATE_PROPERTIES DEFAULT_VALUE_GETTERS PARENT_IN_CONSTRUCTOR SINGLETON GENERATE_MOC QML_REGISTRATION)
 
 if(NEOCHAT_FLATPAK)
@@ -352,8 +356,7 @@ endif()
 install(TARGETS neochat-app ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
 
 if (NOT ANDROID AND NOT WIN32 AND NOT APPLE)
-    # krunner plugin must be the same as the app id for flatpak to export it
-    install(FILES plasma-runner-neochat.desktop DESTINATION ${KDE_INSTALL_DATAROOTDIR}/krunner/dbusplugins RENAME org.kde.neochat.desktop)
+    install(FILES plasma-runner-neochat.desktop DESTINATION ${KDE_INSTALL_DATAROOTDIR}/krunner/dbusplugins)
 endif()
 
 if (APPLE)

src/app/controller.cpp

@@ -246,10 +246,7 @@ void Controller::initActiveConnection(NeoChatConnection *oldConnection, NeoChatC
     if (newConnection) {
         connect(newConnection, &NeoChatConnection::errorOccured, this, &Controller::errorOccured);
         connect(newConnection, &NeoChatConnection::badgeNotificationCountChanged, this, &Controller::updateBadgeNotificationCount);
-
-        // Refresh and update manually, in case we init too late for the badge count to actually change.
         newConnection->refreshBadgeNotificationCount();
-        updateBadgeNotificationCount(newConnection->badgeNotificationCount());
     }
     Q_EMIT activeConnectionChanged(newConnection);
 }

src/app/main.cpp

@@ -33,6 +33,7 @@
 #include <KWindowSystem>
 #endif
 
+#include <KIconTheme>
 #include <KLocalizedQmlContext>
 #include <KLocalizedString>
 #include <KirigamiApp>
@@ -161,6 +162,12 @@ int main(int argc, char *argv[])
     Connection::setEncryptionDefault(true);
     Connection::setDirectChatEncryptionDefault(true);
 
+#ifdef NEOCHAT_FLATPAK
+    // Copy over the included FontConfig configuration to the
+    // app's config dir:
+    QFile::copy(u"/app/etc/fonts/conf.d/99-noto-mono-color-emoji.conf"_s, u"/var/config/fontconfig/conf.d/99-noto-mono-color-emoji.conf"_s);
+#endif
+
     ColorSchemer colorScheme;
 
     QCommandLineParser parser;

src/app/neochat.notifyrc

@@ -259,7 +259,7 @@ Comment[sa]=कक्षस्य नूतनं निमन्त्रणम
 Comment[sl]=Tam je novo povabilo v sobo
 Comment[sv]=Det finns en ny inbjudan till ett rum
 Comment[ta]=ஓர் அரங்கிற்கான புதிய அழைப்பிதழ் உள்ளது
-Comment[tr]=Bir odaya yeni bir davet var
+Comment[tr]=Bir odaya yeni bir davetiye var
 Comment[uk]=У кімнаті нове запрошення
 Comment[zh_CN]=有新的聊天室邀请
 Comment[zh_TW]=有新的加入聊天室邀請

src/app/neochatconfig.kcfg

@@ -66,10 +66,6 @@
     </entry>
   </group>
   <group name="Timeline">
-    <entry name="FontScale" type="double">
-      <label>Scaling factor for font sizes</label>
-      <default>1.0</default>
-    </entry>
     <entry name="ShowAvatarInTimeline" type="bool">
       <label>Show avatar in the timeline</label>
       <default>true</default>
@@ -211,6 +207,10 @@
       <label>Enable threads</label>
       <default>false</default>
     </entry>
+    <entry name="SecretBackup" type="bool">
+      <label>Enable secret backup</label>
+      <default>false</default>
+    </entry>
     <entry name="Phone3PId" type="bool">
       <label>Enable add phone numbers as 3PIDs</label>
       <default>false</default>

src/app/qml/AccountMenu.qml

@@ -79,6 +79,7 @@ KirigamiComponents.ConvergentContextMenu {
     Kirigami.Action {
         text: i18nc("@action:inmenu", "Open Secret Backup")
         icon.name: "unlock"
+        visible: NeoChatConfig.secretBackup
         onTriggered: root.window.pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'UnlockSSSSDialog'), {}, {
             title: i18nc("@title:window", "Open Key Backup")
         })

src/app/qml/CodeMaximizeComponent.qml

@@ -91,7 +91,6 @@ Components.AbstractMaximizeComponent {
             color: Kirigami.Theme.textColor
 
             font.family: "monospace"
-            font.pointSize: Kirigami.Theme.defaultFont.pointSize * NeoChatConfig.fontScale
 
             Kirigami.SpellCheck.enabled: false
 

src/app/qml/InvitationView.qml

@@ -54,12 +54,6 @@ ColumnLayout {
                 Layout.alignment: Qt.AlignHCenter
             }
 
-            Kirigami.Heading {
-                text: root.currentRoom.displayName
-
-                Layout.alignment: Qt.AlignHCenter
-            }
-
             Kirigami.SelectableLabel {
                 Layout.fillWidth: true
                 font: Kirigami.Theme.smallFont
@@ -67,7 +61,12 @@ ColumnLayout {
                 visible: root.currentRoom && root.currentRoom.canonicalAlias
                 text: root.currentRoom && root.currentRoom.canonicalAlias ? root.currentRoom.canonicalAlias : ""
                 color: Kirigami.Theme.disabledTextColor
-                horizontalAlignment: Text.AlignHCenter
+            }
+
+            Kirigami.Heading {
+                text: root.currentRoom.displayName
+
+                Layout.alignment: Qt.AlignHCenter
             }
         }
     }

src/app/qml/MeetingDialog.qml

@@ -1,22 +0,0 @@
-// SPDX-FileCopyrightText: 2025 Joshua Goins <josh@redstrate.com>
-// SPDX-License-Identifier: GPL-3.0-only
-
-import QtQuick
-
-import org.kde.kirigami as Kirigami
-
-Kirigami.PromptDialog {
-    id: root
-
-    required property bool hasExistingMeeting
-
-    title: hasExistingMeeting ? i18nc("@title", "Join Meeting") : i18nc("@title", "Start Meeting")
-    subtitle: hasExistingMeeting ? i18nc("@info:label", "You are about to join a Jitsi meeting in your web browser.") : i18nc("@info:label", "You are about to start a new Jitsi meeting in your web browser.")
-    standardButtons: Kirigami.Dialog.Cancel
-
-    customFooterActions: Kirigami.Action {
-        icon.name: "camera-video-symbolic"
-        text: hasExistingMeeting ? i18nc("@action:button Join the Jitsi meeting", "Join") : i18nc("@action:button Start a new Jitsi meeting", "Start")
-        onTriggered: root.accept()
-    }
-}

src/app/qml/NeochatMaximizeComponent.qml

@@ -23,45 +23,13 @@ Components.AlbumMaximizeComponent {
      */
     required property NeoChatRoom currentRoom
 
-    readonly property string currentEventId: {
-        const idx = (content as ListView).currentIndex;
+    readonly property string currentEventId: model.data(model.index((content as ListView).currentIndex, 0), TimelineMessageModel.EventIdRole)
 
-        if (idx === -1) {
-            return ""
-        }
+    readonly property var currentAuthor: model.data(model.index((content as ListView).currentIndex, 0), TimelineMessageModel.AuthorRole)
 
-        return model.data(model.index(idx, 0), TimelineMessageModel.EventIdRole)
-    }
+    readonly property var currentTime: model.data(model.index((content as ListView).currentIndex, 0), TimelineMessageModel.TimeRole)
 
-    readonly property var currentAuthor: {
-        const idx = (content as ListView).currentIndex;
-
-        if (idx === -1) {
-            return {}
-        }
-
-        return model.data(model.index(idx, 0), TimelineMessageModel.AuthorRole)
-    }
-
-    readonly property var currentTime: {
-
-        const idx = (content as ListView).currentIndex;
-
-        if (idx === -1) {
-            return {}
-        }
-
-        model.data(model.index(idx, 0), TimelineMessageModel.TimeRole)
-    }
-
-    readonly property var currentProgressInfo: {
-        const idx = (content as ListView).currentIndex;
-
-        if (idx === -1) {
-            return {}
-        }
-        model.data(model.index(idx, 0), TimelineMessageModel.ProgressInfoRole)
-    }
+    readonly property var currentProgressInfo: model.data(model.index((content as ListView).currentIndex, 0), TimelineMessageModel.ProgressInfoRole)
 
     actions: [
         ShareAction {

src/app/qml/RoomPage.qml

@@ -77,33 +77,11 @@ Kirigami.Page {
 
     actions: [
         Kirigami.Action {
-            id: jitsiMeetingAction
-
-            readonly property bool hasExistingMeeting: root.widgetModel.jitsiIndex >= 0
-            readonly property bool canStartNewMeeting: root.currentRoom.canSendState("im.vector.modular.widgets")
-
-            tooltip: {
-                if (hasExistingMeeting) {
-                    return i18nc("@action:button", "Join Jitsi meeting…");
-                }
-
-                return canStartNewMeeting ? i18nc("@action:button", "Start Jitsi meeting…") : i18nc("@action:button", "You do not have permissions to start Jitsi meetings")
-            }
-            icon {
-                name: "camera-video-symbolic"
-                color: hasExistingMeeting ? Kirigami.Theme.highlightColor : "transparent"
-            }
-            enabled: hasExistingMeeting || canStartNewMeeting
-            visible: root.currentRoom && !root.currentRoom.isSpace
+            tooltip: i18nc("@action:button", "Open Jitsi Meet in browser")
+            icon.name: "camera-video-symbolic"
             onTriggered: {
-                const dialog = Qt.createComponent("org.kde.neochat", "MeetingDialog").createObject(QQC2.Overlay.overlay, { hasExistingMeeting });
-                dialog.onAccepted.connect(doAction);
-                dialog.open();
-            }
-
-            function doAction(): void {
-                let url;
-                if (!hasExistingMeeting) {
+                let url
+                if (root.widgetModel.jitsiIndex < 0) {
                     url = root.widgetModel.addJitsiConference();
                 } else {
                     let idx = root.widgetModel.index(root.widgetModel.jitsiIndex, 0);
@@ -119,18 +97,6 @@ Kirigami.Page {
         }
     ]
 
-    Kirigami.Action {
-        enabled: root.currentRoom && !root.currentRoom.isSpace
-        shortcut: "Ctrl+F"
-        onTriggered: {
-            ((root.QQC2.ApplicationWindow.window as Kirigami.ApplicationWindow).pageStack as Kirigami.PageRow).pushDialogLayer(Qt.createComponent('org.kde.neochat', 'RoomSearchPage'), {
-                room: root.currentRoom
-            }, {
-                title: i18nc("@action:title", "Search")
-            });
-        }
-    }
-
     KeyNavigation.left: (root.Kirigami.PageStack.pageStack as Kirigami.PageRow).get(0)
 
     onCurrentRoomChanged: {
@@ -227,8 +193,6 @@ Kirigami.Page {
             // Used to keep track of messages so we can hide the right one at the right time
             property string messageId
 
-            Layout.fillWidth: true
-
             showCloseButton: true
             visible: false
             position: Kirigami.InlineMessage.Position.Header
@@ -255,6 +219,7 @@ Kirigami.Page {
             id: timelineView
             messageFilterModel: root.messageFilterModel
             compactLayout: NeoChatConfig.compactLayout
+            fileDropEnabled: !Controller.isFlatpak
             markReadCondition: NeoChatConfig.markReadCondition
         }
     }

src/app/qml/UnlockSSSSDialog.qml

@@ -11,8 +11,6 @@ import org.kde.neochat
 FormCard.FormCardPage {
     id: root
 
-    property bool processing: false
-
     title: i18nc("@title:window", "Load your encrypted messages")
 
     topPadding: Kirigami.Units.gridUnit
@@ -27,42 +25,75 @@ FormCard.FormCardPage {
         position: Kirigami.InlineMessage.Position.Header
     }
 
-    Connections {
-        target: Controller.activeConnection
-        function onKeyBackupError(): void {
-            securityKeyField.clear()
-            root.processing = false
-            banner.text = i18nc("@info:status", "The security key or backup passphrase was not correct.")
-            banner.visible = true
-        }
+    property SSSSHandler ssssHandler: SSSSHandler {
+        id: ssssHandler
 
-        function onKeyBackupUnlocked(): void {
-            root.processing = false
+        property bool processing: false
+
+        connection: Controller.activeConnection
+        onKeyBackupUnlocked: {
+            ssssHandler.processing = false
             banner.text = i18nc("@info:status", "Encryption keys restored.")
             banner.type = Kirigami.MessageType.Positive
             banner.visible = true
         }
+        onError: error => {
+            if (error !== SSSSHandler.WrongKeyError) {
+                banner.text = error
+                banner.visible = true
+                return;
+            }
+            passwordField.clear()
+            ssssHandler.processing = false
+            banner.text = i18nc("@info:status", "The security phrase was not correct.")
+            banner.visible = true
+        }
     }
 
     FormCard.FormHeader {
-        title: i18nc("@title", "Unlock using Security Key or Backup Passphrase")
+        title: i18nc("@title", "Unlock using Passphrase")
     }
     FormCard.FormCard {
         FormCard.FormTextDelegate {
-            description: i18nc("@info", "If you have a security key or backup passphrase for this account, enter it below or upload it as a file.")
+            description: i18nc("@info", "If you have a backup passphrase for this account, enter it below.")
+        }
+        FormCard.FormTextFieldDelegate {
+            id: passwordField
+            label: i18nc("@label:textbox", "Backup Password:")
+            echoMode: TextInput.Password
+        }
+        FormCard.FormButtonDelegate {
+            id: unlockButton
+            text: i18nc("@action:button", "Unlock")
+            icon.name: "unlock"
+            enabled: passwordField.text.length > 0 && !ssssHandler.processing
+            onClicked: {
+                ssssHandler.processing = true
+                banner.visible = false
+                ssssHandler.unlockSSSSWithPassphrase(passwordField.text)
+            }
+        }
+    }
+
+    FormCard.FormHeader {
+        title: i18nc("@title", "Unlock using Security Key")
+    }
+    FormCard.FormCard {
+        FormCard.FormTextDelegate {
+            description: i18nc("@info", "If you have a security key for this account, enter it below or upload it as a file.")
         }
         FormCard.FormTextFieldDelegate {
             id: securityKeyField
-            label: i18nc("@label:textbox", "Security Key or Backup Passphrase:")
+            label: i18nc("@label:textbox", "Security Key:")
             echoMode: TextInput.Password
         }
         FormCard.FormButtonDelegate {
             id: uploadSecurityKeyButton
             text: i18nc("@action:button", "Upload from File")
             icon.name: "cloud-upload"
-            enabled: !root.processing
+            enabled: !ssssHandler.processing
             onClicked: {
-                root.processing = true
+                ssssHandler.processing = true
                 openFileDialog.open()
             }
         }
@@ -70,10 +101,10 @@ FormCard.FormCardPage {
             id: unlockSecurityKeyButton
             text: i18nc("@action:button", "Unlock")
             icon.name: "unlock"
-            enabled: securityKeyField.text.length > 0 && !root.processing
+            enabled: securityKeyField.text.length > 0 && !ssssHandler.processing
             onClicked: {
-                root.processing = true
-                Controller.activeConnection.unlockSSSS(securityKeyField.text)
+                ssssHandler.processing = true
+                ssssHandler.unlockSSSSFromSecurityKey(securityKeyField.text)
             }
         }
     }
@@ -89,10 +120,10 @@ FormCard.FormCardPage {
             id: unlockCrossSigningButton
             icon.name: "emblem-shared-symbolic"
             text: i18nc("@action:button", "Request from other Devices")
-            enabled: !root.processing
+            enabled: !ssssHandler.processing
             onClicked: {
-                root.processing = true
-                Controller.activeConnection.unlockSSSS("")
+                ssssHandler.processing = true
+                ssssHandler.unlockSSSSFromCrossSigning()
             }
         }
     }

src/app/qml/UserDetailDialog.qml

@@ -293,25 +293,5 @@ Kirigami.Dialog {
             icon.name: "username-copy"
             onClicked: Clipboard.saveText("https://matrix.to/#/" + root.user.id)
         }
-
-        FormCard.FormButtonDelegate {
-            text: i18nc("@action:button 'Report' as in 'Report this user to the administrators'", "Report…")
-            icon.name: "dialog-warning-symbolic"
-            visible: root.connection.supportsMatrixSpecVersion("v1.13")
-            onClicked: {
-                let dialog = ((QQC2.ApplicationWindow.window as Kirigami.ApplicationWindow).pageStack as Kirigami.PageRow).pushDialogLayer(Qt.createComponent('org.kde.neochat', 'ReasonDialog'), {
-                    title: i18nc("@title:dialog", "Report User"),
-                    placeholder: i18nc("@info:placeholder", "Reason for reporting this user"),
-                    icon: "dialog-warning-symbolic",
-                    actionText: i18nc("@action:button 'Report' as in 'Report this user to the administrators'", "Report")
-                }, {
-                    title: i18nc("@title", "Report User"),
-                    width: Kirigami.Units.gridUnit * 25
-                }) as ReasonDialog;
-                dialog.accepted.connect(reason => {
-                    root.connection.reportUser(root.user.id, reason);
-                });
-            }
-        }
     }
 }

src/app/qml/VerificationCanceled.qml

@@ -11,19 +11,7 @@ VerificationMessage {
 
     required property int reason
 
-    icon: {
-        switch (root.reason) {
-            case KeyVerificationSession.TIMEOUT:
-            case KeyVerificationSession.REMOTE_TIMEOUT:
-            case KeyVerificationSession.USER:
-            case KeyVerificationSession.REMOTE_USER:
-            case KeyVerificationSession.SESSION_ACCEPTED:
-            case KeyVerificationSession.REMOTE_SESSION_ACCEPTED:
-                return "dialog-information";
-            default:
-                return "security-low";
-        }
-    }
+    icon: "security-low"
     text: {
         switch (root.reason) {
         case KeyVerificationSession.NONE:

src/chatbar/ChatBar.qml

@@ -263,7 +263,6 @@ QQC2.Control {
                     wrapMode: TextEdit.Wrap
                     // This has to stay PlainText or else formatting starts breaking in strange ways
                     textFormat: TextEdit.PlainText
-                    font.pointSize: Kirigami.Theme.defaultFont.pointSize * NeoChatConfig.fontScale
 
                     Accessible.description: placeholderText
 
@@ -286,8 +285,6 @@ QQC2.Control {
                             quickFormatBar.selectionStart = selectionStart;
                             quickFormatBar.selectionEnd = selectionEnd;
                             quickFormatBar.open();
-                        } else if (quickFormatBar.visible) {
-                            quickFormatBar.close();
                         }
                     }
 

src/chatbar/EmojiDelegate.qml

@@ -4,7 +4,6 @@
 import QtQuick
 import QtQuick.Controls as QQC2
 import org.kde.kirigami as Kirigami
-import org.kde.neochat
 
 QQC2.ItemDelegate {
     id: root
@@ -30,7 +29,6 @@ QQC2.ItemDelegate {
             horizontalAlignment: Text.AlignHCenter
             verticalAlignment: Text.AlignVCenter
             font.family: "emoji"
-            font.pointSize: Kirigami.Theme.defaultFont.pointSize * NeoChatConfig.fontScale
 
             Kirigami.Icon {
                 width: Kirigami.Units.gridUnit * 0.5

src/devtools/DevtoolsPage.qml

@@ -17,7 +17,6 @@ Kirigami.ScrollablePage {
 
     property NeoChatRoom room
     required property NeoChatConnection connection
-    property alias currentTabIndex: tabBar.currentIndex
 
     title: i18nc("@title", "Developer Tools")
 

src/devtools/FeatureFlagPage.qml

@@ -21,6 +21,12 @@ FormCard.FormCard {
 
         onToggled: NeoChatConfig.threads = checked
     }
+    FormCard.FormCheckDelegate {
+        text: i18nc("@option:check Enable the matrix 'secret backup' feature", "Secret Backup")
+        checked: NeoChatConfig.secretBackup
+
+        onToggled: NeoChatConfig.secretBackup = checked
+    }
     FormCard.FormCheckDelegate {
         text: i18nc("@option:check Enable the matrix feature to add a phone number as a third party ID", "Add phone numbers as 3PIDs")
         checked: NeoChatConfig.phone3PId

src/libneochat/CMakeLists.txt

@@ -33,8 +33,6 @@ target_sources(LibNeoChat PRIVATE
     events/imagepackevent.cpp
     events/pollevent.cpp
     jobs/neochatgetcommonroomsjob.cpp
-    jobs/neochatreportroomjob.cpp
-    jobs/neochatreportuserjob.cpp
     models/actionsmodel.cpp
     models/completionmodel.cpp
     models/completionproxymodel.cpp

src/libneochat/accountmanager.cpp

@@ -15,6 +15,7 @@
 #include "general_logging.h"
 
 using namespace Qt::StringLiterals;
+using namespace Quotient;
 
 AccountManager::AccountManager(bool testMode, QObject *parent)
     : QObject(parent)
@@ -39,7 +40,7 @@ Quotient::AccountRegistry *AccountManager::accounts()
 
 void AccountManager::loadAccountsFromCache()
 {
-    for (const auto &accountId : Quotient::SettingsGroup("Accounts"_L1).childGroups()) {
+    for (const auto &accountId : AccountSettingsGroup().childGroups()) {
         Quotient::AccountSettings account{accountId};
         m_accountsLoading += accountId;
         Q_EMIT accountsLoadingChanged();

src/libneochat/chatbarcache.cpp

@@ -3,10 +3,6 @@
 
 #include "chatbarcache.h"
 
-#include <QMimeData>
-
-#include <KUrlMimeData>
-
 #include <Quotient/roommember.h>
 
 #include "eventhandler.h"
@@ -299,17 +295,4 @@ void ChatBarCache::clearCache()
     clearRelations();
 }
 
-void ChatBarCache::drop(QList<QUrl> u, const QString &transferPortal)
-{
-    QMimeData mimeData;
-    mimeData.setUrls(u);
-    if (!transferPortal.isEmpty()) {
-        mimeData.setData(u"application/vnd.portal.filetransfer"_s, transferPortal.toLatin1());
-    }
-    auto urls = KUrlMimeData::urlsFromMimeData(&mimeData);
-    if (urls.size() > 0) {
-        setAttachmentPath(urls[0].toString());
-    }
-}
-
 #include "moc_chatbarcache.cpp"

src/libneochat/chatbarcache.h

@@ -198,8 +198,6 @@ public:
      */
     Q_INVOKABLE void postMessage();
 
-    Q_INVOKABLE void drop(QList<QUrl> urls, const QString &transferPortal);
-
 Q_SIGNALS:
     void textChanged();
     void relationIdChanged(const QString &oldEventId, const QString &newEventId);

src/libneochat/enums/roomsortparameter.h

@@ -89,7 +89,7 @@ public:
         case Parameter::MostHighlights:
             return i18nc("@info", "Rooms with the most highlighted messages are higher");
         case Parameter::LastActive:
-            return i18nc("@info", "Rooms with newer events are higher");
+            return i18nc("@info", "Rooms with the newer messages are higher");
         default:
             return {};
         }

src/libneochat/eventhandler.cpp

@@ -389,9 +389,9 @@ QString EventHandler::getBody(const NeoChatRoom *room, const Quotient::RoomEvent
                     return i18n("left the room");
                 }
                 if (const auto &reason = e.contentJson()["reason"_L1].toString().toHtmlEscaped(); !reason.isEmpty()) {
-                    return i18n("has removed %1 from the room: %2", subjectName, reason);
+                    return i18n("has put %1 out of the room: %2", subjectName, reason);
                 }
-                return i18n("has removed %1 from the room", subjectName);
+                return i18n("has put %1 out of the room", subjectName);
             case Membership::Ban:
                 if (e.senderId() != e.userId()) {
                     if (e.reason().isEmpty()) {

src/libneochat/jobs/neochatreportroomjob.cpp

@@ -1,14 +0,0 @@
-// SPDX-FileCopyrightText: 2025 Joshua Goins <josh@redstrate.com>
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "neochatreportroomjob.h"
-
-using namespace Quotient;
-
-NeochatReportRoomJob::NeochatReportRoomJob(const QString &userId, const QString &reason)
-    : BaseJob(HttpVerb::Post, u"ReportRoomJob"_s, makePath(" /_matrix/client/v3/", userId, "/report"))
-{
-    QJsonObject _dataJson;
-    addParam<IfNotEmpty>(_dataJson, "reason"_L1, reason);
-    setRequestData({_dataJson});
-}

src/libneochat/jobs/neochatreportroomjob.h

@@ -1,13 +0,0 @@
-// SPDX-FileCopyrightText: 2025 Joshua Goins <josh@redstrate.com>
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include <Quotient/jobs/basejob.h>
-
-// TODO: Remove once libQuotient updates to Matrix API v1.14
-class NeochatReportRoomJob : public Quotient::BaseJob
-{
-public:
-    explicit NeochatReportRoomJob(const QString &roomId, const QString &reason);
-};

src/libneochat/jobs/neochatreportuserjob.cpp

@@ -1,14 +0,0 @@
-// SPDX-FileCopyrightText: 2025 Joshua Goins <josh@redstrate.com>
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "neochatreportuserjob.h"
-
-using namespace Quotient;
-
-NeochatReportUserJob::NeochatReportUserJob(const QString &userId, const QString &reason)
-    : BaseJob(HttpVerb::Post, u"ReportUserJob"_s, makePath("/_matrix/client/v3/users/", userId, "/report"))
-{
-    QJsonObject _dataJson;
-    addParam<IfNotEmpty>(_dataJson, "reason"_L1, reason);
-    setRequestData({_dataJson});
-}

src/libneochat/jobs/neochatreportuserjob.h

@@ -1,13 +0,0 @@
-// SPDX-FileCopyrightText: 2025 Joshua Goins <josh@redstrate.com>
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include <Quotient/jobs/basejob.h>
-
-// TODO: Remove once libQuotient updates to Matrix API v1.14
-class NeochatReportUserJob : public Quotient::BaseJob
-{
-public:
-    explicit NeochatReportUserJob(const QString &userId, const QString &reason);
-};

src/libneochat/neochatconnection.cpp

@@ -6,7 +6,6 @@
 #include <QImageReader>
 #include <QJsonDocument>
 
-#include "jobs/neochatreportuserjob.h"
 #include "neochatroom.h"
 #include "spacehierarchycache.h"
 
@@ -20,7 +19,6 @@
 #include <Quotient/csapi/profile.h>
 #include <Quotient/csapi/registration.h>
 #include <Quotient/csapi/versions.h>
-#include <Quotient/e2ee/sssshandler.h>
 #include <Quotient/jobs/downloadfilejob.h>
 #include <Quotient/qt_connection_util.h>
 #include <Quotient/room.h>
@@ -97,7 +95,6 @@ void NeoChatConnection::connectSignals()
                 Q_EMIT directChatsHaveHighlightNotificationsChanged();
             });
         }
-        Q_EMIT roomInvitesChanged();
         connect(room, &Room::unreadStatsChanged, this, [this]() {
             refreshBadgeNotificationCount();
             Q_EMIT homeNotificationsChanged();
@@ -162,10 +159,6 @@ void NeoChatConnection::refreshBadgeNotificationCount()
     for (const auto &r : allRooms()) {
         if (const auto room = static_cast<NeoChatRoom *>(r)) {
             count += room->contextAwareNotificationCount();
-
-            if (room->joinState() == JoinState::Invite) {
-                count++;
-            }
         }
     }
 
@@ -197,7 +190,7 @@ void NeoChatConnection::setKeywordPushRuleDefault(PushRuleAction::Action default
 
 void NeoChatConnection::logout(bool serverSideLogout)
 {
-    SettingsGroup(u"Accounts"_s).remove(userId());
+    AccountSettingsGroup().remove(userId());
 
     QKeychain::DeletePasswordJob job(qAppName());
     job.setAutoDelete(true);
@@ -459,20 +452,15 @@ bool NeoChatConnection::homeHaveHighlightNotifications() const
     return false;
 }
 
-qsizetype NeoChatConnection::directChatInvites() const
+bool NeoChatConnection::directChatInvites() const
 {
-    const auto inviteRooms = rooms(JoinState::Invite);
-    return std::ranges::count_if(inviteRooms, [](const auto room) {
-        return room->isDirectChat();
-    });
-}
-
-qsizetype NeoChatConnection::roomInvites() const
-{
-    const auto inviteRooms = rooms(JoinState::Invite);
-    return std::ranges::count_if(inviteRooms, [](const auto room) {
-        return !room->isDirectChat();
-    });
+    auto inviteRooms = rooms(JoinState::Invite);
+    for (const auto inviteRoom : inviteRooms) {
+        if (inviteRoom->isDirectChat()) {
+            return true;
+        }
+    }
+    return false;
 }
 
 QCoro::Task<void> NeoChatConnection::setupPushNotifications(QString endpoint)
@@ -576,36 +564,4 @@ bool NeoChatConnection::isVerifiedSession() const
     return isVerifiedDevice(userId(), deviceId());
 }
 
-void NeoChatConnection::unlockSSSS(const QString &secret)
-{
-    auto handler = new SSSSHandler();
-    handler->setConnection(this);
-    connect(handler, &SSSSHandler::error, this, [secret, handler, this]() {
-        disconnect(handler, &SSSSHandler::error, this, nullptr);
-        if (!secret.isEmpty()) {
-            connect(handler, &SSSSHandler::error, this, [handler, this]() {
-                Q_EMIT keyBackupError();
-                delete handler;
-            });
-            handler->unlockSSSSWithPassphrase(secret);
-        } else {
-            Q_EMIT keyBackupError();
-        }
-    });
-    connect(handler, &SSSSHandler::keyBackupUnlocked, this, [handler, this]() {
-        Q_EMIT keyBackupUnlocked();
-        connect(handler, &SSSSHandler::finished, handler, &SSSSHandler::deleteLater);
-    });
-    if (secret.isEmpty()) {
-        handler->unlockSSSSFromCrossSigning();
-    } else {
-        handler->unlockSSSSFromSecurityKey(secret);
-    }
-}
-
-void NeoChatConnection::reportUser(const QString &userId, const QString &reason)
-{
-    callApi<NeochatReportUserJob>(userId, reason);
-}
-
 #include "moc_neochatconnection.cpp"

src/libneochat/neochatconnection.h

@@ -66,14 +66,9 @@ class NeoChatConnection : public Quotient::Connection
     Q_PROPERTY(bool homeHaveHighlightNotifications READ homeHaveHighlightNotifications NOTIFY homeHaveHighlightNotificationsChanged)
 
     /**
-     * @brief The number of invites to 1-on-1 direct chats.
+     * @brief Whether there is at least one invite to a direct chat.
      */
-    Q_PROPERTY(qsizetype directChatInvites READ directChatInvites NOTIFY directChatInvitesChanged)
-
-    /**
-     * @brief The number of pending, normal room invites.
-     */
-    Q_PROPERTY(qsizetype roomInvites READ roomInvites NOTIFY roomInvitesChanged)
+    Q_PROPERTY(bool directChatInvites READ directChatInvites NOTIFY directChatInvitesChanged)
 
     /**
      * @brief Whether the server supports querying a user's mutual rooms.
@@ -205,8 +200,7 @@ public:
      */
     static void setKeywordPushRuleDefault(PushRuleAction::Action defaultAction);
 
-    qsizetype directChatInvites() const;
-    qsizetype roomInvites() const;
+    bool directChatInvites() const;
 
     // note: this is intentionally a copied QString because
     // the reference could be destroyed before the task is finished
@@ -222,13 +216,6 @@ public:
      */
     bool isVerifiedSession() const;
 
-    Q_INVOKABLE void unlockSSSS(const QString &secret);
-
-    /**
-      * @brief Report a user.
-      */
-    Q_INVOKABLE void reportUser(const QString &userId, const QString &reason);
-
 Q_SIGNALS:
     void globalUrlPreviewEnabledChanged();
     void labelChanged();
@@ -238,7 +225,6 @@ Q_SIGNALS:
     void homeNotificationsChanged();
     void homeHaveHighlightNotificationsChanged();
     void directChatInvitesChanged();
-    void roomInvitesChanged();
     void passwordStatus(NeoChatConnection::PasswordStatus status);
     void userConsentRequired(QUrl url);
     void badgeNotificationCountChanged(int count);
@@ -266,9 +252,6 @@ Q_SIGNALS:
      */
     void ownSessionVerified();
 
-    void keyBackupUnlocked();
-    void keyBackupError();
-
 private:
     static bool m_globalUrlPreviewDefault;
     static PushRuleAction::Action m_defaultAction;

src/libneochat/neochatroom.cpp

@@ -50,12 +50,12 @@
 #include "roomlastmessageprovider.h"
 #include "spacehierarchycache.h"
 #include "urlhelper.h"
-#include "jobs/neochatreportroomjob.h"
 
 #ifndef Q_OS_ANDROID
 #include <KIO/Job>
 #include <KIO/JobTracker>
 #endif
+
 #include <KJobTrackerInterface>
 #include <KLocalizedString>
 
@@ -346,10 +346,6 @@ void NeoChatRoom::forget()
 
 void NeoChatRoom::sendTypingNotification(bool isTyping)
 {
-    // During the chatbar setup sequence, this may get called while we're still initializing
-    if (localMember().isEmpty()) {
-        return;
-    }
     connection()->callApi<SetTypingJob>(BackgroundRequest, localMember().id(), id(), isTyping, 10000);
 }
 
@@ -1838,9 +1834,4 @@ QString NeoChatRoom::pinnedMessage() const
     return m_pinnedMessage;
 }
 
-void NeoChatRoom::report(const QString &reason)
-{
-    connection()->callApi<NeochatReportRoomJob>(id(), reason);
-}
-
 #include "moc_neochatroom.cpp"

src/libneochat/neochatroom.h

@@ -622,11 +622,6 @@ public:
      */
     QString pinnedMessage() const;
 
-    /**
-     * @brief Send a report about this room.
-     */
-    Q_INVOKABLE void report(const QString &reason);
-
 private:
     bool m_visible = false;
 

src/messagecontent/CodeComponent.qml

@@ -77,7 +77,6 @@ QQC2.Control {
             color: Kirigami.Theme.textColor
 
             font.family: "monospace"
-            font.pointSize: Kirigami.Theme.defaultFont.pointSize * NeoChatConfig.fontScale
 
             Kirigami.SpellCheck.enabled: false
 

src/messagecontent/LinkPreviewComponent.qml

@@ -41,12 +41,7 @@ QQC2.Control {
      */
     property var defaultHeight: Kirigami.Units.gridUnit * 3 + Kirigami.Units.largeSpacing * 2
 
-    /**
-     * @brief Whether the link preview description is truncated.
-     *
-     * This is only applicable if there *is* a text description, and is never true for images.
-     */
-    property bool truncated: linkPreviewDescription.truncated && linkPreviewDescription.visible
+    property bool truncated: linkPreviewDescription.truncated || !linkPreviewDescription.visible
 
     /**
      * @brief Request for this delegate to be removed.
@@ -77,7 +72,7 @@ QQC2.Control {
             id: previewImage
             Layout.preferredWidth: root.defaultHeight
             Layout.preferredHeight: root.defaultHeight
-            Layout.maximumWidth: root.defaultHeight
+            Layout.fillWidth: true
             Layout.fillHeight: true
             visible: root.linkPreviewer.imageSource.toString().length > 0
             source: root.linkPreviewer.imageSource
@@ -87,9 +82,9 @@ QQC2.Control {
         }
         ColumnLayout {
             id: column
-            Layout.preferredWidth: Math.max(linkPreviewTitle.implicitWidth, linkPreviewDescription.implicitWidth)
-            Layout.fillWidth: true
+            implicitWidth: Math.max(linkPreviewTitle.implicitWidth, linkPreviewDescription.implicitWidth)
             spacing: Kirigami.Units.smallSpacing
+            visible: root.linkPreviewer.title.length > 0 || root.linkPreviewer.description.length > 0
             Kirigami.Heading {
                 id: linkPreviewTitle
                 Layout.fillWidth: true
@@ -126,11 +121,10 @@ QQC2.Control {
             acceptedButtons: Qt.LeftButton
             onTapped: RoomManager.resolveResource(root.linkPreviewer.url, "join")
         }
+    }
 
-        HoverHandler {
-            cursorShape: Qt.PointingHandCursor
-            onHoveredChanged: (root.QQC2.ApplicationWindow.window as Main).hoverLinkIndicator.text = hovered ? root.linkPreviewer.url : ""
-        }
+    HoverHandler {
+        cursorShape: Qt.PointingHandCursor
     }
 
     QQC2.Button {

src/messagecontent/QuoteComponent.qml

@@ -58,7 +58,6 @@ QQC2.Control {
         selectionColor: Kirigami.Theme.highlightColor
 
         font.italic: true
-        font.pointSize: Kirigami.Theme.defaultFont.pointSize * NeoChatConfig.fontScale
 
         onSelectedTextChanged: root.selectedTextChanged(selectedText)
 

src/messagecontent/ReactionComponent.qml

@@ -51,7 +51,6 @@ Flow {
                 horizontalAlignment: Text.AlignHCenter
                 verticalAlignment: Text.AlignVCenter
                 text: reactionDelegate.textContent
-                font.pointSize: Kirigami.Theme.defaultFont.pointSize * NeoChatConfig.fontScale
                 background: null
                 wrapMode: TextEdit.NoWrap
                 textFormat: Text.RichText

src/messagecontent/TextComponent.qml

@@ -67,9 +67,7 @@ TextEdit {
     selectedTextColor: Kirigami.Theme.highlightedTextColor
     selectionColor: Kirigami.Theme.highlightColor
     font {
-        pointSize: !root.isReply && QmlUtils.isEmoji(display)
-                   ? Kirigami.Theme.defaultFont.pointSize * 4 * NeoChatConfig.fontScale
-                   : Kirigami.Theme.defaultFont.pointSize * NeoChatConfig.fontScale
+        pointSize: !root.isReply && QmlUtils.isEmoji(display) ? Kirigami.Theme.defaultFont.pointSize * 4 : Kirigami.Theme.defaultFont.pointSize
         family: QmlUtils.isEmoji(display) ? 'emoji' : Kirigami.Theme.defaultFont.family
     }
     selectByMouse: !Kirigami.Settings.isMobile

src/messagecontent/pollhandler.cpp

@@ -121,9 +121,7 @@ void PollHandler::handleResponse(const Quotient::PollResponseEvent *event)
             return;
         }
 
-        m_selections[event->senderId()] = event->selections().size() > 0
-            ? event->selections().first(std::min(pollStartEvent->maxSelections(), (int)event->selections().size()))
-            : event->selections();
+        m_selections[event->senderId()] = event->selections().size() > 0 ? event->selections().first(pollStartEvent->maxSelections()) : event->selections();
         if (m_selections.contains(event->senderId()) && m_selections[event->senderId()].isEmpty()) {
             m_selections.remove(event->senderId());
         }

src/roominfo/LocationsPage.qml

@@ -7,7 +7,7 @@ import QtPositioning
 
 import org.kde.kirigami as Kirigami
 
-import org.kde.neochat
+import org.kde.neochat.libneochat
 
 Kirigami.Page {
     id: root

src/roominfo/RoomInformation.qml

@@ -79,7 +79,7 @@ QQC2.ScrollView {
                 id: searchButton
                 visible: !root.room.isSpace
                 icon.name: "search"
-                text: i18nc("@action:button", "Search Messages")
+                text: i18n("Search in this room")
                 activeFocusOnTab: true
 
                 Layout.fillWidth: true
@@ -107,7 +107,7 @@ QQC2.ScrollView {
                 id: favouriteButton
                 visible: !root.room.isSpace
                 icon.name: root.room && root.room.isFavourite ? "rating" : "rating-unrated"
-                text: root.room && root.room.isFavourite ? i18nc("@action:button", "Remove from Favorites") : i18nc("@action:button", "Add to Favorites")
+                text: root.room && root.room.isFavourite ? i18n("Remove room from favorites") : i18n("Favorite this room")
 
                 onClicked: root.room.isFavourite ? root.room.removeTag("m.favourite") : root.room.addTag("m.favourite", 1.0)
 
@@ -120,7 +120,7 @@ QQC2.ScrollView {
                 id: widgetsButton
                 visible: !root.room.isSpace
                 icon.name: "extension-symbolic"
-                text: i18nc("@action:button", "Extensions")
+                text: i18nc("@action:button", "Extensions for this room")
                 activeFocusOnTab: true
 
                 onClicked: ((QQC2.ApplicationWindow.window as Kirigami.ApplicationWindow).pageStack as Kirigami.PageRow).pushDialogLayer(Qt.createComponent('org.kde.neochat', 'WidgetsPage'), {
@@ -136,7 +136,7 @@ QQC2.ScrollView {
                 id: locationsButton
                 visible: !root.room.isSpace
                 icon.name: "map-flat"
-                text: i18nc("@action:button", "Shared Locations")
+                text: i18n("Show locations for this room")
                 activeFocusOnTab: true
 
                 onClicked: ((QQC2.ApplicationWindow.window as Kirigami.ApplicationWindow).pageStack as Kirigami.PageRow).pushDialogLayer(Qt.createComponent('org.kde.neochat', 'LocationsPage'), {
@@ -152,7 +152,7 @@ QQC2.ScrollView {
                 id: pinnedMessagesButton
                 visible: !root.room.isSpace
                 icon.name: "pin-symbolic"
-                text: i18nc("@action:button", "Pinned Messages")
+                text: i18nc("@action:button", "Pinned messages")
                 activeFocusOnTab: true
 
                 Layout.fillWidth: true
@@ -166,29 +166,10 @@ QQC2.ScrollView {
                 }
             }
 
-            Delegates.RoundedItemDelegate {
-                text: i18nc("@action:inmenu", "Inspect Room Data")
-                icon.name: "tools"
-                visible: NeoChatConfig.developerTools
-                activeFocusOnTab: true
-
-                Layout.fillWidth: true
-
-                onClicked: ((QQC2.ApplicationWindow.window as Kirigami.ApplicationWindow).pageStack as Kirigami.PageRow).pushDialogLayer(Qt.createComponent('org.kde.neochat.devtools', 'DevtoolsPage'), {
-                    connection: root.room.connection,
-                    currentTabIndex: 1, // Room data tab
-                    room: root.room
-                }, {
-                    title: i18nc("@title:window", "Developer Tools"),
-                    width: Kirigami.Units.gridUnit * 50,
-                    height: Kirigami.Units.gridUnit * 42
-                })
-            }
-
             Delegates.RoundedItemDelegate {
                 id: leaveButton
                 icon.name: "arrow-left-symbolic"
-                text: root.room.isSpace ? i18nc("@action:button", "Leave Space…") : i18nc("@action:button", "Leave Room…")
+                text: root.room.isSpace ? i18nc("@action:button", "Leave this space…") : i18nc("@action:button", "Leave this room…")
                 activeFocusOnTab: true
 
                 Layout.fillWidth: true

src/rooms/ExploreComponent.qml

@@ -46,6 +46,10 @@ RowLayout {
         onClicked: root.search();
         icon.name: "search"
         text: i18nc("@action", "Search Rooms")
+        Shortcut {
+            sequence: "Ctrl+F"
+            onActivated: searchButton.clicked()
+        }
 
         QQC2.ToolTip.visible: hovered
         QQC2.ToolTip.text: text

src/rooms/RoomContextMenu.qml

@@ -46,7 +46,7 @@ KirigamiComponents.ConvergentContextMenu {
     QQC2.Action {
         text: i18nc("@action:inmenu", "Mark as Read")
         icon.name: "checkmark"
-        enabled: root.room.notificationCount > 0 || root.room.highlightCount > 0
+        enabled: root.room.notificationCount > 0
         onTriggered: root.room.markAllMessagesAsRead()
     }
 
@@ -71,7 +71,7 @@ KirigamiComponents.ConvergentContextMenu {
         }
 
         Kirigami.Action {
-            text: i18nc("As in 'notify for all messages'", "All Messages")
+            text: i18nc("As in 'notify for all messages'", "All")
             icon.name: "notifications"
             checkable: true
             autoExclusive: true
@@ -95,7 +95,7 @@ KirigamiComponents.ConvergentContextMenu {
         }
 
         Kirigami.Action {
-            text: i18nc("As in 'do not notify for any messages'", "None")
+            text: i18nc("As in 'do not notify for any messages'", "Off")
             icon.name: "notifications-disabled"
             checkable: true
             autoExclusive: true
@@ -150,26 +150,6 @@ KirigamiComponents.ConvergentContextMenu {
         separator: true
     }
 
-    Kirigami.Action {
-        text: i18nc("@action:button 'Report' as in 'Report this room to the administrators'", "Report…")
-        icon.name: "dialog-warning-symbolic"
-        visible: root.connection.supportsMatrixSpecVersion("v1.13")
-        onTriggered: {
-            let dialog = (root.Kirigami.PageStack.pageStack as Kirigami.PageRow).pushDialogLayer(Qt.createComponent('org.kde.neochat', 'ReasonDialog'), {
-                title: i18nc("@title:dialog", "Report Room"),
-                placeholder: i18nc("@info:placeholder", "Reason for reporting this room"),
-                icon: "dialog-warning-symbolic",
-                actionText: i18nc("@action:button 'Report' as in 'Report this room to the administrators'", "Report")
-            }, {
-                title: i18nc("@title", "Report Room"),
-                width: Kirigami.Units.gridUnit * 25
-            }) as ReasonDialog;
-            dialog.accepted.connect(reason => {
-                currentRoom.report(reason);
-            });
-        }
-    }
-
     QQC2.Action {
         text: i18nc("@action:inmenu", "Leave Room…")
         icon.name: "go-previous"

src/rooms/RoomListPage.qml

@@ -78,11 +78,11 @@ Kirigami.Page {
     }
 
     function goToNextUnreadRoom() {
-        goToNextRoomFiltered(item => (item && item instanceof RoomDelegate && item.hasUnreadMessages));
+        goToNextRoomFiltered(item => (item && item instanceof RoomDelegate && item.hasUnread));
     }
 
     function goToPreviousUnreadRoom() {
-        goToPreviousRoomFiltered(item => (item && item instanceof RoomDelegate && item.hasUnreadMessages));
+        goToPreviousRoomFiltered(item => (item && item instanceof RoomDelegate && item.hasUnread));
     }
 
     titleDelegate: Loader {

src/rooms/SpaceDrawer.qml

@@ -81,15 +81,12 @@ QQC2.Control {
                 AvatarTabButton {
                     id: allRoomButton
 
-                    readonly property int countedNotifications: root.connection.homeNotifications + root.connection.roomInvites
-                    readonly property bool hasCountableNotifications: countedNotifications > 0
-
                     Layout.fillWidth: true
                     Layout.preferredHeight: width - Kirigami.Units.smallSpacing
                     Layout.maximumHeight: width - Kirigami.Units.smallSpacing
                     Layout.topMargin: Kirigami.Units.smallSpacing / 2
 
-                    text: hasCountableNotifications ? i18ncp("Home space for the uncategorized rooms", "Home (%1 notification)", "Home (%1 notifications)", countedNotifications) : i18nc("Home space for the uncategorized rooms", "Home")
+                    text: i18n("Home")
                     contentItem: Kirigami.Icon {
                         source: "user-home-symbolic"
 
@@ -103,15 +100,15 @@ QQC2.Control {
                             width: Math.max(homeNotificationCountTextMetrics.advanceWidth + Kirigami.Units.smallSpacing * 2, height)
                             height: Kirigami.Units.iconSizes.smallMedium
 
-                            text: allRoomButton.countedNotifications
-                            visible: allRoomButton.hasCountableNotifications && (RoomManager.currentSpace.length > 0 || RoomManager.currentSpace !== "DM")
+                            text: root.connection.homeNotifications > 0 ? root.connection.homeNotifications : ""
+                            visible: root.connection.homeNotifications > 0 && (RoomManager.currentSpace.length > 0 || RoomManager.currentSpace !== "DM")
                             color: Kirigami.Theme.textColor
                             horizontalAlignment: Text.AlignHCenter
                             background: Rectangle {
                                 visible: true
                                 Kirigami.Theme.colorSet: Kirigami.Theme.Button
                                 Kirigami.Theme.inherit: false
-                                color: root.connection.homeHaveHighlightNotifications || root.connection.roomInvites > 0 ? Kirigami.Theme.positiveTextColor : Kirigami.Theme.backgroundColor
+                                color: root.connection.homeHaveHighlightNotifications ? Kirigami.Theme.positiveTextColor : Kirigami.Theme.backgroundColor
                                 radius: height / 2
                             }
 
@@ -130,8 +127,7 @@ QQC2.Control {
                 AvatarTabButton {
                     id: directChatButton
 
-                    readonly property int countedNotifications: root.connection.directChatNotifications + root.connection.directChatInvites
-                    readonly property bool hasCountableNotifications: countedNotifications > 0
+                    readonly property bool hasCountableNotifications: root.connection.directChatNotifications > 0 || root.connection.directChatInvites > 0
 
                     Layout.fillWidth: true
                     Layout.preferredHeight: width - Kirigami.Units.smallSpacing
@@ -140,7 +136,7 @@ QQC2.Control {
 
                     text: {
                         if (directChatButton.hasCountableNotifications) {
-                            return i18ncp("@button View all one-on-one chats.", "Direct Messages (%1 notification)", "Direct Messages (%1 notifications)", directChatButton.countedNotifications);
+                            return i18ncp("@button View all one-on-one chats.", "Direct Messages (%1 notification)", "Direct Messages (%1 notifications)", root.connection.directChatNotifications + root.connection.directChatInvites);
                         }
 
                         return i18nc("@button View all one-on-one chats.", "Direct Messages");
@@ -166,7 +162,7 @@ QQC2.Control {
                                 visible: true
                                 Kirigami.Theme.colorSet: Kirigami.Theme.Button
                                 Kirigami.Theme.inherit: false
-                                color: root.connection.directChatsHaveHighlightNotifications || root.connection.directChatInvites > 0 ? Kirigami.Theme.positiveTextColor : Kirigami.Theme.backgroundColor
+                                color: root.connection.directChatsHaveHighlightNotifications || root.connection.directChatInvites ? Kirigami.Theme.positiveTextColor : Kirigami.Theme.backgroundColor
                                 radius: height / 2
                             }
 

src/settings/AppearanceSettingsPage.qml

@@ -43,40 +43,6 @@ FormCard.FormCardPage {
                 NeoChatConfig.save();
             }
         }
-
-        FormCard.FormDelegateSeparator {
-            above: fontScaleSliderDelegate
-            below: compactRoomListDelegate
-        }
-
-        /*!
-        Font scale setting allows user to adjust the font size used in the app.
-        */
-        FormCard.AbstractFormDelegate {
-            id: fontScaleSliderDelegate
-            background: Item {}
-            contentItem: ColumnLayout {
-                QQC2.Label {
-                    text: i18nc("@label Font size for text in the chat pane", "Chat font scaling")
-                    Layout.fillWidth: true
-                }
-                QQC2.Label {
-                    text: i18nc("@label:slider Current font scale percentage. %1 is the numeric percentage value, the second % is the symbol e.g. 120%", "%1%", Math.round(NeoChatConfig.fontScale * 100))
-                    Layout.fillWidth: true
-                }
-                QQC2.Slider {
-                    from: 0.5
-                    to: 3.0
-                    stepSize: 0.1
-                    value: NeoChatConfig.fontScale
-                    onMoved: {
-                        NeoChatConfig.fontScale = value;
-                        NeoChatConfig.save();
-                    }
-                    Layout.fillWidth: true
-                }
-            }
-        }
     }
 
     FormCard.FormHeader {

src/settings/CMakeLists.txt

@@ -50,7 +50,6 @@ ecm_add_qml_module(Settings GENERATE_PLUGIN_SOURCE
         RoomSortParameterDialog.qml
         RoomProfile.qml
         RoomAdvancedPage.qml
-        KeyboardShortcutsPage.qml
     SOURCES
         colorschemer.cpp
         threepidaddhelper.cpp

src/settings/KeyboardShortcutsPage.qml

@@ -1,52 +0,0 @@
-// SPDX-FileCopyrightText: 2025 Joshua Goins <josh@redstrate.com>
-// SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
-
-import QtQuick
-import QtQuick.Controls as QQC2
-import QtQuick.Layouts
-
-import org.kde.kirigami as Kirigami
-import org.kde.kirigamiaddons.formcard as FormCard
-
-FormCard.FormCardPage {
-    title: i18nc("@title:window", "Keyboard Shortcuts")
-
-    FormCard.FormCard {
-        Layout.topMargin: Kirigami.Units.largeSpacing * 4
-
-        FormCard.FormTextDelegate {
-            text: i18nc("@info:label", "Open Quick Switcher")
-            description: "Ctrl+K"
-        }
-
-        FormCard.FormTextDelegate {
-            text: i18nc("@info:label", "Open Account Switcher")
-            description: "Ctrl+U"
-        }
-
-        FormCard.FormTextDelegate {
-            text: i18nc("@info:label", "Search Messages in Current Room")
-            description: "Ctrl+F"
-        }
-
-        FormCard.FormTextDelegate {
-            text: i18nc("@info:label", "Go to Previous Room")
-            description: "Ctrl+PgUp, Ctrl+Backtab, Alt+Up"
-        }
-
-        FormCard.FormTextDelegate {
-            text: i18nc("@info:label", "Go to Next Room")
-            description: "Ctrl+PgDown, Ctrl+Tab, Alt+Down"
-        }
-
-        FormCard.FormTextDelegate {
-            text: i18nc("@info:label", "Go to Previous Unread Room")
-            description: "Alt+Shift+Up"
-        }
-
-        FormCard.FormTextDelegate {
-            text: i18nc("@info:label", "Go to Next Unread Room")
-            description: "Alt+Shift+Down"
-        }
-    }
-}