Fix building with KUnifiedPush on Android

I made sure it doesn't include KDBusService and removed the if check in CMake.
GIT_SILENT Sync po/docbooks with svn
2025-12-20 17:29:43 -05:00 · 2025-12-19 01:42:17 +00:00 · 2025-12-18 01:41:35 +00:00 · 2025-12-17 21:33:08 +00:00 · 2025-12-16 14:25:07 +00:00 · 2025-12-14 16:41:47 +00:00
104 changed files with 26562 additions and 14216 deletions
--- a/.flatpak-manifest.json
+++ b/.flatpak-manifest.json
@@ -2,7 +2,7 @@
    "id": "org.kde.neochat",
    "branch": "master",
    "runtime": "org.kde.Platform",
-    "runtime-version": "6.9",
+    "runtime-version": "6.10",
    "sdk": "org.kde.Sdk",
    "command": "neochat",
    "tags": [
@@ -31,19 +31,6 @@
        "/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": [
@@ -78,6 +65,7 @@
            "name": "olm",
            "buildsystem": "cmake-ninja",
            "config-opts": [
+                "-DCMAKE_POLICY_VERSION_MINIMUM=3.5",
                "-DOLM_TESTS=OFF"
            ],
            "sources": [
@@ -184,8 +172,8 @@
            "sources": [
                {
                    "type": "archive",
-                    "url": "https://download.kde.org/stable/release-service/25.08.0/src/kunifiedpush-25.08.0.tar.xz",
-                    "sha256": "846db6ffc7d93f6afea7ce0d5a9f10b52792157ceb593856542279f4197f3518",
+                    "url": "https://download.kde.org/stable/release-service/25.08.3/src/kunifiedpush-25.08.3.tar.xz",
+                    "sha256": "e8c924438d5359f0fa0930ab35111012076e3a0ff4e959d6929595571383320a",
                    "x-checker-data": {
                        "type": "anitya",
                        "project-id": 8763,
--- a/.kde-ci.yml
+++ b/.kde-ci.yml
@@ -14,7 +14,6 @@ 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'
@@ -29,12 +28,15 @@ Dependencies:
      'frameworks/kio': '@latest-kf6'
      'frameworks/kwindowsystem': '@latest-kf6'
      'frameworks/kstatusnotifieritem': '@latest-kf6'
-      'frameworks/kcrash': '@latest-kf6'
+
+  - 'on': ['Linux', 'FreeBSD', 'Android']
+    'require':
+      'libraries/kunifiedpush': '@latest-kf6'
+
  - 'on': ['Linux', 'FreeBSD']
    'require':
      'frameworks/kdbusaddons': '@latest-kf6'
      'frameworks/purpose': '@latest-kf6'
-      'libraries/kunifiedpush': '@latest-kf6'

  - 'on': ['Linux']
    'require':
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,8 +7,8 @@
 cmake_minimum_required(VERSION 3.16)

 # KDE Applications version, managed by release script.
-set(RELEASE_SERVICE_VERSION_MAJOR "25")
-set(RELEASE_SERVICE_VERSION_MINOR "11")
+set(RELEASE_SERVICE_VERSION_MAJOR "26")
+set(RELEASE_SERVICE_VERSION_MINOR "03")
 set(RELEASE_SERVICE_VERSION_MICRO "70")
 set(RELEASE_SERVICE_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE_VERSION_MINOR}.${RELEASE_SERVICE_VERSION_MICRO}")

@@ -46,10 +46,6 @@ 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)
@@ -69,7 +65,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 IconThemes ColorScheme)
+find_package(KF6 ${KF_MIN_VERSION} COMPONENTS Kirigami I18n Notifications Config CoreAddons Sonnet ItemModels ColorScheme)
 set_package_properties(KF6 PROPERTIES
    TYPE REQUIRED
    PURPOSE "Basic application components"
@@ -92,7 +88,7 @@ if(ANDROID)
    )
 else()
    find_package(Qt6 ${QT_MIN_VERSION} COMPONENTS Widgets)
-    find_package(KF6 ${KF_MIN_VERSION} REQUIRED COMPONENTS QQC2DesktopStyle KIO WindowSystem StatusNotifierItem Crash)
+    find_package(KF6 ${KF_MIN_VERSION} REQUIRED COMPONENTS QQC2DesktopStyle KIO WindowSystem StatusNotifierItem)
    find_package(KF6SyntaxHighlighting ${KF_MIN_VERSION} REQUIRED)
    set_package_properties(KF6QQC2DesktopStyle PROPERTIES
        TYPE RUNTIME
@@ -152,7 +148,7 @@ set_package_properties(KF6DocTools PROPERTIES DESCRIPTION

 option(WITH_UNIFIEDPUSH "Build with KUnifiedPush support" ON)

-if (ANDROID OR APPLE OR WIN32 OR HAIKU)
+if (APPLE OR WIN32 OR HAIKU)
    set(WITH_UNIFIEDPUSH OFF)
 endif()

--- a/cmake/Flatpak.cmake
+++ b/cmake/Flatpak.cmake
@@ -1,14 +0,0 @@
-# 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
-)
-
--- a/cmake/Flatpak/99-noto-mono-color-emoji.conf
+++ b/cmake/Flatpak/99-noto-mono-color-emoji.conf
@@ -1,23 +0,0 @@
-<?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>
-
--- a/org.kde.neochat.appdata.xml
+++ b/org.kde.neochat.appdata.xml
@@ -320,7 +320,6 @@
    <value key="KDE::windows_store::StoreLogoSquare">https://invent.kde.org/network/neochat/-/raw/master/icons/windows/storelogo-1080x1080.png</value>
    <value key="KDE::windows_store::Icon">https://invent.kde.org/network/neochat/-/raw/master/icons/300-apps-neochat.png</value>
    <value key="KDE::windows_store::PromotionalArt16x9">https://invent.kde.org/network/neochat/-/raw/master/icons/windows/promoimage-1920x1080.png</value>
-    <value key="KDE::supporters">.</value>
  </custom>
  <launchable type="desktop-id">org.kde.neochat.desktop</launchable>
  <screenshots>
@@ -488,6 +487,8 @@
    <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"/>
--- a/po/ar/neochat.po
+++ b/po/ar/neochat.po
--- a/po/ast/neochat.po
+++ b/po/ast/neochat.po
--- a/po/az/neochat.po
+++ b/po/az/neochat.po
--- a/po/ca/neochat.po
+++ b/po/ca/neochat.po
--- a/po/ca@valencia/neochat.po
+++ b/po/ca@valencia/neochat.po
--- a/po/cs/neochat.po
+++ b/po/cs/neochat.po
--- a/po/da/neochat.po
+++ b/po/da/neochat.po
--- a/po/de/neochat.po
+++ b/po/de/neochat.po
--- a/po/el/neochat.po
+++ b/po/el/neochat.po
--- a/po/en_GB/neochat.po
+++ b/po/en_GB/neochat.po
--- a/po/eo/neochat.po
+++ b/po/eo/neochat.po
--- a/po/es/neochat.po
+++ b/po/es/neochat.po
--- a/po/eu/neochat.po
+++ b/po/eu/neochat.po
--- a/po/fi/neochat.po
+++ b/po/fi/neochat.po
--- a/po/fr/neochat.po
+++ b/po/fr/neochat.po
--- a/po/gl/neochat.po
+++ b/po/gl/neochat.po
--- a/po/he/neochat.po
+++ b/po/he/neochat.po
--- a/po/hi/neochat.po
+++ b/po/hi/neochat.po
--- a/po/hu/neochat.po
+++ b/po/hu/neochat.po
--- a/po/ia/neochat.po
+++ b/po/ia/neochat.po
--- a/po/id/neochat.po
+++ b/po/id/neochat.po
--- a/po/ie/neochat.po
+++ b/po/ie/neochat.po
--- a/po/it/neochat.po
+++ b/po/it/neochat.po
--- a/po/ja/neochat.po
+++ b/po/ja/neochat.po
--- a/po/ka/neochat.po
+++ b/po/ka/neochat.po
--- a/po/ko/neochat.po
+++ b/po/ko/neochat.po
--- a/po/lt/neochat.po
+++ b/po/lt/neochat.po
--- a/po/lv/neochat.po
+++ b/po/lv/neochat.po
--- a/po/nl/neochat.po
+++ b/po/nl/neochat.po
--- a/po/nn/neochat.po
+++ b/po/nn/neochat.po
--- a/po/pa/neochat.po
+++ b/po/pa/neochat.po
--- a/po/pl/neochat.po
+++ b/po/pl/neochat.po
--- a/po/pt/neochat.po
+++ b/po/pt/neochat.po
--- a/po/pt_BR/docs/neochat/man-neochat.1.docbook
+++ b/po/pt_BR/docs/neochat/man-neochat.1.docbook
@@ -0,0 +1,122 @@
+<?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>
--- a/po/pt_BR/neochat.po
+++ b/po/pt_BR/neochat.po
--- a/po/ro/neochat.po
+++ b/po/ro/neochat.po
--- a/po/ru/neochat.po
+++ b/po/ru/neochat.po
--- a/po/sa/neochat.po
+++ b/po/sa/neochat.po
--- a/po/sk/neochat.po
+++ b/po/sk/neochat.po
--- a/po/sl/neochat.po
+++ b/po/sl/neochat.po
--- a/po/sv/neochat.po
+++ b/po/sv/neochat.po
--- a/po/ta/neochat.po
+++ b/po/ta/neochat.po
--- a/po/tok/neochat.po
+++ b/po/tok/neochat.po
--- a/po/tr/neochat.po
+++ b/po/tr/neochat.po
--- a/po/uk/neochat.po
+++ b/po/uk/neochat.po
--- a/po/zh_CN/neochat.po
+++ b/po/zh_CN/neochat.po
--- a/po/zh_TW/neochat.po
+++ b/po/zh_TW/neochat.po
--- a/src/app/CMakeLists.txt
+++ b/src/app/CMakeLists.txt
@@ -103,6 +103,7 @@ 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
@@ -202,7 +203,6 @@ target_link_libraries(neochat PUBLIC
    KF6::ConfigGui
    KF6::CoreAddons
    KF6::SonnetCore
-    KF6::IconThemes
    KF6::ItemModels
    KF6::I18nQml
    KirigamiApp
@@ -213,10 +213,6 @@ 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)
@@ -356,7 +352,8 @@ endif()
 install(TARGETS neochat-app ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})

 if (NOT ANDROID AND NOT WIN32 AND NOT APPLE)
-    install(FILES plasma-runner-neochat.desktop DESTINATION ${KDE_INSTALL_DATAROOTDIR}/krunner/dbusplugins)
+    # 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)
 endif()

 if (APPLE)
--- a/src/app/controller.cpp
+++ b/src/app/controller.cpp
@@ -246,7 +246,10 @@ 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);
 }
--- a/src/app/main.cpp
+++ b/src/app/main.cpp
@@ -33,7 +33,6 @@
 #include <KWindowSystem>
 #endif

-#include <KIconTheme>
 #include <KLocalizedQmlContext>
 #include <KLocalizedString>
 #include <KirigamiApp>
@@ -162,12 +161,6 @@ 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;
--- a/src/app/neochat.notifyrc
+++ b/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 davetiye var
+Comment[tr]=Bir odaya yeni bir davet var
 Comment[uk]=У кімнаті нове запрошення
 Comment[zh_CN]=有新的聊天室邀请
 Comment[zh_TW]=有新的加入聊天室邀請
--- a/src/app/neochatconfig.kcfg
+++ b/src/app/neochatconfig.kcfg
@@ -66,6 +66,10 @@
    </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>
@@ -207,10 +211,6 @@
      <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>
--- a/src/app/qml/AccountMenu.qml
+++ b/src/app/qml/AccountMenu.qml
@@ -79,7 +79,6 @@ 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")
        })
--- a/src/app/qml/CodeMaximizeComponent.qml
+++ b/src/app/qml/CodeMaximizeComponent.qml
@@ -91,6 +91,7 @@ Components.AbstractMaximizeComponent {
            color: Kirigami.Theme.textColor

            font.family: "monospace"
+            font.pointSize: Kirigami.Theme.defaultFont.pointSize * NeoChatConfig.fontScale

            Kirigami.SpellCheck.enabled: false

--- a/src/app/qml/InvitationView.qml
+++ b/src/app/qml/InvitationView.qml
@@ -54,6 +54,12 @@ ColumnLayout {
                Layout.alignment: Qt.AlignHCenter
            }

+            Kirigami.Heading {
+                text: root.currentRoom.displayName
+
+                Layout.alignment: Qt.AlignHCenter
+            }
+
            Kirigami.SelectableLabel {
                Layout.fillWidth: true
                font: Kirigami.Theme.smallFont
@@ -61,12 +67,7 @@ ColumnLayout {
                visible: root.currentRoom && root.currentRoom.canonicalAlias
                text: root.currentRoom && root.currentRoom.canonicalAlias ? root.currentRoom.canonicalAlias : ""
                color: Kirigami.Theme.disabledTextColor
-            }
-
-            Kirigami.Heading {
-                text: root.currentRoom.displayName
-
-                Layout.alignment: Qt.AlignHCenter
+                horizontalAlignment: Text.AlignHCenter
            }
        }
    }
--- a/src/app/qml/MeetingDialog.qml
+++ b/src/app/qml/MeetingDialog.qml
@@ -0,0 +1,22 @@
+// 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()
+    }
+}
--- a/src/app/qml/NeochatMaximizeComponent.qml
+++ b/src/app/qml/NeochatMaximizeComponent.qml
@@ -23,13 +23,45 @@ Components.AlbumMaximizeComponent {
     */
    required property NeoChatRoom currentRoom

-    readonly property string currentEventId: model.data(model.index((content as ListView).currentIndex, 0), TimelineMessageModel.EventIdRole)
+    readonly property string currentEventId: {
+        const idx = (content as ListView).currentIndex;

-    readonly property var currentAuthor: model.data(model.index((content as ListView).currentIndex, 0), TimelineMessageModel.AuthorRole)
+        if (idx === -1) {
+            return ""
+        }

-    readonly property var currentTime: model.data(model.index((content as ListView).currentIndex, 0), TimelineMessageModel.TimeRole)
+        return model.data(model.index(idx, 0), TimelineMessageModel.EventIdRole)
+    }

-    readonly property var currentProgressInfo: model.data(model.index((content as ListView).currentIndex, 0), TimelineMessageModel.ProgressInfoRole)
+    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)
+    }

    actions: [
        ShareAction {
--- a/src/app/qml/RoomPage.qml
+++ b/src/app/qml/RoomPage.qml
@@ -77,11 +77,33 @@ Kirigami.Page {

    actions: [
        Kirigami.Action {
-            tooltip: i18nc("@action:button", "Open Jitsi Meet in browser")
-            icon.name: "camera-video-symbolic"
+            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
            onTriggered: {
-                let url
-                if (root.widgetModel.jitsiIndex < 0) {
+                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) {
                    url = root.widgetModel.addJitsiConference();
                } else {
                    let idx = root.widgetModel.index(root.widgetModel.jitsiIndex, 0);
@@ -97,6 +119,18 @@ 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: {
@@ -193,6 +227,8 @@ 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
@@ -219,7 +255,6 @@ Kirigami.Page {
            id: timelineView
            messageFilterModel: root.messageFilterModel
            compactLayout: NeoChatConfig.compactLayout
-            fileDropEnabled: !Controller.isFlatpak
            markReadCondition: NeoChatConfig.markReadCondition
        }
    }
--- a/src/app/qml/UnlockSSSSDialog.qml
+++ b/src/app/qml/UnlockSSSSDialog.qml
@@ -11,6 +11,8 @@ import org.kde.neochat
 FormCard.FormCardPage {
    id: root

+    property bool processing: false
+
    title: i18nc("@title:window", "Load your encrypted messages")

    topPadding: Kirigami.Units.gridUnit
@@ -25,75 +27,42 @@ FormCard.FormCardPage {
        position: Kirigami.InlineMessage.Position.Header
    }

-    property SSSSHandler ssssHandler: SSSSHandler {
-        id: ssssHandler
+    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 bool processing: false
-
-        connection: Controller.activeConnection
-        onKeyBackupUnlocked: {
-            ssssHandler.processing = false
+        function onKeyBackupUnlocked(): void {
+            root.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 Passphrase")
+        title: i18nc("@title", "Unlock using Security Key or Backup Passphrase")
    }
    FormCard.FormCard {
        FormCard.FormTextDelegate {
-            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.")
+            description: i18nc("@info", "If you have a security key or backup passphrase for this account, enter it below or upload it as a file.")
        }
        FormCard.FormTextFieldDelegate {
            id: securityKeyField
-            label: i18nc("@label:textbox", "Security Key:")
+            label: i18nc("@label:textbox", "Security Key or Backup Passphrase:")
            echoMode: TextInput.Password
        }
        FormCard.FormButtonDelegate {
            id: uploadSecurityKeyButton
            text: i18nc("@action:button", "Upload from File")
            icon.name: "cloud-upload"
-            enabled: !ssssHandler.processing
+            enabled: !root.processing
            onClicked: {
-                ssssHandler.processing = true
+                root.processing = true
                openFileDialog.open()
            }
        }
@@ -101,10 +70,10 @@ FormCard.FormCardPage {
            id: unlockSecurityKeyButton
            text: i18nc("@action:button", "Unlock")
            icon.name: "unlock"
-            enabled: securityKeyField.text.length > 0 && !ssssHandler.processing
+            enabled: securityKeyField.text.length > 0 && !root.processing
            onClicked: {
-                ssssHandler.processing = true
-                ssssHandler.unlockSSSSFromSecurityKey(securityKeyField.text)
+                root.processing = true
+                Controller.activeConnection.unlockSSSS(securityKeyField.text)
            }
        }
    }
@@ -120,10 +89,10 @@ FormCard.FormCardPage {
            id: unlockCrossSigningButton
            icon.name: "emblem-shared-symbolic"
            text: i18nc("@action:button", "Request from other Devices")
-            enabled: !ssssHandler.processing
+            enabled: !root.processing
            onClicked: {
-                ssssHandler.processing = true
-                ssssHandler.unlockSSSSFromCrossSigning()
+                root.processing = true
+                Controller.activeConnection.unlockSSSS("")
            }
        }
    }
--- a/src/app/qml/UserDetailDialog.qml
+++ b/src/app/qml/UserDetailDialog.qml
@@ -293,5 +293,25 @@ 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);
+                });
+            }
+        }
    }
 }
--- a/src/app/qml/VerificationCanceled.qml
+++ b/src/app/qml/VerificationCanceled.qml
@@ -11,7 +11,19 @@ VerificationMessage {

    required property int reason

-    icon: "security-low"
+    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";
+        }
+    }
    text: {
        switch (root.reason) {
        case KeyVerificationSession.NONE:
--- a/src/chatbar/ChatBar.qml
+++ b/src/chatbar/ChatBar.qml
@@ -263,6 +263,7 @@ 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

@@ -285,6 +286,8 @@ QQC2.Control {
                            quickFormatBar.selectionStart = selectionStart;
                            quickFormatBar.selectionEnd = selectionEnd;
                            quickFormatBar.open();
+                        } else if (quickFormatBar.visible) {
+                            quickFormatBar.close();
                        }
                    }

--- a/src/chatbar/EmojiDelegate.qml
+++ b/src/chatbar/EmojiDelegate.qml
@@ -4,6 +4,7 @@
 import QtQuick
 import QtQuick.Controls as QQC2
 import org.kde.kirigami as Kirigami
+import org.kde.neochat

 QQC2.ItemDelegate {
    id: root
@@ -29,6 +30,7 @@ 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
--- a/src/devtools/DevtoolsPage.qml
+++ b/src/devtools/DevtoolsPage.qml
@@ -17,6 +17,7 @@ Kirigami.ScrollablePage {

    property NeoChatRoom room
    required property NeoChatConnection connection
+    property alias currentTabIndex: tabBar.currentIndex

    title: i18nc("@title", "Developer Tools")

--- a/src/devtools/FeatureFlagPage.qml
+++ b/src/devtools/FeatureFlagPage.qml
@@ -21,12 +21,6 @@ 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
--- a/src/libneochat/CMakeLists.txt
+++ b/src/libneochat/CMakeLists.txt
@@ -33,6 +33,8 @@ 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
--- a/src/libneochat/accountmanager.cpp
+++ b/src/libneochat/accountmanager.cpp
@@ -15,7 +15,6 @@
 #include "general_logging.h"

 using namespace Qt::StringLiterals;
-using namespace Quotient;

 AccountManager::AccountManager(bool testMode, QObject *parent)
    : QObject(parent)
@@ -40,7 +39,7 @@ Quotient::AccountRegistry *AccountManager::accounts()

 void AccountManager::loadAccountsFromCache()
 {
-    for (const auto &accountId : AccountSettingsGroup().childGroups()) {
+    for (const auto &accountId : Quotient::SettingsGroup("Accounts"_L1).childGroups()) {
        Quotient::AccountSettings account{accountId};
        m_accountsLoading += accountId;
        Q_EMIT accountsLoadingChanged();
--- a/src/libneochat/chatbarcache.cpp
+++ b/src/libneochat/chatbarcache.cpp
@@ -3,6 +3,10 @@

 #include "chatbarcache.h"

+#include <QMimeData>
+
+#include <KUrlMimeData>
+
 #include <Quotient/roommember.h>

 #include "eventhandler.h"
@@ -295,4 +299,17 @@ 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"
--- a/src/libneochat/chatbarcache.h
+++ b/src/libneochat/chatbarcache.h
@@ -198,6 +198,8 @@ 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);
--- a/src/libneochat/enums/roomsortparameter.h
+++ b/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 the newer messages are higher");
+            return i18nc("@info", "Rooms with newer events are higher");
        default:
            return {};
        }
--- a/src/libneochat/eventhandler.cpp
+++ b/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 put %1 out of the room: %2", subjectName, reason);
+                    return i18n("has removed %1 from the room: %2", subjectName, reason);
                }
-                return i18n("has put %1 out of the room", subjectName);
+                return i18n("has removed %1 from the room", subjectName);
            case Membership::Ban:
                if (e.senderId() != e.userId()) {
                    if (e.reason().isEmpty()) {
--- a/src/libneochat/jobs/neochatreportroomjob.cpp
+++ b/src/libneochat/jobs/neochatreportroomjob.cpp
@@ -0,0 +1,14 @@
+// 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});
+}
--- a/src/libneochat/jobs/neochatreportroomjob.h
+++ b/src/libneochat/jobs/neochatreportroomjob.h
@@ -0,0 +1,13 @@
+// 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);
+};
--- a/src/libneochat/jobs/neochatreportuserjob.cpp
+++ b/src/libneochat/jobs/neochatreportuserjob.cpp
@@ -0,0 +1,14 @@
+// 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});
+}
--- a/src/libneochat/jobs/neochatreportuserjob.h
+++ b/src/libneochat/jobs/neochatreportuserjob.h
@@ -0,0 +1,13 @@
+// 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);
+};
--- a/src/libneochat/neochatconnection.cpp
+++ b/src/libneochat/neochatconnection.cpp
@@ -6,6 +6,7 @@
 #include <QImageReader>
 #include <QJsonDocument>

+#include "jobs/neochatreportuserjob.h"
 #include "neochatroom.h"
 #include "spacehierarchycache.h"

@@ -19,6 +20,7 @@
 #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>
@@ -95,6 +97,7 @@ void NeoChatConnection::connectSignals()
                Q_EMIT directChatsHaveHighlightNotificationsChanged();
            });
        }
+        Q_EMIT roomInvitesChanged();
        connect(room, &Room::unreadStatsChanged, this, [this]() {
            refreshBadgeNotificationCount();
            Q_EMIT homeNotificationsChanged();
@@ -159,6 +162,10 @@ 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++;
+            }
        }
    }

@@ -190,7 +197,7 @@ void NeoChatConnection::setKeywordPushRuleDefault(PushRuleAction::Action default

 void NeoChatConnection::logout(bool serverSideLogout)
 {
-    AccountSettingsGroup().remove(userId());
+    SettingsGroup(u"Accounts"_s).remove(userId());

    QKeychain::DeletePasswordJob job(qAppName());
    job.setAutoDelete(true);
@@ -452,15 +459,20 @@ bool NeoChatConnection::homeHaveHighlightNotifications() const
    return false;
 }

-bool NeoChatConnection::directChatInvites() const
+qsizetype NeoChatConnection::directChatInvites() const
 {
-    auto inviteRooms = rooms(JoinState::Invite);
-    for (const auto inviteRoom : inviteRooms) {
-        if (inviteRoom->isDirectChat()) {
-            return true;
-        }
-    }
-    return false;
+    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();
+    });
 }

 QCoro::Task<void> NeoChatConnection::setupPushNotifications(QString endpoint)
@@ -564,4 +576,36 @@ 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"
--- a/src/libneochat/neochatconnection.h
+++ b/src/libneochat/neochatconnection.h
@@ -66,9 +66,14 @@ class NeoChatConnection : public Quotient::Connection
    Q_PROPERTY(bool homeHaveHighlightNotifications READ homeHaveHighlightNotifications NOTIFY homeHaveHighlightNotificationsChanged)

    /**
-     * @brief Whether there is at least one invite to a direct chat.
+     * @brief The number of invites to 1-on-1 direct chats.
     */
-    Q_PROPERTY(bool directChatInvites READ directChatInvites NOTIFY directChatInvitesChanged)
+    Q_PROPERTY(qsizetype directChatInvites READ directChatInvites NOTIFY directChatInvitesChanged)
+
+    /**
+     * @brief The number of pending, normal room invites.
+     */
+    Q_PROPERTY(qsizetype roomInvites READ roomInvites NOTIFY roomInvitesChanged)

    /**
     * @brief Whether the server supports querying a user's mutual rooms.
@@ -200,7 +205,8 @@ public:
     */
    static void setKeywordPushRuleDefault(PushRuleAction::Action defaultAction);

-    bool directChatInvites() const;
+    qsizetype directChatInvites() const;
+    qsizetype roomInvites() const;

    // note: this is intentionally a copied QString because
    // the reference could be destroyed before the task is finished
@@ -216,6 +222,13 @@ 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();
@@ -225,6 +238,7 @@ Q_SIGNALS:
    void homeNotificationsChanged();
    void homeHaveHighlightNotificationsChanged();
    void directChatInvitesChanged();
+    void roomInvitesChanged();
    void passwordStatus(NeoChatConnection::PasswordStatus status);
    void userConsentRequired(QUrl url);
    void badgeNotificationCountChanged(int count);
@@ -252,6 +266,9 @@ Q_SIGNALS:
     */
    void ownSessionVerified();

+    void keyBackupUnlocked();
+    void keyBackupError();
+
 private:
    static bool m_globalUrlPreviewDefault;
    static PushRuleAction::Action m_defaultAction;
--- a/src/libneochat/neochatroom.cpp
+++ b/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,6 +346,10 @@ 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);
 }

@@ -1834,4 +1838,9 @@ QString NeoChatRoom::pinnedMessage() const
    return m_pinnedMessage;
 }

+void NeoChatRoom::report(const QString &reason)
+{
+    connection()->callApi<NeochatReportRoomJob>(id(), reason);
+}
+
 #include "moc_neochatroom.cpp"
--- a/src/libneochat/neochatroom.h
+++ b/src/libneochat/neochatroom.h
@@ -622,6 +622,11 @@ public:
     */
    QString pinnedMessage() const;

+    /**
+     * @brief Send a report about this room.
+     */
+    Q_INVOKABLE void report(const QString &reason);
+
 private:
    bool m_visible = false;

--- a/src/messagecontent/CodeComponent.qml
+++ b/src/messagecontent/CodeComponent.qml
@@ -77,6 +77,7 @@ QQC2.Control {
            color: Kirigami.Theme.textColor

            font.family: "monospace"
+            font.pointSize: Kirigami.Theme.defaultFont.pointSize * NeoChatConfig.fontScale

            Kirigami.SpellCheck.enabled: false

--- a/src/messagecontent/LinkPreviewComponent.qml
+++ b/src/messagecontent/LinkPreviewComponent.qml
@@ -41,7 +41,12 @@ QQC2.Control {
     */
    property var defaultHeight: Kirigami.Units.gridUnit * 3 + Kirigami.Units.largeSpacing * 2

-    property bool truncated: linkPreviewDescription.truncated || !linkPreviewDescription.visible
+    /**
+     * @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

    /**
     * @brief Request for this delegate to be removed.
@@ -72,7 +77,7 @@ QQC2.Control {
            id: previewImage
            Layout.preferredWidth: root.defaultHeight
            Layout.preferredHeight: root.defaultHeight
-            Layout.fillWidth: true
+            Layout.maximumWidth: root.defaultHeight
            Layout.fillHeight: true
            visible: root.linkPreviewer.imageSource.toString().length > 0
            source: root.linkPreviewer.imageSource
@@ -82,9 +87,9 @@ QQC2.Control {
        }
        ColumnLayout {
            id: column
-            implicitWidth: Math.max(linkPreviewTitle.implicitWidth, linkPreviewDescription.implicitWidth)
+            Layout.preferredWidth: Math.max(linkPreviewTitle.implicitWidth, linkPreviewDescription.implicitWidth)
+            Layout.fillWidth: true
            spacing: Kirigami.Units.smallSpacing
-            visible: root.linkPreviewer.title.length > 0 || root.linkPreviewer.description.length > 0
            Kirigami.Heading {
                id: linkPreviewTitle
                Layout.fillWidth: true
@@ -121,10 +126,11 @@ QQC2.Control {
            acceptedButtons: Qt.LeftButton
            onTapped: RoomManager.resolveResource(root.linkPreviewer.url, "join")
        }
-    }

-    HoverHandler {
-        cursorShape: Qt.PointingHandCursor
+        HoverHandler {
+            cursorShape: Qt.PointingHandCursor
+            onHoveredChanged: (root.QQC2.ApplicationWindow.window as Main).hoverLinkIndicator.text = hovered ? root.linkPreviewer.url : ""
+        }
    }

    QQC2.Button {
--- a/src/messagecontent/QuoteComponent.qml
+++ b/src/messagecontent/QuoteComponent.qml
@@ -58,6 +58,7 @@ QQC2.Control {
        selectionColor: Kirigami.Theme.highlightColor

        font.italic: true
+        font.pointSize: Kirigami.Theme.defaultFont.pointSize * NeoChatConfig.fontScale

        onSelectedTextChanged: root.selectedTextChanged(selectedText)

--- a/src/messagecontent/ReactionComponent.qml
+++ b/src/messagecontent/ReactionComponent.qml
@@ -51,6 +51,7 @@ 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
--- a/src/messagecontent/TextComponent.qml
+++ b/src/messagecontent/TextComponent.qml
@@ -67,7 +67,9 @@ TextEdit {
    selectedTextColor: Kirigami.Theme.highlightedTextColor
    selectionColor: Kirigami.Theme.highlightColor
    font {
-        pointSize: !root.isReply && QmlUtils.isEmoji(display) ? Kirigami.Theme.defaultFont.pointSize * 4 : Kirigami.Theme.defaultFont.pointSize
+        pointSize: !root.isReply && QmlUtils.isEmoji(display)
+                   ? Kirigami.Theme.defaultFont.pointSize * 4 * NeoChatConfig.fontScale
+                   : Kirigami.Theme.defaultFont.pointSize * NeoChatConfig.fontScale
        family: QmlUtils.isEmoji(display) ? 'emoji' : Kirigami.Theme.defaultFont.family
    }
    selectByMouse: !Kirigami.Settings.isMobile
--- a/src/messagecontent/pollhandler.cpp
+++ b/src/messagecontent/pollhandler.cpp
@@ -121,7 +121,9 @@ void PollHandler::handleResponse(const Quotient::PollResponseEvent *event)
            return;
        }

-        m_selections[event->senderId()] = event->selections().size() > 0 ? event->selections().first(pollStartEvent->maxSelections()) : event->selections();
+        m_selections[event->senderId()] = event->selections().size() > 0
+            ? event->selections().first(std::min(pollStartEvent->maxSelections(), (int)event->selections().size()))
+            : event->selections();
        if (m_selections.contains(event->senderId()) && m_selections[event->senderId()].isEmpty()) {
            m_selections.remove(event->senderId());
        }
--- a/src/roominfo/LocationsPage.qml
+++ b/src/roominfo/LocationsPage.qml
@@ -7,7 +7,7 @@ import QtPositioning

 import org.kde.kirigami as Kirigami

-import org.kde.neochat.libneochat
+import org.kde.neochat

 Kirigami.Page {
    id: root
--- a/src/roominfo/RoomInformation.qml
+++ b/src/roominfo/RoomInformation.qml
@@ -79,7 +79,7 @@ QQC2.ScrollView {
                id: searchButton
                visible: !root.room.isSpace
                icon.name: "search"
-                text: i18n("Search in this room")
+                text: i18nc("@action:button", "Search Messages")
                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 ? i18n("Remove room from favorites") : i18n("Favorite this room")
+                text: root.room && root.room.isFavourite ? i18nc("@action:button", "Remove from Favorites") : i18nc("@action:button", "Add to Favorites")

                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 for this room")
+                text: i18nc("@action:button", "Extensions")
                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: i18n("Show locations for this room")
+                text: i18nc("@action:button", "Shared Locations")
                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,10 +166,29 @@ 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 this space…") : i18nc("@action:button", "Leave this room…")
+                text: root.room.isSpace ? i18nc("@action:button", "Leave Space…") : i18nc("@action:button", "Leave Room…")
                activeFocusOnTab: true

                Layout.fillWidth: true
--- a/src/rooms/ExploreComponent.qml
+++ b/src/rooms/ExploreComponent.qml
@@ -46,10 +46,6 @@ 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
--- a/src/rooms/RoomContextMenu.qml
+++ b/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
+        enabled: root.room.notificationCount > 0 || root.room.highlightCount > 0
        onTriggered: root.room.markAllMessagesAsRead()
    }

@@ -71,7 +71,7 @@ KirigamiComponents.ConvergentContextMenu {
        }

        Kirigami.Action {
-            text: i18nc("As in 'notify for all messages'", "All")
+            text: i18nc("As in 'notify for all messages'", "All Messages")
            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'", "Off")
+            text: i18nc("As in 'do not notify for any messages'", "None")
            icon.name: "notifications-disabled"
            checkable: true
            autoExclusive: true
@@ -150,6 +150,26 @@ 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"
--- a/src/rooms/RoomListPage.qml
+++ b/src/rooms/RoomListPage.qml
@@ -78,11 +78,11 @@ Kirigami.Page {
    }

    function goToNextUnreadRoom() {
-        goToNextRoomFiltered(item => (item && item instanceof RoomDelegate && item.hasUnread));
+        goToNextRoomFiltered(item => (item && item instanceof RoomDelegate && item.hasUnreadMessages));
    }

    function goToPreviousUnreadRoom() {
-        goToPreviousRoomFiltered(item => (item && item instanceof RoomDelegate && item.hasUnread));
+        goToPreviousRoomFiltered(item => (item && item instanceof RoomDelegate && item.hasUnreadMessages));
    }

    titleDelegate: Loader {
--- a/src/rooms/SpaceDrawer.qml
+++ b/src/rooms/SpaceDrawer.qml
@@ -81,12 +81,15 @@ 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: i18n("Home")
+                    text: hasCountableNotifications ? i18ncp("Home space for the uncategorized rooms", "Home (%1 notification)", "Home (%1 notifications)", countedNotifications) : i18nc("Home space for the uncategorized rooms", "Home")
                    contentItem: Kirigami.Icon {
                        source: "user-home-symbolic"

@@ -100,15 +103,15 @@ QQC2.Control {
                            width: Math.max(homeNotificationCountTextMetrics.advanceWidth + Kirigami.Units.smallSpacing * 2, height)
                            height: Kirigami.Units.iconSizes.smallMedium

-                            text: root.connection.homeNotifications > 0 ? root.connection.homeNotifications : ""
-                            visible: root.connection.homeNotifications > 0 && (RoomManager.currentSpace.length > 0 || RoomManager.currentSpace !== "DM")
+                            text: allRoomButton.countedNotifications
+                            visible: allRoomButton.hasCountableNotifications && (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 ? Kirigami.Theme.positiveTextColor : Kirigami.Theme.backgroundColor
+                                color: root.connection.homeHaveHighlightNotifications || root.connection.roomInvites > 0 ? Kirigami.Theme.positiveTextColor : Kirigami.Theme.backgroundColor
                                radius: height / 2
                            }

@@ -127,7 +130,8 @@ QQC2.Control {
                AvatarTabButton {
                    id: directChatButton

-                    readonly property bool hasCountableNotifications: root.connection.directChatNotifications > 0 || root.connection.directChatInvites > 0
+                    readonly property int countedNotifications: root.connection.directChatNotifications + root.connection.directChatInvites
+                    readonly property bool hasCountableNotifications: countedNotifications > 0

                    Layout.fillWidth: true
                    Layout.preferredHeight: width - Kirigami.Units.smallSpacing
@@ -136,7 +140,7 @@ QQC2.Control {

                    text: {
                        if (directChatButton.hasCountableNotifications) {
-                            return i18ncp("@button View all one-on-one chats.", "Direct Messages (%1 notification)", "Direct Messages (%1 notifications)", root.connection.directChatNotifications + root.connection.directChatInvites);
+                            return i18ncp("@button View all one-on-one chats.", "Direct Messages (%1 notification)", "Direct Messages (%1 notifications)", directChatButton.countedNotifications);
                        }

                        return i18nc("@button View all one-on-one chats.", "Direct Messages");
@@ -162,7 +166,7 @@ QQC2.Control {
                                visible: true
                                Kirigami.Theme.colorSet: Kirigami.Theme.Button
                                Kirigami.Theme.inherit: false
-                                color: root.connection.directChatsHaveHighlightNotifications || root.connection.directChatInvites ? Kirigami.Theme.positiveTextColor : Kirigami.Theme.backgroundColor
+                                color: root.connection.directChatsHaveHighlightNotifications || root.connection.directChatInvites > 0 ? Kirigami.Theme.positiveTextColor : Kirigami.Theme.backgroundColor
                                radius: height / 2
                            }

--- a/src/settings/AppearanceSettingsPage.qml
+++ b/src/settings/AppearanceSettingsPage.qml
@@ -43,6 +43,40 @@ 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 {
--- a/src/settings/CMakeLists.txt
+++ b/src/settings/CMakeLists.txt
@@ -50,6 +50,7 @@ ecm_add_qml_module(Settings GENERATE_PLUGIN_SOURCE
        RoomSortParameterDialog.qml
        RoomProfile.qml
        RoomAdvancedPage.qml
+        KeyboardShortcutsPage.qml
    SOURCES
        colorschemer.cpp
        threepidaddhelper.cpp
--- a/src/settings/KeyboardShortcutsPage.qml
+++ b/src/settings/KeyboardShortcutsPage.qml
@@ -0,0 +1,52 @@
+// 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"
+        }
+    }
+}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Joshua Goins	2f060dcfe6	Fix building with KUnifiedPush on Android I made sure it doesn't include KDBusService and removed the if check in CMake.	2025-12-20 17:29:43 -05:00
l10n daemon script	45c5806c5a	GIT_SILENT Sync po/docbooks with svn	2025-12-19 01:42:17 +00:00
l10n daemon script	abf37c90cb	GIT_SILENT Sync po/docbooks with svn	2025-12-18 01:41:35 +00:00
Jimmy Bergström	5d9508b165	Hide quick format bar when selection is cleared I noticed a bit of an annoying behavior with the quick format bar. Whenever I make a typo when writing a message I usually go back with a ctrl+shift+arrow selection to correct it, and that of course triggers the bar, but then there wasn't any obvious way to make it go away (other than pressing backspace or delete, [ChatBar.qml#L339](https://invent.kde.org/network/neochat/-/blob/master/src/chatbar/ChatBar.qml?ref_type=heads#L339)), so it'd always be stuck visible until I clicked somewhere with my mouse, which I found somewhat annoying. This intends to fix that, by hiding it whenever the selection is cleared, which seems like a reasonable and expected behavior to me. I would also be okay with making it dismissable with escape, if this current suggestion has some unintended side-effect that I've missed. I also think that this should in practice "solve" this bug https://bugs.kde.org/show_bug.cgi?id=511590 but I didn't link it directly as their suggested solution is smarter placement of the bar.	2025-12-17 21:33:08 +00:00
l10n daemon script	f5a652f7a1	GIT_SILENT Sync po/docbooks with svn	2025-12-16 14:25:07 +00:00
Paul Brown	f165cb1f10	Removed list of supporters, as we now have a less annoying way of showing them on the apps website.	2025-12-14 16:41:47 +00:00
l10n daemon script	11132c3e89	GIT_SILENT Sync po/docbooks with svn	2025-12-14 01:40:32 +00:00
l10n daemon script	089ab2009a	GIT_SILENT Sync po/docbooks with svn	2025-12-13 01:44:24 +00:00
l10n daemon script	6ebedc5dfc	GIT_SILENT Sync po/docbooks with svn	2025-12-12 01:42:29 +00:00
Nicolas Fella	e5b2fb7316	Guard against currentIndex being -1 in NeochatMaximizeComponent Sometimes the ListView's currentIndex is -1, which results in us querying data() for an invalid index, causing an assert in Qt model code BUG: 513104	2025-12-11 18:01:19 +01:00
l10n daemon script	5da3aff607	GIT_SILENT Sync po/docbooks with svn	2025-12-10 01:47:45 +00:00
l10n daemon script	3fa46d52fe	GIT_SILENT Sync po/docbooks with svn	2025-12-09 01:41:23 +00:00
Justin Zobel	ece9811d82	CI - Flatpak - Remove Kirigami Addons as it is now in the runtime	2025-12-08 19:55:46 +10:30
Justin Zobel	b543b1c2f9	CI - Flatpak - Use -DCMAKE_POLICY_VERSION_MINIMUM=3.5 for olm	2025-12-08 19:55:46 +10:30
Justin Zobel	5065bccb64	CI - Flatpak - Fix broken sha256sum	2025-12-08 19:55:46 +10:30
Justin Zobel	10c3125668	CI - Flatpak - Fix broken sha256sums	2025-12-08 19:55:46 +10:30
Justin Zobel	73019cfea2	CI - Flatpak - Update Runtime to 6.10	2025-12-08 19:55:46 +10:30
Justin Zobel	4bc6a88acf	CI - Flatpak - Update Versions	2025-12-08 19:55:46 +10:30
l10n daemon script	56a49cfc50	GIT_SILENT Sync po/docbooks with svn	2025-12-08 01:41:51 +00:00
Nate Graham	c50380b448	Tell room page header message to fill the width Otherwise it scrunches up as small as possible and breaks the layout.	2025-12-07 09:27:58 -05:00
l10n daemon script	673a8c8bc8	GIT_SILENT Sync po/docbooks with svn	2025-12-07 01:45:09 +00:00
l10n daemon script	c298c348a4	GIT_SILENT Sync po/docbooks with svn	2025-12-04 01:45:11 +00:00
Heiko Becker	2fcd535aeb	GIT_SILENT Update Appstream for new release (cherry picked from commit `0e4b52ee62`)	2025-12-04 00:20:05 +01:00
l10n daemon script	8f5e68de5d	GIT_SILENT Sync po/docbooks with svn	2025-12-03 01:45:04 +00:00
l10n daemon script	5fe36a9057	GIT_SILENT Sync po/docbooks with svn	2025-12-02 01:41:01 +00:00
l10n daemon script	8d8c6444e0	GIT_SILENT Sync po/docbooks with svn	2025-12-01 01:44:51 +00:00
Joshua Goins	03d5955c8d	Add support for reporting rooms and users This was added in recent Matrix versions, and a desperately needed feature.	2025-11-30 14:01:13 -05:00
Joshua Goins	197d7ce8e8	Add a new function to check supported Matrix spec in QML	2025-11-30 14:01:13 -05:00
l10n daemon script	efbf6d96d4	GIT_SILENT Sync po/docbooks with svn	2025-11-30 01:45:44 +00:00
l10n daemon script	b8cd3c69c2	GIT_SILENT Sync po/docbooks with svn	2025-11-29 01:42:47 +00:00
renner 03	1da24191f0	Fix krunner integration with Flatpak	2025-11-28 09:38:51 -05:00
l10n daemon script	2ecc567792	GIT_SILENT Sync po/docbooks with svn	2025-11-28 01:41:47 +00:00
l10n daemon script	66e1fe067d	GIT_SILENT Sync po/docbooks with svn	2025-11-27 01:43:17 +00:00
Nate Graham	d08f014def	Rephrase a British English wording for the base string "X has put Y out of the room" is a British English style sentence. Which is fine, but I'm using en_US, not en_UK. Re-phrase this to sound a bit more American (which is the linguistic style we use for the base strings), and then count on the en_UK translators bringing back the old phrasing for en_UK.	2025-11-25 22:15:45 -07:00
l10n daemon script	63941d6685	GIT_SILENT Sync po/docbooks with svn	2025-11-26 01:41:17 +00:00
Tobias Fella	38523c97c5	Implement drag&drop support for flatpaks BUG: 495552	2025-11-25 10:27:38 +00:00
l10n daemon script	65c6f4c1d3	GIT_SILENT Sync po/docbooks with svn	2025-11-25 01:41:04 +00:00
Heiko Becker	0cb3fd32f4	Drop unused dependencies Both KF6Crash and KF6IconThemes aren't used anymore after porting to KirigamiApp in `eab45e761a`.	2025-11-24 21:51:55 +01:00
l10n daemon script	b02cb0157e	GIT_SILENT Sync po/docbooks with svn	2025-11-24 01:42:36 +00:00
l10n daemon script	ca163fc169	GIT_SILENT Sync po/docbooks with svn	2025-11-23 01:43:18 +00:00
l10n daemon script	5687eb33e1	GIT_SILENT Sync po/docbooks with svn	2025-11-21 01:43:31 +00:00
l10n daemon script	fc795e50b3	GIT_SILENT Sync po/docbooks with svn	2025-11-20 01:41:22 +00:00
l10n daemon script	c4adfe7939	GIT_SILENT Sync po/docbooks with svn	2025-11-19 01:39:53 +00:00
l10n daemon script	ce96232bbd	GIT_SILENT Sync po/docbooks with svn	2025-11-18 02:00:53 +00:00
l10n daemon script	95653cf3f7	GIT_SILENT Sync po/docbooks with svn	2025-11-17 13:25:28 +00:00
l10n daemon script	0c11cd331f	GIT_SILENT Sync po/docbooks with svn	2025-11-17 01:40:07 +00:00
Tobias Fella	3c8ca0d421	Simplify key backup unlocking Replaces the separate text fields for security keys and backup passphrases with a single on; internally, both methods are then tried.	2025-11-16 14:21:26 +00:00
l10n daemon script	52f71d5c55	GIT_SILENT Sync po/docbooks with svn	2025-11-16 01:40:16 +00:00
l10n daemon script	00f7dd5175	SVN_SILENT made messages (.desktop file) - always resolve ours 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"	2025-11-16 01:34:16 +00:00
l10n daemon script	52da8415e9	GIT_SILENT Sync po/docbooks with svn	2025-11-15 01:41:08 +00:00
l10n daemon script	953e4cd792	GIT_SILENT Sync po/docbooks with svn	2025-11-14 01:41:28 +00:00
Tobias Fella	ee4b1578b1	Consider highlights when determining whether a room can be marked as read BUG: 501080	2025-11-13 20:11:06 +00:00
Paul Brown	ae24424a32	Adding anthropy@mastodon.derg.nz to list of supporters	2025-11-13 19:32:43 +00:00
l10n daemon script	51be282824	GIT_SILENT Sync po/docbooks with svn	2025-11-13 01:42:02 +00:00
Tobias Fella	c539dfc352	Fix crash when poll answer has fewer selections than possible BUG: 511909	2025-11-12 12:29:53 +00:00
Carl Schwan	fe734206df	Add Thibault Molleman to the donnors	2025-11-12 11:14:38 +01:00
l10n daemon script	79a49165f1	GIT_SILENT Sync po/docbooks with svn	2025-11-11 01:51:20 +00:00
Tobias Fella	ada5eef088	Remove outdated flatpak font config	2025-11-10 17:27:25 +00:00
Tobias Fella	9cc5778126	Remove secret backup feature flag There isn't really a point in hiding this behind a flag and it just makes the process even more confusing	2025-11-10 18:04:50 +01:00
l10n daemon script	b129805f94	GIT_SILENT Sync po/docbooks with svn	2025-11-10 01:44:58 +00:00
Joshua Goins	887865c0aa	Improve invited room counting I didn't realize when redoing the tooltip for DMs that directChatInvites was a boolean, not an integer type. Now it's changed to an integer type, which fixes the DM invite count. NeoChat apparently didn't count normal room invites until now either, so now Home is highlighted in that case. Now it should be harder to miss these kinds of invites.	2025-11-09 12:03:17 -05:00
Joshua Goins	1336194cf4	Don't send an erroneous SetTypingJob on start-up You can see this while starting NeoChat, as it always fails because localMember() isn't valid at this point. This is called during the ChatBar setup as we're setting up the text, which also happens during room switch.	2025-11-09 10:55:05 -05:00
Joshua Goins	5a7ae3563e	Fix alignment on the room invitation page I forgot to horizontally center the room alias label, so it was usually stuck to the left-side. I also don't know why I put the room alias on top and the room name on the bottom, so those are swapped now too.	2025-11-09 10:54:54 -05:00
Joshua Goins	7c56e24fdc	Manually update badge count in initActiveConnection Without doing this, it's possible to start NeoChat and have no badge count despite having notable notifications. The reason for this is if badgeNotificationCount was updated and changed before this function call, and a call to refreshBadgeNotificationCount doesn't emit the changed signal. This is easy to work around by calling updateBadgeNotificationCount ourselves.	2025-11-09 10:19:55 -05:00
Joshua Goins	e6b9abeca3	Account for pending invites in the badge notification count	2025-11-09 10:18:28 -05:00
l10n daemon script	1b45784a88	GIT_SILENT Sync po/docbooks with svn	2025-11-09 01:48:27 +00:00
Albert Astals Cid	a12b0d5282	GIT_SILENT Upgrade release service version to 26.03.70.	2025-11-06 18:29:06 +01:00
Paul Brown	a6d75f2ff5	Adding Joshua Strobl to list of supporters	2025-11-06 17:01:19 +00:00
l10n daemon script	b8f7f33b9a	GIT_SILENT Sync po/docbooks with svn	2025-11-06 16:14:20 +00:00
l10n daemon script	273d962707	GIT_SILENT Sync po/docbooks with svn	2025-11-06 01:40:42 +00:00
Paul Brown	5e8b44fea6	Adding Akseli as supporter	2025-11-05 21:56:17 +00:00
l10n daemon script	be9e2ec7d0	GIT_SILENT Sync po/docbooks with svn	2025-11-05 01:48:44 +00:00
l10n daemon script	ee042cc1a2	GIT_SILENT Sync po/docbooks with svn	2025-11-04 01:47:11 +00:00
Kristen McWilliam	25c0bc131a	feat: add font size scaling setting Adds an option in Appearance Settings to adjust font size scaling, improving accessibility and user customization.	2025-11-03 10:18:23 -05:00
Paul Brown	7def8c066c	Added anonymous donot to list of supporters	2025-11-03 12:50:59 +00:00
l10n daemon script	1ddaf37e52	GIT_SILENT Sync po/docbooks with svn	2025-11-02 01:39:31 +00:00
Heiko Becker	40694f502a	Fix version in appstream file GIT_SILENT	2025-11-01 20:01:46 +01:00
l10n daemon script	d9f4a0a032	GIT_SILENT Sync po/docbooks with svn	2025-11-01 01:44:57 +00:00
l10n daemon script	5e392f3101	GIT_SILENT Sync po/docbooks with svn	2025-10-31 01:39:58 +00:00
Heiko Becker	ce1ac6128e	GIT_SILENT Update Appstream for new release (cherry picked from commit `c6fa5a10dd`)	2025-10-31 01:23:25 +01:00
l10n daemon script	a9d08a6ee2	GIT_SILENT Sync po/docbooks with svn	2025-10-30 01:41:27 +00:00
Joshua Goins	24d4829ba9	Clarify what is "recent activity" in our room list ordering settings As seen in the bug report, this setting is a bit confusing. First, it refers to "message activity" but in reality it does take into account all events. This is fine in my opinion, so I clarified that point. Another thing is that it wasn't clear that timeline visibility settings currently affect the sorting, so I added a tip about that. Finally I wasn't happy with these two options being called "Activity" so the old "Activity" setting is now called "Importance". The "Last Message Activity" setting is now called "Newest Events". BUG: 508480 FIXED-IN: 25.12.0	2025-10-29 18:18:53 -04:00
l10n daemon script	a121c39b6e	GIT_SILENT Sync po/docbooks with svn	2025-10-29 01:41:34 +00:00
Joshua Goins	f009420c20	Improve the design of the room notifications settings Now it has icons that match what we have in the room menu, and the duplicate header text is removed.	2025-10-28 12:27:23 -04:00
Joshua Goins	069e0d8f16	Add informational Keyboard Shortcuts settings page While we don't have customizable keyboard shortcuts (yet!) we have been asked before for some way to view all of NeoChat's keyboard shortcuts.	2025-10-28 10:29:55 -04:00
Joshua Goins	1f1db11197	Fix plugin on LocationsPage This lives in the base NeoChat QML module, not the libneochat one.	2025-10-28 09:17:18 -04:00
Joshua Goins	be92e56c3a	Show less scary icon for neutral reasons when cancelling verification For example, accepting a verification on another device shows a giant red security icon which isn't really suitable. I chucked the dialog-information icon in for some of the neutral-sounding messages so this dialog can be a little less intimidating. BUG: 510421 FIXED-IN: 24.08.3	2025-10-28 09:16:17 -04:00
l10n daemon script	d1fc426513	GIT_SILENT Sync po/docbooks with svn	2025-10-28 01:41:19 +00:00
Joshua Goins	c778ba8b24	Fix jump to previous/next unread room shortcuts These were dependent on a renamed property and ended up breaking, oops.	2025-10-27 18:09:00 -04:00
Joshua Goins	07fb3160eb	Add "Inspect Room Data" button in the room sidebar I find myself doing the same routine: I want to inspect a room's state, so I have to go hunting for the Developer Tools button. And then I have to do a few clicks to even get the correct room, what a waste of time! So I added a new button to the sidebar to open the Developer Tools for the current room.	2025-10-27 18:08:51 -04:00
Joshua Goins	7444d68280	Change room sidebar action text As we've continued to add more and more room actions, I'm not entirely happy with how they're worded. Some are super short and sweet like "Verify User" while others refer to the room as if the sidebar wasn't enough context: "Search in this room". I redid all of the button's text so they're shorter, like "Search Messages".	2025-10-27 18:08:42 -04:00
Joshua Goins	1d5536401d	Make the CTRL+F shortcut search the current room's messages Right now there's not an easy way to quickly bring up message search. If you press CTRL+F (with the room information sidebar closed, for some reason) that brings up the same dialog as CTRL+K which seems redundant. I assigned that shortcut to the message search dialog instead, which is makes much more sense in my opinion. I also made sure its disabled in spaces or when there's not a room open. BUG: 487270 FIXED-IN: 25.12.0	2025-10-27 18:08:29 -04:00
Joshua Goins	099e996f2f	Improve standalone images in link preview and more We would incorrectly show a "truncate" button for standalone images which isn't applicable since there's no text. That check has been fixed, and it doesn't seem to regress normal link previews. Another is that if there's only an image, our layout would center the image which looks awkward since almost everything else is left-aligned in chat. This is also fixed, which notably matches up to Element Web's behavior. I added support for the hover link indicator as well. Someone could maliciously hide it via Markdown but have a legitimate-looking link preview, for example. You can check that by hovering over the link in the message itself, but now the link preview is another way to confirm that!	2025-10-27 18:08:21 -04:00
Joshua Goins	6d9974b2b1	Improve the Jitsi meeting button UX Widgets support is incredibly useful and so is this button, but it has a few problems. The most obvious is that it's still enabled even if you don't actually have the permission to start Jitsi meetings, so I fixed that. I also made sure it's hidden when viewing spaces too. Another problem is that you can't easily tell if a meeting is currently in progress either, nor do we have a good icon for that in Breeze. So I changed the tooltip and colored the icon in this case. The final problem I fixed is something not exclusive to NeoChat, but generally all chat applications with this feature - there's no confirmation! To stop "butt-dialing" random people or rooms, I added a prompt before starting or joining a meeting.	2025-10-27 18:08:08 -04:00