Make the show avatar in roomlist page use the correct config setting.

- Cleanup Layout.
- Remove broken show avatar as FullScreenImage as I see no value and it hasn't worked for a while now and no one complained.

.flatpak-manifest.json

@@ -136,8 +136,8 @@
             "sources": [
                 {
                     "type": "archive",
-                    "url": "https://github.com/danvratil/qcoro/archive/refs/tags/v0.4.0.tar.gz",
-                    "sha256": "0e68b3f0ce7bf521ffbdd731464d2d60d8d7a39a749b551ed26855a1707d86d1",
+                    "url": "https://github.com/danvratil/qcoro/archive/refs/tags/v0.7.0.tar.gz",
+                    "sha256": "23ef0217926e67c8d2eb861cf91617da2f7d8d5a9ae6c62321b21448b1669210",
                     "x-checker-data": {
                         "type": "anitya",
                         "project-id": 236236,

.gitlab-ci.yml

@@ -7,7 +7,6 @@ include:
   - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/linux.yml
 # TODO enable once we can have qt6 libQuotient on the CI
 #  - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/linux-qt6.yml
-# TODO re-enable once cmark is in the CI again
-#  - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/windows.yml
+  - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/windows.yml
   - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/freebsd.yml
   - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/flatpak.yml

.kde-ci.yml

@@ -14,6 +14,10 @@ Dependencies:
     'frameworks/knotifications': '@stable'
     'libraries/kquickimageeditor': '@stable'
     'frameworks/sonnet': '@stable'
+    'libraries/kirigami-addons': '@latest'
+    'third-party/libquotient': '@latest'
+    'third-party/qtkeychain': '@latest'
+    'third-party/cmark': '@latest'
 - 'on': ['Windows', 'Linux', 'FreeBSD']
   'require':
     'frameworks/qqc2-desktop-style': '@stable'

CMakeLists.txt

@@ -7,7 +7,7 @@
 cmake_minimum_required(VERSION 3.16)
 
 project(NeoChat)
-set(PROJECT_VERSION "22.09")
+set(PROJECT_VERSION "22.11")
 
 set(KF5_MIN_VERSION "5.91.0")
 set(QT_MIN_VERSION "5.15.2")
@@ -58,6 +58,7 @@ set_package_properties(KF5Kirigami2 PROPERTIES
     TYPE REQUIRED
     PURPOSE "Kirigami application UI framework"
 )
+find_package(KF5KirigamiAddons 0.6 REQUIRED)
 
 find_package(Qt${QT_MAJOR_VERSION}Keychain)
 set_package_properties(Qt${QT_MAJOR_VERSION}Keychain PROPERTIES
@@ -80,8 +81,6 @@ else()
     ecm_find_qmlmodule(org.kde.syntaxhighlighting 1.0)
 endif()
 
-ecm_find_qmlmodule(org.kde.kirigamiaddons.labs.mobileform 0.1)
-
 if (NOT ANDROID AND NOT WIN32 AND NOT APPLE)
     find_package(KF5DBusAddons ${KF5_MIN_VERSION} REQUIRED)
 endif()
@@ -113,10 +112,7 @@ set_package_properties(KQuickImageEditor PROPERTIES
     PURPOSE "Add image editing capability to image attachments"
 )
 
-find_package(QCoro${QT_MAJOR_VERSION} COMPONENTS Core QUIET)
-if(NOT QCoro${QT_MAJOR_VERSION}_FOUND)
-    find_package(QCoro REQUIRED)
-endif()
+find_package(QCoro${QT_MAJOR_VERSION} 0.4 COMPONENTS Core REQUIRED)
 
 qcoro_enable_coroutines()
 
@@ -145,7 +141,7 @@ add_definitions(-DQT_NO_FOREACH)
 
 add_subdirectory(src)
 if (BUILD_TESTING AND Quotient_VERSION_MINOR GREATER 6)
-    find_package(Qt5 ${QT_MIN_VERSION} NO_MODULE COMPONENTS Test)
+    find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} NO_MODULE COMPONENTS Test)
     add_subdirectory(autotests)
 endif()
 

org.kde.neochat.appdata.xml

@@ -34,6 +34,7 @@
   <name xml:lang="pl">NeoChat</name>
   <name xml:lang="pt">NeoChat</name>
   <name xml:lang="pt-BR">NeoChat</name>
+  <name xml:lang="ru">NeoChat</name>
   <name xml:lang="sk">NeoChat</name>
   <name xml:lang="sl">NeoChat</name>
   <name xml:lang="sv">NeoChat</name>
@@ -67,6 +68,7 @@
   <summary xml:lang="pl">Program do obsługi matriksa, rozproszonego protokołu porozumiewania się</summary>
   <summary xml:lang="pt">Um cliente para o Matrix, o protocolo de comunicação descentralizado</summary>
   <summary xml:lang="pt-BR">Um cliente do Matrix, o protocolo de comunicação descentralizado</summary>
+  <summary xml:lang="ru">Клиент для Matrix — децентрализованного коммуникационного протокола</summary>
   <summary xml:lang="sk">Klient pre matrix, decentralizovaný komunikačný protokol</summary>
   <summary xml:lang="sl">Odjemalec za matrix, decentralizirani komunikacijski protokol</summary>
   <summary xml:lang="sv">En klient för Matrix, det decentraliserade kommunikationsprotokollet</summary>
@@ -97,6 +99,7 @@
     <p xml:lang="pl">NeoChat jest programem do Matrisa. Umożliwia wysyłanie wiadomości tekstowych, filmów oraz dźwięku do twojej rodziny, znajomych oraz przyjaciół poprzez protokół Matriksa.</p>
     <p xml:lang="pt">O NeoChat é um cliente do Matrix. O mesmo permite-lhe enviar mensagens de texto, ficheiros de vídeo e áudio para a sua família, colegas e amigos com o protocolo Matrix.</p>
     <p xml:lang="pt-BR">O NeoChat é um cliente Matrix. Ele permite a você enviar mensagens de texto, arquivos de vídeo e áudio para seus familiares, colegas e amigos usando o protocolo Matrix.</p>
+    <p xml:lang="ru">NeoChat — это клиент, поддерживающий работу с протоколом Matrix. Он позволяет  отправлять текстовые сообщения, видео и аудиофайлы.</p>
     <p xml:lang="sk">NeoChat je Matrix klient. Umožňuje vám posielať textové správy, videá a zvukové súbory rodine, kolegom a priateľom pomocou protokolu Matrix.</p>
     <p xml:lang="sl">NeoChat je odjemalec Matrixa. Dovoljuje vam pošiljanje besedilnih sporočil, videoposnetkov in zvočnih datotek vaši družini, kolegom in prijateljem z uporabo protokola Matrix.</p>
     <p xml:lang="sv">NeoChat är en Matrix-klient. Den låter dig skicka textmeddelanden, videor och ljudfiler till din familj, kollegor och vänner med användning av Matrix-protokollet.</p>
@@ -126,6 +129,7 @@
     <p xml:lang="pl">Matrix jest protokołem rozproszonego porozumiewania się oddający użytkownikowi jego władzę. Obecnie NeoChat obsługuje dużą część protokołu poza szyfrowanymi rozmowami tekstowymi i z obrazem.</p>
     <p xml:lang="pt">O Matrix é um protocolo de comunicações descentralizado, colocando de novo o utilizador no poder. De momento, o NeoChat implementa uma boa parte do protocolo, com a excepção das conversas encriptadas e as conversas de vídeo.</p>
     <p xml:lang="pt-BR">O Matrix é um protocolo de comunicação descentralizado, colocando o usuário de volta no controle. Atualmente o NeoChat implementa grande parte do protocolo com a exceção de bate-papos criptografados e bate-papo por vídeo.</p>
+    <p xml:lang="ru">Matrix — это децентрализованный коммуникационный протокол, возвращающий пользователю контроль над своими данными. В настоящее время в приложении NeoChat реализована поддержка большей части протокола, за исключением зашифрованных чатов и видеочата.</p>
     <p xml:lang="sk">Matrix je decentralizovaný komunikačný protokol, ktorý používateľovi vracia kontrolu. V súčasnosti NeoChat implementuje veľkú časť protokolu s výnimkou šifrovaných chatov a videohovorov.</p>
     <p xml:lang="sl">Matrix je decentraliziran komunikacijski protokol, kjer ima uporabnik uporabnik kontrolo rabe. Trenutno ima NeoChat izveden velik del protokola z izjemo šifriranih klepetov in video klepetov.</p>
     <p xml:lang="sv">Matrix är ett decentraliserat kommunikationsprotokoll, som ger tillbaka kontrollen till användaren. För närvarande implementerar NeoChat en stor del av protokollet, med undantag för krypterad chatt och videochatt.</p>
@@ -155,6 +159,7 @@
     <p xml:lang="pl">NeoChat działa zarówno na urządzeniach przenośnych jak i biurkowych, zapewniając spójne wrażenia użytkownika</p>
     <p xml:lang="pt">O NeoChat funciona tanto em dispositivos móveis como no computador, fornecendo uma experiência de utilizador consistente.</p>
     <p xml:lang="pt-BR">O NeoChat funciona tanto no celular como no computador enquanto fornece uma experiência consistente ao usuário.</p>
+    <p xml:lang="ru">NeoChat работает как на мобильных устройствах, так и на настольных компьютерах, обеспечивая единый пользовательский интерфейс.</p>
     <p xml:lang="sk">NeoChat funguje na mobilných aj stolových počítačoch a poskytuje konzistentný používateľský zážitok.</p>
     <p xml:lang="sl">NeoChat deluje tako na mobilnih kot na namiznih platformah z zagotavljanjem konsistentne uporabniške izkušnje.</p>
     <p xml:lang="sv">NeoChat fungerar både på mobil och skrivbord och tillhandahåller en konsekvent användarupplevelse.</p>
@@ -193,6 +198,7 @@
   <developer_name xml:lang="pl">Społeczność KDE</developer_name>
   <developer_name xml:lang="pt">A Comunidade do KDE</developer_name>
   <developer_name xml:lang="pt-BR">A comunidade KDE</developer_name>
+  <developer_name xml:lang="ru">Сообщество KDE</developer_name>
   <developer_name xml:lang="sk">KDE Komunita</developer_name>
   <developer_name xml:lang="sl">Skupnost KDE</developer_name>
   <developer_name xml:lang="sv">KDE-gemenskapen</developer_name>
@@ -218,6 +224,9 @@
     <content_attribute id="social-chat">intense</content_attribute>
   </content_rating>
   <releases>
+    <release version="22.11" date="2022-11-30">
+      <url>https://plasma-mobile.org/2022/11/30/plasma-mobile-gear-22-11/</url>
+    </release>
     <release version="22.09" date="2022-09-27">
       <url>https://www.plasma-mobile.org/2022/09/27/plasma-mobile-gear-22-09/</url>
     </release>

org.kde.neochat.desktop

@@ -29,6 +29,7 @@ Name[pl]=NeoChat
 Name[pt]=NeoChat
 Name[pt_BR]=NeoChat
 Name[ro]=NeoChat
+Name[ru]=NeoChat
 Name[sk]=NeoChat
 Name[sl]=NeoChat
 Name[sv]=NeoChat
@@ -64,6 +65,7 @@ GenericName[pl]=Program Matriksa
 GenericName[pt]=Cliente de Matrix
 GenericName[pt_BR]=Cliente Matrix
 GenericName[ro]=Client Matrix
+GenericName[ru]=Клиент Matrix
 GenericName[sk]=Matrix Client
 GenericName[sl]=Odjemalec Matrix
 GenericName[sv]=Matrix-klient
@@ -98,6 +100,7 @@ Comment[pl]=Program obsługi protokołu Matriksa
 Comment[pt]=Cliente para o protocolo Matrix
 Comment[pt_BR]=Cliente para o protocolo Matrix
 Comment[ro]=Client pentru protocolul Matrix
+Comment[ru]=Клиент для протокола Matrix
 Comment[sk]=Klient protokolu Matrix
 Comment[sl]=Odjemalec za protokol Matrix
 Comment[sv]=Klient för protokollet Matrix

src/CMakeLists.txt

@@ -7,6 +7,7 @@ add_library(neochat STATIC
     controller.cpp
     actionshandler.cpp
     emojimodel.cpp
+    emojitones.cpp
     customemojimodel.cpp
     clipboard.cpp
     matriximageprovider.cpp
@@ -44,6 +45,7 @@ add_library(neochat STATIC
     serverlistmodel.cpp
     statemodel.cpp
     filetransferpseudojob.cpp
+    searchmodel.cpp
 )
 
 add_executable(neochat-app
@@ -67,7 +69,7 @@ endif()
 
 ecm_add_app_icon(NEOCHAT_ICON ICONS ${CMAKE_SOURCE_DIR}/128-logo.png)
 
-target_sources(neochat PRIVATE ${NEOCHAT_ICON})
+target_sources(neochat-app PRIVATE ${NEOCHAT_ICON})
 
 if(NOT ANDROID)
     target_sources(neochat PRIVATE colorschemer.cpp)
@@ -90,12 +92,7 @@ else()
 endif()
 
 target_include_directories(neochat PRIVATE ${CMAKE_BINARY_DIR})
-target_link_libraries(neochat PUBLIC Qt::Core Qt::Quick Qt::Qml Qt::Gui Qt::Multimedia Qt::Network Qt::QuickControls2 KF5::I18n KF5::Kirigami2 KF5::Notifications KF5::ConfigCore KF5::ConfigGui KF5::CoreAddons KF5::SonnetCore  KF5::ItemModels Quotient cmark::cmark ${QTKEYCHAIN_LIBRARIES})
-if(TARGET QCoro5::Coro)
-    target_link_libraries(neochat PUBLIC QCoro5::Coro)
-else()
-    target_link_libraries(neochat PUBLIC QCoro::QCoro)
-endif()
+target_link_libraries(neochat PUBLIC Qt::Core Qt::Quick Qt::Qml Qt::Gui Qt::Multimedia Qt::Network Qt::QuickControls2 KF5::I18n KF5::Kirigami2 KF5::Notifications KF5::ConfigCore KF5::ConfigGui KF5::CoreAddons KF5::SonnetCore  KF5::ItemModels Quotient cmark::cmark ${QTKEYCHAIN_LIBRARIES} QCoro::Core)
 kconfig_add_kcfg_files(neochat GENERATE_MOC neochatconfig.kcfgc)
 
 if(NEOCHAT_FLATPAK)
@@ -165,6 +162,13 @@ if(ANDROID)
         "download"
         "smiley"
         "tools-check-spelling"
+        "username-copy"
+        "system-switch-user"
+        "bookmark-new"
+        "bookmark-remove"
+        "favorite"
+        "window-new"
+        "globe"
     )
 else()
     target_link_libraries(neochat PUBLIC Qt::Widgets KF5::KIOWidgets)

src/actionshandler.cpp

@@ -17,9 +17,8 @@
 #include "controller.h"
 #include "customemojimodel.h"
 #include "neochatconfig.h"
-#include "neochatroom.h"
-#include "roommanager.h"
 #include "neochatuser.h"
+#include "roommanager.h"
 
 using namespace Quotient;
 
@@ -139,6 +138,10 @@ void ActionsHandler::handleMessage()
 
     handledText = CustomEmojiModel::instance().preprocessText(handledText);
     handledText = markdownToHTML(handledText);
+    if (handledText.count("<p>") == 1 && handledText.count("</p>") == 1) {
+        handledText.remove("<p>");
+        handledText.remove("</p>");
+    }
 
     if (handledText.length() == 0) {
         return;

src/actionshandler.h

@@ -7,7 +7,8 @@
 
 #include <events/roommessageevent.h>
 
-class NeoChatRoom;
+#include "neochatroom.h"
+
 class CustomEmojiModel;
 class NeoChatRoom;
 

src/actionsmodel.cpp

@@ -6,6 +6,7 @@
 #include "controller.h"
 #include "neochatroom.h"
 #include "neochatuser.h"
+#include "roommanager.h"
 #include <events/roommemberevent.h>
 #include <events/roompowerlevelsevent.h>
 
@@ -193,8 +194,9 @@ QVector<ActionsModel::Action> actions{
                                          i18nc("'<text>' does not look like a room id or alias.", "'%1' does not look like a room id or alias.", text));
                 return QString();
             }
-            if (Controller::instance().activeConnection()->room(text) || Controller::instance().activeConnection()->roomByAlias(text)) {
-                Q_EMIT room->showMessage(NeoChatRoom::Info, i18nc("You are already in room <roomname>.", "You are already in room %1.", text));
+            auto targetRoom = text.startsWith(QLatin1Char('!')) ? room->connection()->room(text) : room->connection()->roomByAlias(text);
+            if (targetRoom) {
+                RoomManager::instance().enterRoom(dynamic_cast<NeoChatRoom *>(targetRoom));
                 return QString();
             }
             Q_EMIT room->showMessage(NeoChatRoom::Info, i18nc("Joining room <roomname>.", "Joining room %1.", text));

src/chatdocumenthandler.cpp

@@ -5,7 +5,6 @@
 
 #include <QQmlFile>
 #include <QQmlFileSelector>
-#include <QQuickTextDocument>
 #include <QStringBuilder>
 #include <QSyntaxHighlighter>
 #include <QTextBlock>
@@ -16,7 +15,6 @@
 #include <Sonnet/Settings>
 
 #include "actionsmodel.h"
-#include "completionmodel.h"
 #include "neochatroom.h"
 #include "roomlistmodel.h"
 
@@ -135,7 +133,11 @@ int ChatDocumentHandler::completionStartIndex() const
         return 0;
     }
 
-    const auto &cursor = cursorPosition();
+#if QT_VERSION > QT_VERSION_CHECK(6, 0, 0)
+    const long long cursor = cursorPosition();
+#else
+    const auto cursor = cursorPosition();
+#endif
     const auto &text = m_room->chatBoxText();
     auto start = std::min(cursor, text.size()) - 1;
     while (start > -1) {
@@ -199,7 +201,7 @@ void ChatDocumentHandler::setRoom(NeoChatRoom *room)
 
 void ChatDocumentHandler::complete(int index)
 {
-    if (m_completionModel->autoCompletionType() == ChatDocumentHandler::User) {
+    if (m_completionModel->autoCompletionType() == CompletionModel::User) {
         auto name = m_completionModel->data(m_completionModel->index(index, 0), CompletionModel::Text).toString();
         auto id = m_completionModel->data(m_completionModel->index(index, 0), CompletionModel::Subtitle).toString();
         auto text = m_room->chatBoxText();
@@ -213,7 +215,7 @@ void ChatDocumentHandler::complete(int index)
         cursor.setKeepPositionOnInsert(true);
         m_room->mentions()->push_back({cursor, name, 0, 0, id});
         m_highlighter->rehighlight();
-    } else if (m_completionModel->autoCompletionType() == ChatDocumentHandler::Command) {
+    } else if (m_completionModel->autoCompletionType() == CompletionModel::Command) {
         auto command = m_completionModel->data(m_completionModel->index(index, 0), CompletionModel::ReplacedText).toString();
         auto text = m_room->chatBoxText();
         auto at = text.lastIndexOf(QLatin1Char('/'));
@@ -221,7 +223,7 @@ void ChatDocumentHandler::complete(int index)
         cursor.setPosition(at);
         cursor.setPosition(cursorPosition(), QTextCursor::KeepAnchor);
         cursor.insertText(QStringLiteral("/%1 ").arg(command));
-    } else if (m_completionModel->autoCompletionType() == ChatDocumentHandler::Room) {
+    } else if (m_completionModel->autoCompletionType() == CompletionModel::Room) {
         auto alias = m_completionModel->data(m_completionModel->index(index, 0), CompletionModel::Subtitle).toString();
         auto text = m_room->chatBoxText();
         auto at = text.lastIndexOf(QLatin1Char('#'), cursorPosition() - 1);
@@ -234,7 +236,7 @@ void ChatDocumentHandler::complete(int index)
         cursor.setKeepPositionOnInsert(true);
         m_room->mentions()->push_back({cursor, alias, 0, 0, alias});
         m_highlighter->rehighlight();
-    } else if (m_completionModel->autoCompletionType() == ChatDocumentHandler::Emoji) {
+    } else if (m_completionModel->autoCompletionType() == CompletionModel::Emoji) {
         auto shortcode = m_completionModel->data(m_completionModel->index(index, 0), CompletionModel::ReplacedText).toString();
         auto text = m_room->chatBoxText();
         auto at = text.lastIndexOf(QLatin1Char(':'));

src/chatdocumenthandler.h

@@ -4,16 +4,15 @@
 #pragma once
 
 #include <QObject>
-
+#include <QQuickTextDocument>
 #include <QTextCursor>
 
+#include "completionmodel.h"
 #include "userlistmodel.h"
 
 class QTextDocument;
-class QQuickTextDocument;
 class NeoChatRoom;
 class SyntaxHighlighter;
-class CompletionModel;
 
 class ChatDocumentHandler : public QObject
 {
@@ -28,15 +27,6 @@ class ChatDocumentHandler : public QObject
     Q_PROPERTY(NeoChatRoom *room READ room NOTIFY roomChanged)
 
 public:
-    enum AutoCompletionType {
-        User,
-        Room,
-        Emoji,
-        Command,
-        None,
-    };
-    Q_ENUM(AutoCompletionType)
-
     explicit ChatDocumentHandler(QObject *parent = nullptr);
 
     [[nodiscard]] QQuickTextDocument *document() const;
@@ -80,9 +70,7 @@ private:
 
     SyntaxHighlighter *m_highlighter = nullptr;
 
-    AutoCompletionType m_completionType = None;
+    CompletionModel::AutoCompletionType m_completionType = CompletionModel::None;
 
     CompletionModel *m_completionModel = nullptr;
 };
-
-Q_DECLARE_METATYPE(ChatDocumentHandler::AutoCompletionType);

src/collapsestateproxymodel.cpp

@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: LGPL-2.0-or-later
 
 #include "collapsestateproxymodel.h"
-#include "messageeventmodel.h"
 
 #include <KLocalizedString>
 

src/completionmodel.cpp

@@ -10,7 +10,6 @@
 #include "customemojimodel.h"
 #include "emojimodel.h"
 #include "neochatroom.h"
-#include "roomlistmodel.h"
 #include "userlistmodel.h"
 
 CompletionModel::CompletionModel(QObject *parent)
@@ -42,7 +41,7 @@ void CompletionModel::setText(const QString &text, const QString &fullText)
 int CompletionModel::rowCount(const QModelIndex &parent) const
 {
     Q_UNUSED(parent);
-    if (m_autoCompletionType == ChatDocumentHandler::None) {
+    if (m_autoCompletionType == None) {
         return 0;
     }
     return m_filterModel->rowCount();
@@ -54,7 +53,7 @@ QVariant CompletionModel::data(const QModelIndex &index, int role) const
         return {};
     }
     auto filterIndex = m_filterModel->index(index.row(), 0);
-    if (m_autoCompletionType == ChatDocumentHandler::User) {
+    if (m_autoCompletionType == User) {
         if (role == Text) {
             return m_filterModel->data(filterIndex, UserListModel::NameRole);
         }
@@ -66,7 +65,7 @@ QVariant CompletionModel::data(const QModelIndex &index, int role) const
         }
     }
 
-    if (m_autoCompletionType == ChatDocumentHandler::Command) {
+    if (m_autoCompletionType == Command) {
         if (role == Text) {
             return m_filterModel->data(filterIndex, ActionsModel::Prefix).toString() + QStringLiteral(" ")
                 + m_filterModel->data(filterIndex, ActionsModel::Parameters).toString();
@@ -81,7 +80,7 @@ QVariant CompletionModel::data(const QModelIndex &index, int role) const
             return m_filterModel->data(filterIndex, ActionsModel::Prefix);
         }
     }
-    if (m_autoCompletionType == ChatDocumentHandler::Room) {
+    if (m_autoCompletionType == Room) {
         if (role == Text) {
             return m_filterModel->data(filterIndex, RoomListModel::DisplayNameRole);
         }
@@ -92,7 +91,7 @@ QVariant CompletionModel::data(const QModelIndex &index, int role) const
             return m_filterModel->data(filterIndex, RoomListModel::AvatarRole);
         }
     }
-    if (m_autoCompletionType == ChatDocumentHandler::Emoji) {
+    if (m_autoCompletionType == Emoji) {
         if (role == Text) {
             return m_filterModel->data(filterIndex, CustomEmojiModel::DisplayRole);
         }
@@ -102,6 +101,9 @@ QVariant CompletionModel::data(const QModelIndex &index, int role) const
         if (role == ReplacedText) {
             return m_filterModel->data(filterIndex, CustomEmojiModel::ReplacedTextRole);
         }
+        if (role == Subtitle) {
+            return m_filterModel->data(filterIndex, EmojiModel::DescriptionRole);
+        }
     }
 
     return {};
@@ -125,7 +127,7 @@ void CompletionModel::updateCompletion()
         m_filterModel->setSecondaryFilterRole(UserListModel::NameRole);
         m_filterModel->setFullText(m_fullText);
         m_filterModel->setFilterText(m_text);
-        m_autoCompletionType = ChatDocumentHandler::User;
+        m_autoCompletionType = User;
         m_filterModel->invalidate();
     } else if (text().startsWith(QLatin1Char('/'))) {
         m_filterModel->setSourceModel(&ActionsModel::instance());
@@ -133,10 +135,10 @@ void CompletionModel::updateCompletion()
         m_filterModel->setSecondaryFilterRole(-1);
         m_filterModel->setFullText(m_fullText);
         m_filterModel->setFilterText(m_text.mid(1));
-        m_autoCompletionType = ChatDocumentHandler::Command;
+        m_autoCompletionType = Command;
         m_filterModel->invalidate();
     } else if (text().startsWith(QLatin1Char('#'))) {
-        m_autoCompletionType = ChatDocumentHandler::Room;
+        m_autoCompletionType = Room;
         m_filterModel->setSourceModel(m_roomListModel);
         m_filterModel->setFilterRole(RoomListModel::CanonicalAliasRole);
         m_filterModel->setSecondaryFilterRole(RoomListModel::DisplayNameRole);
@@ -146,15 +148,15 @@ void CompletionModel::updateCompletion()
     } else if (text().startsWith(QLatin1Char(':'))
                && (m_fullText.indexOf(QLatin1Char(':'), 1) == -1
                    || (m_fullText.indexOf(QLatin1Char(' ')) != -1 && m_fullText.indexOf(QLatin1Char(':'), 1) > m_fullText.indexOf(QLatin1Char(' '), 1)))) {
-        m_autoCompletionType = ChatDocumentHandler::Emoji;
         m_filterModel->setSourceModel(m_emojiModel);
+        m_autoCompletionType = Emoji;
         m_filterModel->setFilterRole(CustomEmojiModel::Name);
-        m_filterModel->setSecondaryFilterRole(-1);
+        m_filterModel->setSecondaryFilterRole(EmojiModel::DescriptionRole);
         m_filterModel->setFullText(m_fullText);
         m_filterModel->setFilterText(m_text);
         m_filterModel->invalidate();
     } else {
-        m_autoCompletionType = ChatDocumentHandler::None;
+        m_autoCompletionType = None;
     }
     beginResetModel();
     endResetModel();
@@ -171,12 +173,12 @@ void CompletionModel::setRoom(NeoChatRoom *room)
     Q_EMIT roomChanged();
 }
 
-ChatDocumentHandler::AutoCompletionType CompletionModel::autoCompletionType() const
+CompletionModel::AutoCompletionType CompletionModel::autoCompletionType() const
 {
     return m_autoCompletionType;
 }
 
-void CompletionModel::setAutoCompletionType(ChatDocumentHandler::AutoCompletionType autoCompletionType)
+void CompletionModel::setAutoCompletionType(AutoCompletionType autoCompletionType)
 {
     m_autoCompletionType = autoCompletionType;
     Q_EMIT autoCompletionTypeChanged();

src/completionmodel.h

@@ -7,7 +7,7 @@
 
 #include <KConcatenateRowsProxyModel>
 
-#include "chatdocumenthandler.h"
+#include "roomlistmodel.h"
 
 class CompletionProxyModel;
 class UserListModel;
@@ -19,10 +19,19 @@ class CompletionModel : public QAbstractListModel
     Q_OBJECT
     Q_PROPERTY(QString text READ text NOTIFY textChanged)
     Q_PROPERTY(NeoChatRoom *room READ room WRITE setRoom NOTIFY roomChanged)
-    Q_PROPERTY(ChatDocumentHandler::AutoCompletionType autoCompletionType READ autoCompletionType NOTIFY autoCompletionTypeChanged);
+    Q_PROPERTY(AutoCompletionType autoCompletionType READ autoCompletionType NOTIFY autoCompletionTypeChanged);
     Q_PROPERTY(RoomListModel *roomListModel READ roomListModel WRITE setRoomListModel NOTIFY roomListModelChanged);
 
 public:
+    enum AutoCompletionType {
+        User,
+        Room,
+        Emoji,
+        Command,
+        None,
+    };
+    Q_ENUM(AutoCompletionType)
+
     enum Roles {
         Text = Qt::DisplayRole,
         Subtitle,
@@ -47,7 +56,7 @@ public:
     RoomListModel *roomListModel() const;
     void setRoomListModel(RoomListModel *roomListModel);
 
-    ChatDocumentHandler::AutoCompletionType autoCompletionType() const;
+    AutoCompletionType autoCompletionType() const;
 
 Q_SIGNALS:
     void textChanged();
@@ -60,11 +69,12 @@ private:
     QString m_fullText;
     CompletionProxyModel *m_filterModel;
     NeoChatRoom *m_room = nullptr;
-    ChatDocumentHandler::AutoCompletionType m_autoCompletionType = ChatDocumentHandler::None;
+    AutoCompletionType m_autoCompletionType = None;
 
-    void setAutoCompletionType(ChatDocumentHandler::AutoCompletionType autoCompletionType);
+    void setAutoCompletionType(AutoCompletionType autoCompletionType);
 
     UserListModel *m_userListModel;
     RoomListModel *m_roomListModel;
     KConcatenateRowsProxyModel *m_emojiModel;
 };
+Q_DECLARE_METATYPE(CompletionModel::AutoCompletionType);

src/completionproxymodel.cpp

@@ -18,7 +18,22 @@ bool CompletionProxyModel::filterAcceptsRow(int sourceRow, const QModelIndex &so
             && sourceModel()
                    ->data(sourceModel()->index(sourceRow, 0), secondaryFilterRole())
                    .toString()
+#if QT_VERSION > QT_VERSION_CHECK(6, 0, 0)
+                   .startsWith(QStringView(m_filterText).sliced(1), Qt::CaseInsensitive));
+#else
                    .startsWith(m_filterText.midRef(1), Qt::CaseInsensitive));
+#endif
+}
+
+bool CompletionProxyModel::lessThan(const QModelIndex &source_left, const QModelIndex &source_right) const
+{
+    if (m_secondaryFilterRole == -1)
+        return QSortFilterProxyModel::lessThan(source_left, source_right);
+    bool left_primary = sourceModel()->data(source_left, filterRole()).toString().startsWith(m_filterText, Qt::CaseInsensitive);
+    bool right_primary = sourceModel()->data(source_right, filterRole()).toString().startsWith(m_filterText, Qt::CaseInsensitive);
+    if (left_primary != right_primary)
+        return left_primary;
+    return QSortFilterProxyModel::lessThan(source_left, source_right);
 }
 
 int CompletionProxyModel::secondaryFilterRole() const

src/completionproxymodel.h

@@ -13,6 +13,7 @@ class CompletionProxyModel : public QSortFilterProxyModel
 
 public:
     bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const override;
+    bool lessThan(const QModelIndex &source_left, const QModelIndex &source_right) const override;
 
     int secondaryFilterRole() const;
     void setSecondaryFilterRole(int role);

src/controller.cpp

@@ -19,7 +19,6 @@
 #include <QGuiApplication>
 #include <QImageReader>
 #include <QNetworkProxy>
-#include <QQuickItem>
 #include <QQuickTextDocument>
 #include <QQuickWindow>
 #include <QStandardPaths>
@@ -234,13 +233,6 @@ void Controller::showWindow()
     WindowController::instance().showAndRaiseWindow(QString());
 }
 
-inline QString accessTokenFileName(const AccountSettings &account)
-{
-    QString fileName = account.userId();
-    fileName.replace(':', '_');
-    return QStandardPaths::writableLocation(QStandardPaths::AppLocalDataLocation) + '/' + fileName;
-}
-
 void Controller::loginWithAccessToken(const QString &serverAddr, const QString &user, const QString &token, const QString &deviceName)
 {
     if (user.isEmpty() || token.isEmpty()) {
@@ -281,7 +273,6 @@ void Controller::logout(Connection *conn, bool serverSideLogout)
     }
 
     SettingsGroup("Accounts").remove(conn->userId());
-    QFile(accessTokenFileName(AccountSettings(conn->userId()))).remove();
 
     QKeychain::DeletePasswordJob job(qAppName());
     job.setAutoDelete(true);
@@ -374,15 +365,7 @@ void Controller::invokeLogin()
                 if (accessTokenLoadingJob->error() == QKeychain::Error::NoError) {
                     accessToken = accessTokenLoadingJob->binaryData();
                 } else {
-                    // No access token from the keychain, try token file
-                    // TODO FIXME this code is racy since the file might have
-                    // already been removed. But since the other code do a blocking
-                    // dbus call, the probability are not high that it will happen.
-                    // loadAccessTokenFromFile is also mostly legacy nowadays
-                    accessToken = loadAccessTokenFromFile(account);
-                    if (accessToken.isEmpty()) {
-                        return;
-                    }
+                    return;
                 }
 
                 auto connection = new Connection(account.homeserver());
@@ -416,21 +399,6 @@ void Controller::invokeLogin()
     }
 }
 
-QByteArray Controller::loadAccessTokenFromFile(const AccountSettings &account)
-{
-    QFile accountTokenFile{accessTokenFileName(account)};
-    if (accountTokenFile.open(QFile::ReadOnly)) {
-        if (accountTokenFile.size() < 1024) {
-            return accountTokenFile.readAll();
-        }
-
-        qWarning() << "File" << accountTokenFile.fileName() << "is" << accountTokenFile.size() << "bytes long - too long for a token, ignoring it.";
-    }
-    qWarning() << "Could not open access token file" << accountTokenFile.fileName();
-
-    return {};
-}
-
 QKeychain::ReadPasswordJob *Controller::loadAccessTokenFromKeyChain(const AccountSettings &account)
 {
     qDebug() << "Reading access token from the keychain for" << account.userId();
@@ -442,24 +410,6 @@ QKeychain::ReadPasswordJob *Controller::loadAccessTokenFromKeyChain(const Accoun
         if (job->error() == QKeychain::Error::NoError) {
             return;
         }
-        if (job->error() == QKeychain::Error::EntryNotFound) {
-            // no access token from the keychain, try token file
-            auto accessToken = loadAccessTokenFromFile(account);
-            if (!accessToken.isEmpty()) {
-                qDebug() << "Migrating the access token from file to the keychain for " << account.userId();
-                bool removed = false;
-                bool saved = saveAccessTokenToKeyChain(account, accessToken);
-                if (saved) {
-                    QFile accountTokenFile{accessTokenFileName(account)};
-                    removed = accountTokenFile.remove();
-                }
-                if (!(saved && removed)) {
-                    qDebug() << "Migrating the access token from the file to the keychain "
-                                "failed";
-                }
-                return;
-            }
-        }
 
         switch (job->error()) {
         case QKeychain::EntryNotFound:
@@ -484,22 +434,6 @@ QKeychain::ReadPasswordJob *Controller::loadAccessTokenFromKeyChain(const Accoun
     return job;
 }
 
-bool Controller::saveAccessTokenToFile(const AccountSettings &account, const QByteArray &accessToken)
-{
-    // (Re-)Make a dedicated file for access_token.
-    QFile accountTokenFile{accessTokenFileName(account)};
-    accountTokenFile.remove(); // Just in case
-
-    auto fileDir = QFileInfo(accountTokenFile).dir();
-    if (!((fileDir.exists() || fileDir.mkpath(".")) && accountTokenFile.open(QFile::WriteOnly))) {
-        Q_EMIT errorOccured("I/O Denied: Cannot save access token.");
-    } else {
-        accountTokenFile.write(accessToken);
-        return true;
-    }
-    return false;
-}
-
 bool Controller::saveAccessTokenToKeyChain(const AccountSettings &account, const QByteArray &accessToken)
 {
     qDebug() << "Save the access token to the keychain for " << account.userId();
@@ -514,7 +448,7 @@ bool Controller::saveAccessTokenToKeyChain(const AccountSettings &account, const
 
     if (job.error()) {
         qWarning() << "Could not save access token to the keychain: " << qPrintable(job.errorString());
-        return saveAccessTokenToFile(account, accessToken);
+        return false;
     }
     return true;
 }
@@ -808,11 +742,15 @@ void Controller::setApplicationProxy()
         proxy.setType(QNetworkProxy::HttpProxy);
         proxy.setHostName(cfg->proxyHost());
         proxy.setPort(cfg->proxyPort());
+        proxy.setUser(cfg->proxyUser());
+        proxy.setPassword(cfg->proxyPassword());
         break;
     case 2: // SOCKS 5
         proxy.setType(QNetworkProxy::Socks5Proxy);
         proxy.setHostName(cfg->proxyHost());
         proxy.setPort(cfg->proxyPort());
+        proxy.setUser(cfg->proxyUser());
+        proxy.setPassword(cfg->proxyPassword());
         break;
     case 0: // System Default
     default:

src/controller.h

@@ -68,7 +68,6 @@ public:
 
     [[nodiscard]] bool supportSystemTray() const;
 
-    bool saveAccessTokenToFile(const Quotient::AccountSettings &account, const QByteArray &accessToken);
     bool saveAccessTokenToKeyChain(const Quotient::AccountSettings &account, const QByteArray &accessToken);
 
     int activeConnectionIndex() const;
@@ -111,7 +110,6 @@ private:
     bool m_busy = false;
     TrayIcon *m_trayIcon = nullptr;
 
-    static QByteArray loadAccessTokenFromFile(const Quotient::AccountSettings &account);
     QKeychain::ReadPasswordJob *loadAccessTokenFromKeyChain(const Quotient::AccountSettings &account);
 
     void loadSettings();

src/customemojimodel.h

@@ -11,6 +11,10 @@ struct CustomEmoji {
     QString name; // with :semicolons:
     QString url; // mxc://
     QRegularExpression regexp;
+
+    Q_GADGET
+    Q_PROPERTY(QString unicode MEMBER url)
+    Q_PROPERTY(QString name MEMBER name)
 };
 
 class CustomEmojiModel : public QAbstractListModel
@@ -25,6 +29,7 @@ public:
         MxcUrl = 50,
         DisplayRole = 51,
         ReplacedTextRole = 52,
+        DescriptionRole = 53, // also invalid, reserved
     };
     Q_ENUM(Roles);
 

src/emojimodel.cpp

@@ -4,12 +4,13 @@
 #include <QVariant>
 
 #include "emojimodel.h"
+#include "emojitones.h"
 #include <QDebug>
 
 #include <algorithm>
 
+#include "customemojimodel.h"
 #include <KLocalizedString>
-#include <qnamespace.h>
 
 EmojiModel::EmojiModel(QObject *parent)
     : QAbstractListModel(parent)
@@ -48,6 +49,8 @@ QVariant EmojiModel::data(const QModelIndex &index, int role) const
             return QStringLiteral("invalid");
         case DisplayRole:
             return QStringLiteral("%2   :%1:").arg(emoji.shortName, emoji.unicode);
+        case DescriptionRole:
+            return emoji.description;
         }
     }
     return {};
@@ -58,16 +61,19 @@ QHash<int, QByteArray> EmojiModel::roleNames() const
     return {{ShortNameRole, "shortName"}, {UnicodeRole, "unicode"}};
 }
 
-QMultiHash<QString, QVariant> EmojiModel::_tones = {
-#include "emojitones.h"
-};
-
 QVariantList EmojiModel::history() const
 {
     return m_settings.value("Editor/emojis", QVariantList()).toList();
 }
 
 QVariantList EmojiModel::filterModel(const QString &filter, bool limit)
+{
+    auto emojis = CustomEmojiModel::instance().filterModel(filter);
+    emojis += filterModelNoCustom(filter, limit);
+    return emojis;
+}
+
+QVariantList EmojiModel::filterModelNoCustom(const QString &filter, bool limit)
 {
     QVariantList result;
 
@@ -82,7 +88,6 @@ QVariantList EmojiModel::filterModel(const QString &filter, bool limit)
             }
         }
     }
-
     return result;
 }
 
@@ -110,12 +115,28 @@ QVariantList EmojiModel::emojis(Category category) const
     if (category == History) {
         return history();
     }
+    if (category == HistoryNoCustom) {
+        QVariantList list;
+        for (const auto &e : history()) {
+            auto emoji = qvariant_cast<Emoji>(e);
+            if (!emoji.isCustom) {
+                list.append(e);
+            }
+        }
+        return list;
+    }
+    if (category == Custom) {
+        return CustomEmojiModel::instance().filterModel({});
+    }
     return _emojis[category];
 }
 
 QVariantList EmojiModel::tones(const QString &baseEmoji) const
 {
-    return _tones.values(baseEmoji);
+    if (baseEmoji.endsWith("tone")) {
+        return EmojiTones::_tones.values(baseEmoji.split(":")[0]);
+    }
+    return EmojiTones::_tones.values(baseEmoji);
 }
 
 QHash<EmojiModel::Category, QVariantList> EmojiModel::_emojis;
@@ -123,21 +144,11 @@ QHash<EmojiModel::Category, QVariantList> EmojiModel::_emojis;
 QVariantList EmojiModel::categories() const
 {
     return QVariantList{
-        // {QVariantMap{
-        //     {"category", EmojiModel::Search},
-        //     {"name", i18nc("Search for emojis", "Search")},
-        //     {"emoji", QStringLiteral("🔎")},
-        // }},
         {QVariantMap{
-            {"category", EmojiModel::History},
+            {"category", EmojiModel::HistoryNoCustom},
             {"name", i18nc("Previously used emojis", "History")},
             {"emoji", QStringLiteral("⌛️")},
         }},
-        {QVariantMap{
-            {"category", EmojiModel::Custom},
-            {"name", i18nc("'Custom' is a category of emoji", "Custom")},
-            {"emoji", QStringLiteral("😏")},
-        }},
         {QVariantMap{
             {"category", EmojiModel::Smileys},
             {"name", i18nc("'Smileys' is a category of emoji", "Smileys")},
@@ -185,3 +196,23 @@ QVariantList EmojiModel::categories() const
         }},
     };
 }
+
+QVariantList EmojiModel::categoriesWithCustom() const
+{
+    auto cats = categories();
+    cats.removeAt(0);
+    cats.insert(0,
+                QVariantMap{
+                    {"category", EmojiModel::History},
+                    {"name", i18nc("Previously used emojis", "History")},
+                    {"emoji", QStringLiteral("⌛️")},
+                });
+    cats.insert(1,
+                QVariantMap{
+                    {"category", EmojiModel::Custom},
+                    {"name", i18nc("'Custom' is a category of emoji", "Custom")},
+                    {"emoji", QStringLiteral("🖼️")},
+                });
+    ;
+    return cats;
+}

src/emojimodel.h

@@ -8,12 +8,18 @@
 #include <QSettings>
 
 struct Emoji {
-    Emoji(QString u, QString s, bool isCustom = false)
-        : unicode(std::move(std::move(u)))
-        , shortName(std::move(std::move(s)))
+    Emoji(QString unicode, QString shortname, bool isCustom = false)
+        : unicode(std::move(unicode))
+        , shortName(std::move(shortname))
         , isCustom(isCustom)
     {
     }
+    Emoji(QString unicode, QString shortname, QString description)
+        : unicode(std::move(unicode))
+        , shortName(std::move(shortname))
+        , description(std::move(description))
+    {
+    }
     Emoji() = default;
 
     friend QDataStream &operator<<(QDataStream &arch, const Emoji &object)
@@ -33,11 +39,13 @@ struct Emoji {
 
     QString unicode;
     QString shortName;
+    QString description;
     bool isCustom = false;
 
     Q_GADGET
     Q_PROPERTY(QString unicode MEMBER unicode)
     Q_PROPERTY(QString shortName MEMBER shortName)
+    Q_PROPERTY(QString description MEMBER description)
     Q_PROPERTY(bool isCustom MEMBER isCustom)
 };
 
@@ -49,6 +57,7 @@ class EmojiModel : public QAbstractListModel
 
     Q_PROPERTY(QVariantList history READ history NOTIFY historyChanged)
     Q_PROPERTY(QVariantList categories READ categories CONSTANT)
+    Q_PROPERTY(QVariantList categoriesWithCustom READ categoriesWithCustom CONSTANT)
 
 public:
     static EmojiModel &instance()
@@ -63,13 +72,16 @@ public:
         InvalidRole = 50,
         DisplayRole = 51,
         ReplacedTextRole = 52,
+        DescriptionRole = 53,
     };
     Q_ENUM(RoleNames);
 
     enum Category {
         Custom,
         Search,
+        SearchNoCustom,
         History,
+        HistoryNoCustom,
         Smileys,
         People,
         Nature,
@@ -89,11 +101,14 @@ public:
 
     Q_INVOKABLE QVariantList history() const;
     Q_INVOKABLE static QVariantList filterModel(const QString &filter, bool limit = true);
+    Q_INVOKABLE static QVariantList filterModelNoCustom(const QString &filter, bool limit = true);
+
     Q_INVOKABLE QVariantList emojis(Category category) const;
 
     Q_INVOKABLE QVariantList tones(const QString &baseEmoji) const;
 
     QVariantList categories() const;
+    QVariantList categoriesWithCustom() const;
 
 Q_SIGNALS:
     void historyChanged();
@@ -103,7 +118,6 @@ public Q_SLOTS:
 
 private:
     static QHash<Category, QVariantList> _emojis;
-    static QMultiHash<QString, QVariant> _tones;
 
     // TODO: Port away from QSettings
     QSettings m_settings;

src/emojitones.cpp

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

src/keywordnotificationrulemodel.cpp

@@ -15,7 +15,9 @@
 KeywordNotificationRuleModel::KeywordNotificationRuleModel(QObject *parent)
     : QAbstractListModel(parent)
 {
-    controllerConnectionChanged();
+    if (Controller::instance().activeConnection()) {
+        controllerConnectionChanged();
+    }
     connect(&Controller::instance(), &Controller::activeConnectionChanged, this, &KeywordNotificationRuleModel::controllerConnectionChanged);
 }
 

src/login.cpp

@@ -14,8 +14,6 @@
 
 #include "controller.h"
 
-#include <QUrl>
-
 #include <KLocalizedString>
 
 using namespace Quotient;
@@ -158,8 +156,8 @@ void Login::login()
 
     // Some servers do not have a .well_known file. So we login via the username part from the mxid,
     // rather than with the full mxid, as that would lead to an invalid user.
-    QStringRef username(&m_matrixId, 1, m_matrixId.indexOf(":") - 1);
-    m_connection->loginWithPassword(username.toString(), m_password, m_deviceName, QString());
+    auto username = m_matrixId.mid(1, m_matrixId.indexOf(":") - 1);
+    m_connection->loginWithPassword(username, m_password, m_deviceName, QString());
 }
 
 bool Login::supportsPassword() const

src/main.cpp

@@ -59,6 +59,7 @@
 #include "neochatroom.h"
 #include "neochatuser.h"
 #include "notificationsmanager.h"
+#include "searchmodel.h"
 #ifdef QUOTIENT_07
 #include "pollhandler.h"
 #endif
@@ -228,6 +229,7 @@ int main(int argc, char *argv[])
     qmlRegisterType<LinkPreviewer>("org.kde.neochat", 1, 0, "LinkPreviewer");
     qmlRegisterType<CompletionModel>("org.kde.neochat", 1, 0, "CompletionModel");
     qmlRegisterType<StateModel>("org.kde.neochat", 1, 0, "StateModel");
+    qmlRegisterType<SearchModel>("org.kde.neochat", 1, 0, "SearchModel");
 #ifdef QUOTIENT_07
     qmlRegisterType<PollHandler>("org.kde.neochat", 1, 0, "PollHandler");
 #endif
@@ -265,6 +267,32 @@ int main(int argc, char *argv[])
 #endif
 
     QQmlApplicationEngine engine;
+
+#ifdef HAVE_KDBUSADDONS
+    KDBusService service(KDBusService::Unique);
+    service.connect(&service,
+                    &KDBusService::activateRequested,
+                    &RoomManager::instance(),
+                    [&engine](const QStringList &arguments, const QString &workingDirectory) {
+                        Q_UNUSED(workingDirectory);
+
+                        QWindow *window = windowFromEngine(&engine);
+                        KWindowSystem::updateStartupId(window);
+
+                        WindowController::instance().showAndRaiseWindow(QString());
+
+                        // Open matrix uri
+                        if (arguments.isEmpty()) {
+                            return;
+                        }
+                        auto args = arguments;
+                        args.removeFirst();
+                        for (const auto &arg : args) {
+                            RoomManager::instance().openResource(arg);
+                        }
+                    });
+#endif
+
     engine.rootContext()->setContextObject(new KLocalizedContext(&engine));
     QObject::connect(&engine, &QQmlApplicationEngine::quit, &app, &QCoreApplication::quit);
     engine.setNetworkAccessManagerFactory(new NetworkAccessManagerFactory());
@@ -294,31 +322,6 @@ int main(int argc, char *argv[])
     QDBusConnection::sessionBus().registerObject("/RoomRunner", &runner, QDBusConnection::ExportScriptableContents);
 #endif
 
-#ifdef HAVE_KDBUSADDONS
-    KDBusService service(KDBusService::Unique);
-    service.connect(&service,
-                    &KDBusService::activateRequested,
-                    &RoomManager::instance(),
-                    [&engine](const QStringList &arguments, const QString &workingDirectory) {
-                        Q_UNUSED(workingDirectory);
-
-                        QWindow *window = windowFromEngine(&engine);
-                        KWindowSystem::updateStartupId(window);
-
-                        WindowController::instance().showAndRaiseWindow(QString());
-
-                        // Open matrix uri
-                        if (arguments.isEmpty()) {
-                            return;
-                        }
-                        auto args = arguments;
-                        args.removeFirst();
-                        for (const auto &arg : args) {
-                            RoomManager::instance().openResource(arg);
-                        }
-                    });
-#endif
-
     QWindow *window = windowFromEngine(&engine);
 
     WindowController::instance().setWindow(window);

src/messageeventmodel.cpp

@@ -66,6 +66,7 @@ QHash<int, QByteArray> MessageEventModel::roleNames() const
     roles[AuthorDisplayNameRole] = "authorDisplayName";
     roles[IsNameChangeRole] = "isNameChange";
     roles[IsAvatarChangeRole] = "isAvatarChange";
+    roles[IsRedactedRole] = "isRedacted";
     return roles;
 }
 
@@ -894,6 +895,9 @@ QVariant MessageEventModel::data(const QModelIndex &idx, int role) const
         }
         return false;
     }
+    if (role == IsRedactedRole) {
+        return evt.isRedacted();
+    }
 
     return {};
 }

src/messageeventmodel.h

@@ -71,6 +71,7 @@ public:
         AuthorDisplayNameRole,
         IsNameChangeRole,
         IsAvatarChangeRole,
+        IsRedactedRole,
         LastRole, // Keep this last
     };
     Q_ENUM(EventRoles)

src/messagefiltermodel.cpp

@@ -25,6 +25,10 @@ MessageFilterModel::MessageFilterModel(QObject *parent)
         beginResetModel();
         endResetModel();
     });
+    connect(NeoChatConfig::self(), &NeoChatConfig::ShowDeletedMessagesChanged, this, [this] {
+        beginResetModel();
+        endResetModel();
+    });
 }
 
 bool MessageFilterModel::filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const
@@ -39,12 +43,15 @@ bool MessageFilterModel::filterAcceptsRow(int sourceRow, const QModelIndex &sour
     if (index.data(MessageEventModel::IsAvatarChangeRole).toBool() && !NeoChatConfig::self()->showAvatarUpdate()) {
         return false;
     }
+    if (index.data(MessageEventModel::IsRedactedRole).toBool() && !NeoChatConfig::self()->showDeletedMessages()) {
+        return false;
+    }
 
     if (specialMarks == EventStatus::Hidden || specialMarks == EventStatus::Replaced) {
         return false;
     }
 
-    const QString eventType = index.data(MessageEventModel::EventTypeRole).toString();
+    const auto eventType = index.data(MessageEventModel::EventTypeRole).toInt();
 
     if (eventType == MessageEventModel::Other) {
         return false;

src/neochat.notifyrc

@@ -27,6 +27,7 @@ Name[pl]=NeoChat
 Name[pt]=NeoChat
 Name[pt_BR]=NeoChat
 Name[ro]=NeoChat
+Name[ru]=NeoChat
 Name[sk]=NeoChat
 Name[sl]=NeoChat
 Name[sv]=NeoChat
@@ -63,6 +64,7 @@ Comment[pl]=Program do obsługi matriksa, rozproszonego protokołu porozumiewani
 Comment[pt]=Um cliente para o Matrix, o protocolo descentralizado de comunicações
 Comment[pt_BR]=Um cliente para o Matrix, o protocolo de comunicação decentralizado
 Comment[ro]=Client pentru Matrix, protocolul de comunicare descentralizată
+Comment[ru]=Клиент для Matrix — децентрализованного коммуникационного протокола
 Comment[sk]=Klient pre matrix, decentralizovaný komunikačný protokol
 Comment[sl]=Odjemalec za decentralizirani komunikacijski protokol matrix
 Comment[sv]=En klient för matrix, det decentraliserade kommunikationsprotokollet
@@ -100,6 +102,7 @@ Name[pl]=Nowa wiadomość
 Name[pt]=Nova mensagem
 Name[pt_BR]=Nova mensagem
 Name[ro]=Mesaj nou
+Name[ru]=Новое сообщение
 Name[sk]=Nová správa
 Name[sl]=Novo sporočilo
 Name[sv]=Nytt meddelande
@@ -134,6 +137,7 @@ Comment[pl]=Dostępna jest nowa wiadomość
 Comment[pt]=Tem uma mensagem nova
 Comment[pt_BR]=Existe uma nova mensagem
 Comment[ro]=Este un mesaj nou
+Comment[ru]=Доступно новое сообщение
 Comment[sk]=Je nová správa
 Comment[sl]=Prišlo je novo sporočilo
 Comment[sv]=Det finns ett nytt meddelande
@@ -168,6 +172,7 @@ Name[pa]=ਨਵਾਂ ਸੱਦਾ
 Name[pl]=Nowe zaproszenie
 Name[pt]=Novo Convite
 Name[pt_BR]=Novo convite
+Name[ru]=Новое приглашение
 Name[sl]=Novo povabilo
 Name[sv]=Ny inbjudan
 Name[ta]=புதிய அழைப்பிதழ்
@@ -197,6 +202,7 @@ Comment[pa]=ਰੂਮ ਲਈ ਨਵਾਂ ਸੱਦਾ ਹੈ
 Comment[pl]=Dostępna jest nowe zaproszenie do pokoju
 Comment[pt]=Existe um novo convite para uma sala
 Comment[pt_BR]=Existe um novo convite para uma sala
+Comment[ru]=Доступно новое приглашение в комнату
 Comment[sl]=Tam je novo povabilo v sobo
 Comment[sv]=Det finns en ny inbjudan till ett rum
 Comment[ta]=ஓர் அரங்கிற்கான புதிய அழைப்பிதழ் உள்ளது

src/neochatconfig.kcfg

@@ -62,6 +62,9 @@
       <label>Enable developer tools</label>
       <default>false</default>
     </entry>
+    <entry name="LastSaveDirectory" type="String">
+      <label>Directory last used for saving a file</label>
+    </entry>
   </group>
   <group name="Timeline">
     <entry name="ShowAvatarInTimeline" type="bool">
@@ -80,6 +83,10 @@
       <label>Show avatar update events in the timeline</label>
       <default>true</default>
     </entry>
+    <entry name="ShowDeletedMessages" type="bool">
+      <label>Show deleted messages in the timeline</label>
+      <default>true</default>
+    </entry>
     <entry name="ShowLinkPreview" type="bool">
       <label>Show preview of the links in the chat messages</label>
     </entry>
@@ -126,6 +133,14 @@
       <label>The port number of the proxy</label>
       <default>1080</default>
     </entry>
+    <entry name="ProxyUser" type="String">
+      <label>The user of the proxy</label>
+      <default></default>
+    </entry>
+    <entry name="ProxyPassword" type="Password">
+      <label>The password of the proxy</label>
+      <default></default>
+    </entry>
   </group>
 </kcfg>
 

src/neochatroom.cpp

@@ -14,9 +14,9 @@
 #include <QMediaPlayer>
 
 #include <qcoro/qcorosignal.h>
-#include <qcoro/task.h>
 
 #include <connection.h>
+#include <csapi/directory.h>
 #include <csapi/pushrules.h>
 #include <csapi/redaction.h>
 #include <csapi/report_content.h>
@@ -108,7 +108,8 @@ QCoro::Task<void> NeoChatRoom::doUploadFile(QUrl url, QString body)
     }
 
     auto mime = QMimeDatabase().mimeTypeForUrl(url);
-    QFileInfo fileInfo(url.toLocalFile());
+    url.setScheme("file");
+    QFileInfo fileInfo(url.isLocalFile() ? url.toLocalFile() : url.toString());
     EventContent::TypedBase *content;
     if (mime.name().startsWith("image/")) {
         QImage image(url.toLocalFile());
@@ -328,7 +329,7 @@ QString NeoChatRoom::subtitleText()
 {
     static const QRegularExpression blockquote("(\r\n\t|\n|\r\t|)> ");
     static const QRegularExpression heading("(\r\n\t|\n|\r\t|)\\#{1,6} ");
-    static const QRegularExpression newlines("(\r\n\t|\n|\r\t)");
+    static const QRegularExpression newlines("(\r\n\t|\n|\r\t|\r\n)");
     static const QRegularExpression bold1("(\\*\\*|__)(?=\\S)([^\\r]*\\S)\\1");
     static const QRegularExpression bold2("(\\*|_)(?=\\S)([^\\r]*\\S)\\1");
     static const QRegularExpression strike1("~~(.*)~~");
@@ -473,13 +474,6 @@ QString NeoChatRoom::eventToString(const RoomEvent &evt, Qt::TextFormat format,
                 auto base = url.scheme() + QStringLiteral("://") + url.host() + (url.port() != -1 ? ':' + QString::number(url.port()) : QString());
                 htmlBody.replace(utils::mxcImageRegExp, QStringLiteral(R"(<img \1 src="%1/_matrix/media/r0/download/\2/\3" \4 > )").arg(base));
 
-                if (e.msgtype() == MessageEventType::Emote) {
-                    auto author = static_cast<NeoChatUser *>(user(e.senderId()));
-                    int firstPara = htmlBody.indexOf("<p>");
-                    htmlBody.insert(firstPara == -1 ? 0 : firstPara + 3,
-                                    "* <a href='https://matrix.to/#/" + author->id() + "' style='color: " + author->color().name() + "'>"
-                                        + author->displayname(this) + "</a> ");
-                }
                 return htmlBody;
             }
 
@@ -501,18 +495,14 @@ QString NeoChatRoom::eventToString(const RoomEvent &evt, Qt::TextFormat format,
                 plainBody = e.plainBody();
             }
 
-            if (removeReply) {
-                plainBody = plainBody.remove(utils::removeReplyRegex);
-            }
             if (prettyPrint) {
-                plainBody = Quotient::prettyPrint(plainBody);
+                if (removeReply) {
+                    plainBody.remove(utils::removeReplyRegex);
+                }
+                return Quotient::prettyPrint(plainBody);
             }
-            if (e.msgtype() == MessageEventType::Emote) {
-                auto author = static_cast<NeoChatUser *>(user(e.senderId()));
-                plainBody.remove("/me");
-                plainBody.insert(0,
-                                 "* <a href='https://matrix.to/#/" + author->id() + "' style='color: " + author->color().name() + "'>"
-                                     + author->displayname(this) + "</a> ");
+            if (removeReply) {
+                return plainBody.remove(utils::removeReplyRegex);
             }
             return plainBody;
         },
@@ -1335,3 +1325,46 @@ void NeoChatRoom::download(const QString &eventId, const QUrl &localFilename)
     job->start();
 #endif
 }
+
+void NeoChatRoom::mapAlias(const QString &alias)
+{
+    auto getLocalAliasesJob = connection()->callApi<GetLocalAliasesJob>(id());
+    connect(getLocalAliasesJob, &BaseJob::success, this, [this, getLocalAliasesJob, alias] {
+        if (getLocalAliasesJob->aliases().contains(alias)) {
+            return;
+        } else {
+            auto setRoomAliasJob = connection()->callApi<SetRoomAliasJob>(alias, id());
+            connect(setRoomAliasJob, &BaseJob::success, this, [this, alias] {
+                auto newAltAliases = altAliases();
+                newAltAliases.append(alias);
+                setLocalAliases(newAltAliases);
+            });
+        }
+    });
+}
+
+void NeoChatRoom::unmapAlias(const QString &alias)
+{
+    connection()->callApi<DeleteRoomAliasJob>(alias);
+}
+
+void NeoChatRoom::setCanonicalAlias(const QString &newAlias)
+{
+    QString oldCanonicalAlias = canonicalAlias();
+    Room::setCanonicalAlias(newAlias);
+
+    connect(this, &Room::namesChanged, this, [this, newAlias, oldCanonicalAlias] {
+        if (canonicalAlias() == newAlias) {
+            // If the new canonical alias is already a published alt alias remove it otherwise it will be in both lists.
+            // The server doesn't prevent this so we need to handle it.
+            auto newAltAliases = altAliases();
+            if (!oldCanonicalAlias.isEmpty()) {
+                newAltAliases.append(oldCanonicalAlias);
+            }
+            if (newAltAliases.contains(newAlias)) {
+                newAltAliases.removeAll(newAlias);
+                Room::setLocalAliases(newAltAliases);
+            }
+        }
+    });
+}

src/neochatroom.h

@@ -3,6 +3,7 @@
 
 #pragma once
 
+#include <qobjectdefs.h>
 #include <room.h>
 
 #include <QCache>
@@ -201,6 +202,16 @@ public:
 
     Q_INVOKABLE bool downloadTempFile(const QString &eventId);
 
+    /*
+     * Map an alias to the room
+     *
+     * Note: this is different to setLocalAliases as that can only
+     * get the room to publish and alias that is already mapped.
+     */
+    Q_INVOKABLE void mapAlias(const QString &alias);
+    Q_INVOKABLE void unmapAlias(const QString &alias);
+    Q_INVOKABLE void setCanonicalAlias(const QString &newAlias);
+
 #ifdef QUOTIENT_07
     Q_INVOKABLE PollHandler *poll(const QString &eventId);
 #endif

src/notificationsmanager.cpp

@@ -5,7 +5,6 @@
 
 #include <memory>
 
-#include <QImage>
 #include <QJsonArray>
 
 #include <KLocalizedString>

src/plasma-runner-neochat.desktop

@@ -28,6 +28,7 @@ Name[pl]=NeoChat
 Name[pt]=NeoChat
 Name[pt_BR]=NeoChat
 Name[ro]=NeoChat
+Name[ru]=NeoChat
 Name[sk]=NeoChat
 Name[sl]=NeoChat
 Name[sv]=NeoChat
@@ -56,6 +57,7 @@ Comment[nl]=Rooms zoeken in NeoChat
 Comment[pl]=Znajdź pokoje w NeoChat
 Comment[pt]=Procurar salas no NeoChat
 Comment[pt_BR]=Encontrar salas no NeoChat
+Comment[ru]=Поиск комнаты NeoChat
 Comment[sl]=Najdi sobe v NeoChatu
 Comment[sv]=Sök efter rum i NeoChat
 Comment[ta]=நியோச்சாட்டில் அரங்குகளை கண்டுபிடிக்கும்

src/qml/Component/ChatBox/ChatBar.qml

@@ -14,10 +14,8 @@ QQC2.ToolBar {
     id: chatBar
     property alias inputFieldText: inputField.text
     property alias textField: inputField
-    property alias emojiPaneOpened: emojiButton.checked
     property alias cursorPosition: inputField.cursorPosition
 
-    signal closeAllTriggered()
     signal inputFieldForceActiveFocusTriggered()
     signal messageSent()
 
@@ -137,6 +135,9 @@ QQC2.ToolBar {
                         completionMenu.decrementIndex()
                     } else if (event.key === Qt.Key_Down && completionMenu.visible) {
                         completionMenu.incrementIndex()
+                    } else if (event.key === Qt.Key_Backspace && inputField.text.length <= 1) {
+                        currentRoom.sendTypingNotification(false)
+                        repeatTimer.stop()
                     }
                 }
 
@@ -147,10 +148,10 @@ QQC2.ToolBar {
 
                 onTextChanged: {
                     if (!repeatTimer.running && Config.typingNotifications) {
-                        currentRoom.sendTypingNotification(true)
+                        var textExists = text.length > 0
+                        currentRoom.sendTypingNotification(textExists)
+                        textExists ? repeatTimer.start() : repeatTimer.stop()
                     }
-                    repeatTimer.start()
-
                     currentRoom.chatBoxText = text
                 }
             }
@@ -202,6 +203,14 @@ QQC2.ToolBar {
             display: QQC2.AbstractButton.IconOnly
             checkable: true
 
+            onClicked: {
+                if (emojiDialog.visible) {
+                    emojiDialog.close()
+                } else {
+                    emojiDialog.open()
+                }
+            }
+
             QQC2.ToolTip.text: text
             QQC2.ToolTip.visible: hovered
         }
@@ -221,6 +230,19 @@ QQC2.ToolBar {
         }
     }
 
+    EmojiDialog {
+        id: emojiDialog
+        x: parent.width - implicitWidth
+        y: -implicitHeight - Kirigami.Units.smallSpacing
+
+        modal: false
+        includeCustom: true
+        closeOnChosen: false
+
+        onChosen: insertText(emoji)
+        onClosed: if (emojiButton.checked) emojiButton.checked = false
+    }
+
     CompletionMenu {
         id: completionMenu
         height: implicitHeight
@@ -267,7 +289,7 @@ QQC2.ToolBar {
 
     function postMessage() {
         actionsHandler.handleMessage();
-
+        repeatTimer.stop()
         currentRoom.markAllMessagesAsRead();
         inputField.clear();
         currentRoom.chatBoxReplyId = "";

src/qml/Component/ChatBox/ChatBox.qml

@@ -46,32 +46,6 @@ ColumnLayout {
         }
     }
 
-    Kirigami.Separator {
-        id: emojiPickerLoaderSeparator
-        visible: emojiPickerLoader.visible
-        Layout.fillWidth: true
-        height: visible ? implicitHeight : 0
-    }
-
-    Loader {
-        id: emojiPickerLoader
-        active: visible
-        visible: chatBar.emojiPaneOpened
-        Layout.fillWidth: true
-        sourceComponent: QQC2.Pane {
-            topPadding: 0
-            bottomPadding: 0
-            rightPadding: 0
-            leftPadding: 0
-            Kirigami.Theme.colorSet: Kirigami.Theme.View
-            contentItem: EmojiPicker {
-                textArea: chatBar.textField
-                onChosen: insertText(emoji)
-            }
-        }
-
-    }
-
     Kirigami.Separator {
         id: replySeparator
         visible: replyPane.visible
@@ -113,9 +87,7 @@ ColumnLayout {
 
         Layout.fillWidth: true
 
-        onCloseAllTriggered: closeAll()
         onMessageSent: {
-            closeAll()
             chatBox.messageSent();
         }
 
@@ -137,9 +109,4 @@ ColumnLayout {
     function focusInputField() {
         chatBar.inputFieldForceActiveFocusTriggered()
     }
-
-    function closeAll() {
-        // TODO clear();
-        chatBar.emojiPaneOpened = false;
-    }
 }

src/qml/Component/Emoji/EmojiDelegate.qml

@@ -0,0 +1,59 @@
+// SPDX-FileCopyrightText: 2022 Tobias Fella <fella@posteo.de>
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+import QtQuick 2.15
+import QtQuick.Controls 2.15 as QQC2
+import org.kde.kirigami 2.20 as Kirigami
+
+QQC2.ItemDelegate {
+    id: emojiDelegate
+
+    property string name
+    property string emoji
+    property bool showTones: false
+
+    QQC2.ToolTip.text: emojiDelegate.name
+    QQC2.ToolTip.visible: hovered && emojiDelegate.name !== ""
+    QQC2.ToolTip.delay: Kirigami.Units.toolTipDelay
+    leftInset: Kirigami.Units.smallSpacing
+    topInset: Kirigami.Units.smallSpacing
+    rightInset: Kirigami.Units.smallSpacing
+    bottomInset: Kirigami.Units.smallSpacing
+
+    contentItem: Item {
+        Kirigami.Heading {
+            anchors.fill: parent
+            visible: !emojiDelegate.emoji.startsWith("image")
+            text: emojiDelegate.emoji
+            horizontalAlignment: Text.AlignHCenter
+            verticalAlignment: Text.AlignVCenter
+            font.family: "emoji"
+
+            Kirigami.Icon {
+                width: Kirigami.Units.gridUnit * 0.5
+                height: Kirigami.Units.gridUnit * 0.5
+                source: "arrow-down"
+                anchors.bottom: parent.bottom
+                anchors.right: parent.right
+                visible: emojiDelegate.showTones
+            }
+        }
+        Image {
+            anchors.fill: parent
+            visible: emojiDelegate.emoji.startsWith("image")
+            source: visible ? emojiDelegate.emoji : ""
+        }
+    }
+
+    background: Rectangle {
+        color: emojiDelegate.checked ? Kirigami.Theme.highlightColor : Kirigami.Theme.backgroundColor
+        radius: Kirigami.Units.smallSpacing
+
+        Rectangle {
+            radius: Kirigami.Units.smallSpacing
+            anchors.fill: parent
+            color: Kirigami.Theme.highlightColor
+            opacity: emojiDelegate.hovered && !emojiDelegate.pressed ? 0.2 : 0
+        }
+    }
+}

src/qml/Component/Emoji/EmojiGrid.qml

@@ -0,0 +1,87 @@
+// SPDX-FileCopyrightText: 2022 Tobias Fella
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+import QtQuick 2.15
+import QtQuick.Controls 2.15 as QQC2
+import org.kde.kirigami 2.20 as Kirigami
+import org.kde.neochat 1.0
+
+QQC2.ScrollView {
+    id: emojiGrid
+
+    property alias model: emojis.model
+    property alias count: emojis.count
+    required property int targetIconSize
+    readonly property int emojisPerRow: emojis.width / targetIconSize
+    required property bool withCustom
+    readonly property var searchCategory: withCustom ? EmojiModel.Search : EmojiModel.SearchNoCustom
+    required property QtObject header
+
+    signal chosen(string unicode)
+
+    onActiveFocusChanged: if (activeFocus) {
+        emojis.forceActiveFocus()
+    }
+
+    GridView {
+        id: emojis
+
+        anchors.fill: parent
+        anchors.rightMargin: parent.QQC2.ScrollBar.vertical.visible ? parent.QQC2.ScrollBar.vertical.width : 0
+
+        currentIndex: -1
+        keyNavigationEnabled: true
+        onActiveFocusChanged: if (activeFocus && currentIndex === -1) {
+            currentIndex = 0
+        } else {
+            currentIndex = -1
+        }
+        onModelChanged: currentIndex = -1
+
+        cellWidth: emojis.width / emojiGrid.emojisPerRow
+        cellHeight: emojiGrid.targetIconSize
+
+        KeyNavigation.up: emojiGrid.header
+
+        clip: true
+
+        delegate: EmojiDelegate {
+            id: emojiDelegate
+            checked: emojis.currentIndex === model.index
+            emoji: modelData.unicode
+            name: modelData.shortName
+
+            width: emojis.cellWidth
+            height: emojis.cellHeight
+
+            Keys.onEnterPressed: clicked()
+            Keys.onReturnPressed: clicked()
+            onClicked: {
+                emojiGrid.chosen(modelData.isCustom ? modelData.shortName : modelData.unicode)
+                EmojiModel.emojiUsed(modelData)
+            }
+            Keys.onSpacePressed: pressAndHold()
+            onPressAndHold: {
+                if (EmojiModel.tones(modelData.shortName).length === 0) {
+                    return;
+                }
+                let tones = tonesPopupComponent.createObject(emojiDelegate, {shortName: modelData.shortName, unicode: modelData.unicode, categoryIconSize: emojiGrid.targetIconSize})
+                tones.open()
+                tones.forceActiveFocus()
+            }
+            showTones: EmojiModel.tones(modelData.shortName).length > 0
+        }
+
+        Kirigami.PlaceholderMessage {
+            anchors.centerIn: parent
+            text: i18n("No emojis")
+            visible: emojis.count === 0
+        }
+    }
+    Component {
+        id: tonesPopupComponent
+        EmojiTonesPicker {
+            onChosen: emojiGrid.chosen(emoji)
+        }
+    }
+}

src/qml/Component/Emoji/EmojiPicker.qml

@@ -1,19 +1,29 @@
-// SPDX-FileCopyrightText: 2018-2019 Black Hat <bhat@encom.eu.org>
-// SPDX-License-Identifier: GPL-3.0-only
+// SPDX-FileCopyrightText: 2022 Tobias Fella <fella@posteo.de>
+// SPDX-License-Identifier: GPL-2.0-or-later
 
 import QtQuick 2.15
 import QtQuick.Controls 2.15 as QQC2
 import QtQuick.Layouts 1.15
 import org.kde.kirigami 2.15 as Kirigami
-
 import org.kde.neochat 1.0
 
 ColumnLayout {
-    id: _picker
+    id: root
 
-    property var emojiCategory: EmojiModel.History
-    property var textArea
-    readonly property var emojiModel: EmojiModel
+    property bool includeCustom: false
+    property bool showQuickReaction: false
+
+    readonly property var currentEmojiModel: {
+        if (includeCustom) {
+            EmojiModel.categoriesWithCustom
+        } else {
+            EmojiModel.categories
+        }
+    }
+
+    readonly property int categoryIconSize: Math.round(Kirigami.Units.gridUnit * 2.5)
+    readonly property var currentCategory: currentEmojiModel[categories.currentIndex].category
+    readonly property alias categoryCount: categories.count
 
     signal chosen(string emoji)
 
@@ -21,43 +31,40 @@ ColumnLayout {
 
     QQC2.ScrollView {
         Layout.fillWidth: true
-        Layout.preferredHeight: Kirigami.Units.gridUnit * 2 + QQC2.ScrollBar.horizontal.height + 2 // for the focus line
+        Layout.preferredHeight: root.categoryIconSize + QQC2.ScrollBar.horizontal.height
         QQC2.ScrollBar.horizontal.height: QQC2.ScrollBar.horizontal.visible ? QQC2.ScrollBar.horizontal.implicitHeight : 0
 
         ListView {
+            id: categories
             clip: true
+            focus: true
             orientation: ListView.Horizontal
 
-            model: EmojiModel.categories
-            delegate: QQC2.ItemDelegate {
-                id: del
+            Keys.onReturnPressed: if (emojiGrid.count > 0) emojiGrid.focus = true
+            Keys.onEnterPressed: if (emojiGrid.count > 0) emojiGrid.focus = true
+            KeyNavigation.down: emojiGrid.count > 0 ? emojiGrid : categories
+            KeyNavigation.tab: emojiGrid.count > 0 ? emojiGrid : categories
 
-                width: contentItem.Layout.preferredWidth
-                height: Kirigami.Units.gridUnit * 2
+            keyNavigationEnabled: true
+            keyNavigationWraps: true
+            Keys.forwardTo: searchField
+            interactive: width !== contentWidth
 
-                contentItem: Kirigami.Heading {
-                    horizontalAlignment: Text.AlignHCenter
-                    verticalAlignment: Text.AlignVCenter
-                    level: modelData.category === EmojiModel.Custom ? 4 : 1
+            model: root.currentEmojiModel
+            Component.onCompleted: categories.forceActiveFocus()
 
-                    Layout.preferredWidth: modelData.category === EmojiModel.Custom ? implicitWidth + Kirigami.Units.largeSpacing : Kirigami.Units.gridUnit * 2
+            delegate: EmojiDelegate {
+                width: root.categoryIconSize
+                height: width
 
-                    font.family: modelData.category === EmojiModel.Custom ? Kirigami.Theme.defaultFont.family : 'emoji'
-                    text: modelData.category === EmojiModel.Custom ? i18n("Custom") : modelData.emoji
+                checked: categories.currentIndex === model.index
+                emoji: modelData.emoji
+                name: modelData.name
+
+                onClicked: {
+                    categories.currentIndex = index
+                    categories.focus = true
                 }
-
-                Rectangle {
-                    anchors.bottom: parent.bottom
-
-                    width: parent.width
-                    height: 2
-
-                    visible: _picker.emojiCategory === modelData.category
-
-                    color: Kirigami.Theme.focusColor
-                }
-
-                onClicked: _picker.emojiCategory = modelData.category
             }
         }
     }
@@ -67,57 +74,52 @@ ColumnLayout {
         Layout.preferredHeight: 1
     }
 
-   QQC2.ScrollView {
+    Kirigami.SearchField {
+        id: searchField
+        Layout.margins: Kirigami.Units.smallSpacing
+        Layout.fillWidth: true
+    }
+
+    EmojiGrid {
+        id: emojiGrid
+        targetIconSize: root.currentCategory === EmojiModel.Custom ? Kirigami.Units.gridUnit * 3 : root.categoryIconSize  // Custom emojis are bigger
+        model: searchField.text.length === 0 ? EmojiModel.emojis(root.currentCategory) : (root.includeCustom ? EmojiModel.filterModel(searchField.text, false) : EmojiModel.filterModelNoCustom(searchField.text, false))
         Layout.fillWidth: true
-        Layout.preferredHeight: Kirigami.Units.gridUnit * 8
         Layout.fillHeight: true
+        withCustom: root.includeCustom
+        onChosen: root.chosen(unicode)
+        header: categories
+        Keys.forwardTo: searchField
+    }
 
-        GridView {
-            cellWidth: Kirigami.Units.gridUnit * 2
-            cellHeight: Kirigami.Units.gridUnit * 2
+    Kirigami.Separator {
+        visible: showQuickReaction
+        Layout.fillWidth: true
+        Layout.preferredHeight: 1
+    }
 
-            clip: true
+    QQC2.ScrollView {
+        visible: showQuickReaction
+        Layout.fillWidth: true
+        Layout.preferredHeight: root.categoryIconSize + QQC2.ScrollBar.horizontal.height
+        QQC2.ScrollBar.horizontal.height: QQC2.ScrollBar.horizontal.visible ? QQC2.ScrollBar.horizontal.implicitHeight : 0
 
-            model: _picker.emojiCategory === EmojiModel.Custom ? CustomEmojiModel : EmojiModel.emojis(_picker.emojiCategory)
+        ListView {
+            id: quickReactions
+            Layout.fillWidth: true
 
-            delegate: QQC2.ItemDelegate {
-                width: Kirigami.Units.gridUnit * 2
-                height: Kirigami.Units.gridUnit * 2
+            model: ["👍", "👎", "😄", "🎉", "😕", "❤", "🚀", "👀"]
 
-                contentItem: Kirigami.Heading {
-                    level: 1
-                    horizontalAlignment: Text.AlignHCenter
-                    verticalAlignment: Text.AlignVCenter
-                    font.family: 'emoji'
-                    text: modelData.isCustom ? "" : modelData.unicode
-                }
+            delegate: EmojiDelegate {
+                emoji: modelData
 
-                Image {
-                    visible: modelData.isCustom
-                    source: visible ? modelData.unicode : ""
-                    anchors.fill: parent
-                    anchors.margins: 2
+                height: root.categoryIconSize
+                width: height
 
-                    sourceSize.width: width
-                    sourceSize.height: height
-
-                    Rectangle {
-                        anchors.fill: parent
-                        visible: parent.status === Image.Loading
-                        radius: height/2
-                        gradient: ShimmerGradient { }
-                    }
-                }
-
-                onClicked: {
-                    if (modelData.isCustom) {
-                        chosen(modelData.shortName)
-                    } else {
-                        chosen(modelData.unicode)
-                    }
-                    emojiModel.emojiUsed(modelData)
-                }
+                onClicked: root.chosen(modelData)
             }
+
+            orientation: Qt.Horizontal
         }
     }
 }

src/qml/Component/Emoji/EmojiTonesPicker.qml

@@ -0,0 +1,66 @@
+// SPDX-FileCopyrightText: 2022 Tobias Fella <fella@posteo.de>
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+import QtQuick 2.15
+import QtQuick.Controls 2.15 as QQC2
+import org.kde.kirigami 2.20 as Kirigami
+
+import org.kde.neochat 1.0
+
+QQC2.Popup {
+    id: tones
+
+    signal chosen(string emoji)
+
+    Component.onCompleted: {
+        tonesList.currentIndex = 0;
+        tonesList.forceActiveFocus();
+    }
+
+    required property string shortName
+    required property string unicode
+    required property int categoryIconSize
+    width: tones.categoryIconSize * tonesList.count + 2 * padding
+    height: tones.categoryIconSize + 2 * padding
+    y: -height
+    padding: 2
+    modal: true
+    dim: true
+    onOpened: x = Math.min(parent.mapFromGlobal(QQC2.Overlay.overlay.width - tones.width, 0).x, -(width - parent.width) / 2)
+    background: Kirigami.ShadowedRectangle {
+        color: Kirigami.Theme.backgroundColor
+        radius: Kirigami.Units.smallSpacing
+        shadow.size: Kirigami.Units.smallSpacing
+        shadow.color: Qt.rgba(0.0, 0.0, 0.0, 0.10)
+        border.color: Kirigami.ColorUtils.tintWithAlpha(color, Kirigami.Theme.textColor, 0.15)
+        border.width: 1
+    }
+
+    ListView {
+        id: tonesList
+        width: parent.width
+        height: parent.height
+        orientation: Qt.Horizontal
+        model: EmojiModel.tones(tones.shortName)
+        keyNavigationEnabled: true
+        keyNavigationWraps: true
+
+        delegate: EmojiDelegate {
+            id: emojiDelegate
+            checked: tonesList.currentIndex === model.index
+            emoji: modelData.unicode
+            name: modelData.shortName
+
+            width: tones.categoryIconSize
+            height: width
+
+            Keys.onEnterPressed: clicked()
+            Keys.onReturnPressed: clicked()
+            onClicked: {
+                tones.chosen(modelData.unicode)
+                EmojiModel.emojiUsed(modelData)
+                tones.close()
+            }
+        }
+    }
+}

src/qml/Component/FullScreenImage.qml

@@ -26,8 +26,6 @@ QQC2.Popup {
     padding: 0
     background: null
 
-    Keys.onBackPressed: root.close()
-
     ColumnLayout {
         anchors.fill: parent
         spacing: Kirigami.Units.largeSpacing
@@ -293,8 +291,10 @@ QQC2.Popup {
         id: saveAsDialog
         FileDialog {
             fileMode: FileDialog.SaveFile
-            folder: StandardPaths.writableLocation(StandardPaths.DownloadLocation)
+            folder: Config.lastSaveDirectory.length > 0 ? Config.lastSaveDirectory : StandardPaths.writableLocation(StandardPaths.DownloadLocation)
             onAccepted: {
+                Config.lastSaveDirectory = folder
+                Config.save()
                 if (!currentFile) {
                     return;
                 }

src/qml/Component/Login/Loading.qml

@@ -5,23 +5,15 @@ import QtQuick 2.15
 import QtQuick.Controls 2.15 as QQC2
 import QtQuick.Layouts 1.15
 
-import org.kde.kirigami 2.15 as Kirigami
+import org.kde.kirigami 2.20 as Kirigami
 
 import org.kde.neochat 1.0
 
-Kirigami.PlaceholderMessage {
+Kirigami.LoadingPlaceholder {
     property var showContinueButton: false
     property var showBackButton: false
-    property string title: i18n("Loading…")
-
-    anchors.centerIn: parent
 
     QQC2.Label {
         text: i18n("Please wait. This might take a little while.")
     }
-
-    QQC2.BusyIndicator {
-        Layout.alignment: Qt.AlignHCenter
-        running: false
-    }
 }

src/qml/Component/Timeline/FileDelegate.qml

@@ -159,11 +159,15 @@ TimelineContainer {
 
             FileDialog {
                 fileMode: FileDialog.SaveFile
-                folder: StandardPaths.writableLocation(StandardPaths.DownloadLocation)
-                onAccepted: if (autoOpenFile) {
-                    UrlHelper.copyTo(progressInfo.localPath, file)
-                } else {
-                    currentRoom.download(eventId, file);
+                folder: Config.lastSaveDirectory.length > 0 ? Config.lastSaveDirectory : StandardPaths.writableLocation(StandardPaths.DownloadLocation)
+                onAccepted: {
+                    Config.lastSaveDirectory = folder
+                    Config.save()
+                    if (autoOpenFile) {
+                        UrlHelper.copyTo(progressInfo.localPath, file)
+                    } else {
+                        currentRoom.download(eventId, file);
+                    }
                 }
             }
         }

src/qml/Component/Timeline/ImageDelegate.qml

@@ -31,10 +31,30 @@ TimelineContainer {
     innerObject: AnimatedImage {
         id: img
 
+        property var imageWidth: {
+            if (imageDelegate.info.w > 0) {
+                return imageDelegate.info.w;
+            } else if (sourceSize.width > 0) {
+                return sourceSize.width;
+            } else {
+                return imageDelegate.contentMaxWidth;
+            }
+        }
+        property var imageHeight: {
+            if (imageDelegate.info.h > 0) {
+                return imageDelegate.info.h;
+            } else if (sourceSize.height > 0) {
+                return sourceSize.height;
+            } else {
+                // Default to a 16:9 placeholder
+                return imageDelegate.contentMaxWidth / 16 * 9;
+            }
+        }
+
         Layout.maximumWidth: Math.min(imageDelegate.contentMaxWidth, imageDelegate.maxWidth)
-        Layout.maximumHeight: Math.min(imageDelegate.contentMaxWidth / sourceSize.width * sourceSize.height, imageDelegate.maxWidth / sourceSize.width * sourceSize.height)
-        Layout.preferredWidth: imageDelegate.info.w > 0 ? imageDelegate.info.w : sourceSize.width
-        Layout.preferredHeight: imageDelegate.info.h > 0 ? imageDelegate.info.h : sourceSize.height
+        Layout.maximumHeight: Math.min(imageDelegate.contentMaxWidth / imageWidth * imageHeight, imageDelegate.maxWidth / imageWidth * imageHeight)
+        Layout.preferredWidth: imageWidth
+        Layout.preferredHeight: imageHeight
         source: model.mediaUrl
 
         Image {

src/qml/Component/Timeline/ReplyComponent.qml

@@ -82,12 +82,12 @@ Item {
                 }
             }
         }
-    }
-
-    MouseArea {
-        anchors.fill: parent
-        onClicked: {
-            replyComponent.replyClicked()
+        HoverHandler {
+            cursorShape: Qt.PointingHandCursor
+        }
+        TapHandler {
+            acceptedButtons: Qt.LeftButton
+            onTapped: replyComponent.replyClicked()
         }
     }
 
@@ -97,6 +97,16 @@ Item {
             textMessage: reply.display
             textFormat: Text.RichText
             isReplyLabel: true
+
+            HoverHandler {
+                enabled: !hoveredLink
+                cursorShape: Qt.PointingHandCursor
+            }
+            TapHandler {
+                enabled: !hoveredLink
+                acceptedButtons: Qt.LeftButton
+                onTapped: replyComponent.replyClicked()
+            }
         }
     }
     Component {

src/qml/Component/Timeline/RichLabel.qml

@@ -75,7 +75,7 @@ a{
     background: " + Kirigami.Theme.textColor + ";
 }
 " : "") + "
-</style>" + textMessage + (isEdited && !contentLabel.isReplyLabel ? (" <span style=\"color: " + Kirigami.Theme.disabledTextColor + "\">" + "<span style='font-size: " + Kirigami.Theme.defaultFont.pixelSize +"px'>" + i18n(" (edited)") + "</span>") : "")
+</style>" + (isEmote ? "* <a href='https://matrix.to/#/" + author.id + "' style='color: " + author.color + "'>" + author.displayName + "</a> " : "") + textMessage + (isEdited && !contentLabel.isReplyLabel ? (" <span style=\"color: " + Kirigami.Theme.disabledTextColor + "\">" + "<span style='font-size: " + Kirigami.Theme.defaultFont.pixelSize +"px'>" + i18n(" (edited)") + "</span>") : "")
 
     color: Kirigami.Theme.textColor
     selectedTextColor: Kirigami.Theme.highlightedTextColor

src/qml/Component/Timeline/StateDelegate.qml

@@ -88,6 +88,7 @@ QQC2.Control {
 
                 MouseArea {
                     anchors.fill: parent
+                    cursorShape: Qt.PointingHandCursor
                     onClicked: userDetailDialog.createObject(QQC2.ApplicationWindow.overlay, {room: currentRoom, user: author.object, displayName: author.displayName, avatarMediaId: author.avatarMediaId, avatarUrl: author.avatarUrl}).open()
                 }
             }

src/qml/Component/Timeline/TimelineContainer.qml

@@ -20,7 +20,7 @@ ColumnLayout {
 
     default property alias innerObject : column.children
 
-    property Item hoverComponent: hoverActions
+    property Item hoverComponent: hoverActions ?? null
     property bool isEmote: false
     property bool cardBackground: true
     property bool showUserMessageOnRight: Config.showLocalMessagesOnRight && model.author.isLocalUser && !Config.compactLayout
@@ -106,6 +106,9 @@ ColumnLayout {
 
         // Show hover actions by updating the global hover component to this delegate
         function updateHoverComponent() {
+            if (!hoverComponent) {
+                return;
+            }
             if (hovered && !Kirigami.Settings.isMobile) {
                 hoverComponent.delegate = root
                 hoverComponent.bubble = bubble
@@ -229,10 +232,10 @@ ColumnLayout {
                     QQC2.Label {
                         id: timeLabel
 
-                        text: visible ? time.toLocaleTimeString(Qt.locale(), Locale.ShortFormat) : ""
+                        text: visible ? model.time.toLocaleTimeString(Qt.locale(), Locale.ShortFormat) : ""
                         color: Kirigami.Theme.disabledTextColor
                         QQC2.ToolTip.visible: hoverHandler.hovered
-                        QQC2.ToolTip.text: time.toLocaleString(Qt.locale(), Locale.LongFormat)
+                        QQC2.ToolTip.text: model.time.toLocaleString(Qt.locale(), Locale.LongFormat)
                         QQC2.ToolTip.delay: Kirigami.Units.toolTipDelay
 
                         HoverHandler {
@@ -268,6 +271,7 @@ ColumnLayout {
                     id: bubbleBackground
                     visible: cardBackground && !Config.compactLayout
                     anchors.fill: parent
+                    Kirigami.Theme.colorSet: Kirigami.Theme.View
                     color: {
                         if (model.author.isLocalUser) {
                             return Kirigami.ColorUtils.tintWithAlpha(Kirigami.Theme.backgroundColor, Kirigami.Theme.highlightColor, 0.15)

src/qml/Dialog/EmojiDialog.qml

@@ -9,29 +9,46 @@ import org.kde.kirigami 2.15 as Kirigami
 import org.kde.neochat 1.0
 
 QQC2.Popup {
-    id: root
+    id: emojiPopup
 
-    signal react(string emoji)
+    property bool includeCustom: false
+    property bool closeOnChosen: true
+    property bool showQuickReaction: false
+
+    signal chosen(string emoji)
+
+    Connections {
+        target: RoomManager
+        function onCurrentRoomChanged() {
+            emojiPopup.close()
+        }
+    }
+
+    background: Kirigami.ShadowedRectangle {
+        Kirigami.Theme.colorSet: Kirigami.Theme.View
+        color: Kirigami.Theme.backgroundColor
+        radius: Kirigami.Units.smallSpacing
+        shadow.size: Kirigami.Units.smallSpacing
+        shadow.color: Qt.rgba(0.0, 0.0, 0.0, 0.10)
+        border.color: Kirigami.ColorUtils.tintWithAlpha(color, Kirigami.Theme.textColor, 0.15)
+        border.width: 2
+    }
 
     modal: true
     focus: true
     closePolicy: QQC2.Popup.CloseOnEscape | QQC2.Popup.CloseOnPressOutsideParent
     margins: 0
-    padding: 1
-    implicitWidth: Kirigami.Units.gridUnit * 16
-    implicitHeight: Kirigami.Units.gridUnit * 20
-
-    background: Rectangle {
-        Kirigami.Theme.inherit: false
-        Kirigami.Theme.colorSet: Kirigami.Theme.View
-        color: Kirigami.Theme.backgroundColor
-        border.width: 1
-        border.color: Kirigami.ColorUtils.linearInterpolation(Kirigami.Theme.backgroundColor,
-                                                              Kirigami.Theme.textColor,
-                                                              0.15)
-    }
+    padding: 2
 
+    implicitHeight: Kirigami.Units.gridUnit * 20 + 2 * padding
+    width: Math.min(contentItem.categoryIconSize * contentItem.categoryCount + 2 * padding, QQC2.Overlay.overlay.width)
     contentItem: EmojiPicker {
-        onChosen: react(emoji)
+        height: 400
+        includeCustom: emojiPopup.includeCustom
+        showQuickReaction: emojiPopup.showQuickReaction
+        onChosen: {
+            emojiPopup.chosen(emoji)
+            if (emojiPopup.closeOnChosen) emojiPopup.close()
+        }
     }
 }

src/qml/Dialog/UserDetailDialog.qml

@@ -24,9 +24,10 @@ Kirigami.OverlaySheet {
 
     parent: applicationWindow().overlay
 
-    leftPadding: 0
-    rightPadding: 0
+    leftPadding: Kirigami.Units.smallSpacing
+    rightPadding: Kirigami.Units.smallSpacing
     topPadding: 0
+    bottomPadding: 0
 
     title: i18nc("@title:menu Account detail dialog", "Account detail")
 
@@ -36,8 +37,8 @@ Kirigami.OverlaySheet {
             Layout.fillWidth: true
             Layout.leftMargin: Kirigami.Units.largeSpacing
             Layout.rightMargin: Kirigami.Units.largeSpacing
-            Layout.topMargin: Kirigami.Units.smallSpacing
-            Layout.bottomMargin: Kirigami.Units.smallSpacing
+            Layout.topMargin: Kirigami.Units.largeSpacing
+            Layout.bottomMargin: Kirigami.Units.largeSpacing
             spacing: Kirigami.Units.largeSpacing
 
             Kirigami.Avatar {
@@ -47,16 +48,6 @@ Kirigami.OverlaySheet {
                 name: displayName
                 source: avatarMediaId ? ("image://mxc/" + avatarMediaId) : ""
                 color: user.color
-
-                MouseArea {
-                    anchors.fill: parent
-
-                    onClicked: {
-                        if (avatarMediaId) {
-                            fullScreenImage.createObject(parent, {filename: displayName, source: room.urlToMxcUrl(avatarUrl)}).showFullScreen()
-                        }
-                    }
-                }
             }
 
             ColumnLayout {
@@ -79,7 +70,9 @@ Kirigami.OverlaySheet {
             }
         }
 
-        QQC2.MenuSeparator {}
+        Kirigami.Separator {
+            Layout.fillWidth: true
+        }
 
         Kirigami.BasicListItem {
             visible: user !== room.localUser
@@ -160,10 +153,14 @@ Kirigami.OverlaySheet {
                 }
             }
         }
-        Component {
-            id: fullScreenImage
-
-            FullScreenImage {}
+        Kirigami.BasicListItem {
+            action: Kirigami.Action {
+                text: i18n("Copy link")
+                icon.name: "username-copy"
+                onTriggered: {
+                    Clipboard.saveText("https://matrix.to/#/" + user.id)
+                }
+            }
         }
     }
 

src/qml/Menu/RoomListContextMenu.qml

@@ -113,7 +113,7 @@ Loader {
             QQC2.MenuItem {
                 text: i18n("Room Settings")
                 icon.name: "configure"
-                onTriggered: QQC2.ApplicationWindow.window.pageStack.pushDialogLayer('qrc:/Categories.qml', {room: room})
+                onTriggered: QQC2.ApplicationWindow.window.pageStack.pushDialogLayer('qrc:/Categories.qml', {room: room}, { title: i18n("Room Settings") })
             }
 
             QQC2.MenuSeparator {}
@@ -180,7 +180,7 @@ Loader {
                     QQC2.ToolButton {
                         icon.name: 'settings-configure'
                         onClicked: {
-                            QQC2.ApplicationWindow.window.pageStack.pushDialogLayer('qrc:/Categories.qml', {room: room})
+                            QQC2.ApplicationWindow.window.pageStack.pushDialogLayer('qrc:/Categories.qml', {room: room}, { title: i18n("Room Settings") })
                             drawer.close()
                         }
                     }

src/qml/Menu/SpaceListContextMenu.qml

@@ -32,7 +32,7 @@ Loader {
 
             QQC2.MenuItem {
                 text: i18nc("'Space' is a matrix space", "Space Settings")
-                onTriggered: QQC2.ApplicationWindow.window.pageStack.pushDialogLayer('qrc:/Categories.qml', {room: room})
+                onTriggered: QQC2.ApplicationWindow.window.pageStack.pushDialogLayer('qrc:/Categories.qml', {room: room}, { title: i18n("Space Settings") })
             }
 
             QQC2.MenuSeparator {}
@@ -89,7 +89,7 @@ Loader {
 
                     QQC2.ToolButton {
                         icon.name: 'settings-configure'
-                        onClicked: QQC2.ApplicationWindow.window.pageStack.pushDialogLayer('qrc:/Categories.qml', {room: room})
+                        onClicked: QQC2.ApplicationWindow.window.pageStack.pushDialogLayer('qrc:/Categories.qml', {room: room}, { title: i18n("Space Settings") })
                     }
                 }
                 Kirigami.BasicListItem {

src/qml/Menu/Timeline/FileDelegateContextMenu.qml

@@ -113,11 +113,13 @@ MessageDelegateContextMenu {
         id: saveAsDialog
         FileDialog {
             fileMode: FileDialog.SaveFile
-            folder: StandardPaths.writableLocation(StandardPaths.DownloadLocation)
+            folder: Config.lastSaveDirectory.length > 0 ? Config.lastSaveDirectory : StandardPaths.writableLocation(StandardPaths.DownloadLocation)
             onAccepted: {
                 if (!currentFile) {
                     return;
                 }
+                Config.lastSaveDirectory = folder
+                Config.save()
                 currentRoom.downloadFile(eventId, currentFile)
             }
         }

src/qml/Menu/Timeline/MessageDelegateContextMenu.qml

@@ -76,6 +76,13 @@ Loader {
                     width: Kirigami.Units.gridUnit * 25
                 });
             }
+        },
+        Kirigami.Action {
+            text: i18n("Copy Link")
+            icon.name: "edit-copy"
+            onTriggered: {
+                Clipboard.saveText("https://matrix.to/#/" + currentRoom.id + "/" + loadRoot.eventId)
+            }
         }
     ]
 
@@ -143,6 +150,7 @@ Loader {
                 QQC2.MenuItem {
                     text: i18n("Configure Web Shortcuts...")
                     icon.name: "configure"
+                    visible: !Controller.isFlatpak
                     onTriggered: webshortcutmodel.configureWebShortcuts()
                 }
             }

src/qml/Page/InviteUserPage.qml

@@ -36,7 +36,7 @@ Kirigami.ScrollablePage {
             onAccepted: userDictListModel.search()
         }
 
-        Button {
+        QQC2.Button {
             visible: identifierField.isUserID
 
             text: i18n("Add")

src/qml/Page/RoomListPage.qml

@@ -329,7 +329,7 @@ Kirigami.ScrollablePage {
                     source: avatar ? "image://mxc/" + avatar : ""
                     name: model.name || i18n("No Name")
                     implicitWidth: visible ? height : 0
-                    visible: Config.showAvatarInTimeline
+                    visible: Config.showAvatarInRoomDrawer
                     sourceSize.width: Kirigami.Units.gridUnit + Kirigami.Units.largeSpacing * 2
                     sourceSize.height: Kirigami.Units.gridUnit + Kirigami.Units.largeSpacing * 2
                 }
@@ -361,7 +361,7 @@ Kirigami.ScrollablePage {
                     }
                     QQC2.Button {
                         id: configButton
-                        visible: roomListItem.hovered
+                        visible: roomListItem.hovered && !Kirigami.Settings.isMobile
                         Accessible.name: i18n("Configure room")
 
                         action: Kirigami.Action {
@@ -376,11 +376,13 @@ Kirigami.ScrollablePage {
 
                 function createRoomListContextMenu() {
                     const menu = roomListContextMenu.createObject(page, {room: currentRoom})
-                    configButton.visible = true
-                    configButton.down = true
+                    if (!Kirigami.Settings.isMobile) {
+                        configButton.visible = true
+                        configButton.down = true
+                    }
                     menu.closed.connect(function() {
                         configButton.down = undefined
-                        configButton.visible = Qt.binding(function() { return roomListItem.hovered || Kirigami.Settings.isMobile })
+                        configButton.visible = Qt.binding(function() { return roomListItem.hovered && !Kirigami.Settings.isMobile })
                     })
                     menu.open()
                 }
@@ -390,5 +392,6 @@ Kirigami.ScrollablePage {
 
     footer: UserInfo {
         width: parent.width
+        visible: !page.collapsedMode
     }
 }

src/qml/Page/RoomPage.qml

@@ -260,7 +260,7 @@ Kirigami.ScrollablePage {
 
             maxWidth: messageListView.sectionBannerItem ? messageListView.sectionBannerItem.width - Kirigami.Units.largeSpacing * 2 : 0
             z: 3
-            visible: messageListView.sectionBannerItem && messageListView.sectionBannerItem.ListView.section != ""
+            visible: messageListView.sectionBannerItem != undefined && messageListView.sectionBannerItem.ListView.section != ""
             labelText: messageListView.sectionBannerItem ? messageListView.sectionBannerItem.ListView.section : ""
         }
         footerPositioning: ListView.OverlayHeader
@@ -348,6 +348,7 @@ Kirigami.ScrollablePage {
             visible: currentRoom && currentRoom.hasUnreadMessages && currentRoom.readMarkerLoaded
             action: Kirigami.Action {
                 onTriggered: {
+                    chatBox.focusInputField();
                     messageListView.goToEvent(currentRoom.readMarkerEventId)
                 }
                 icon.name: "go-up"
@@ -360,7 +361,7 @@ Kirigami.ScrollablePage {
         QQC2.RoundButton {
             anchors.right: parent.right
             anchors.bottom: parent.bottom
-            anchors.bottomMargin: Kirigami.Units.largeSpacing + messageListView.headerItem.height
+            anchors.bottomMargin: Kirigami.Units.largeSpacing
             anchors.rightMargin: Kirigami.Units.largeSpacing
             implicitWidth: Kirigami.Units.gridUnit * 2
             implicitHeight: Kirigami.Units.gridUnit * 2
@@ -371,6 +372,7 @@ Kirigami.ScrollablePage {
             visible: !messageListView.atYEnd
             action: Kirigami.Action {
                 onTriggered: {
+                    chatBox.focusInputField();
                     goToLastMessage();
                     currentRoom.markAllMessagesAsRead();
                 }
@@ -519,7 +521,8 @@ Kirigami.ScrollablePage {
                     onClicked: emojiDialog.open();
                     EmojiDialog {
                         id: emojiDialog
-                        onReact: {
+                        showQuickReaction: true
+                        onChosen: {
                             page.currentRoom.toggleReaction(hoverActions.event.eventId, emoji);
                             chatBox.focusInputField();
                         }

src/qml/Page/SearchPage.qml

@@ -0,0 +1,75 @@
+// SPDX-FileCopyrightText: 2022 Tobias Fella <fella@posteo.de>
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+import QtQuick 2.15
+import QtQuick.Controls 2.15 as QQC2
+import QtQuick.Layouts 1.15
+
+import org.kde.kirigami 2.20 as Kirigami
+
+import org.kde.neochat 1.0
+
+Kirigami.ScrollablePage {
+    id: searchPage
+
+    property var currentRoom
+
+    title: i18nc("@action:title", "Search Messages")
+
+    Kirigami.Theme.colorSet: Kirigami.Theme.Window
+
+    SearchModel {
+        id: searchModel
+        connection: Controller.activeConnection
+        searchText: searchField.text
+        room: searchPage.currentRoom
+    }
+
+    header: RowLayout {
+        Kirigami.SearchField {
+            id: searchField
+            Layout.topMargin: Kirigami.Units.smallSpacing
+            Layout.leftMargin: Kirigami.Units.smallSpacing
+            Layout.fillWidth: true
+            Keys.onEnterPressed: searchButton.clicked()
+            Keys.onReturnPressed: searchButton.clicked()
+        }
+        QQC2.Button {
+            id: searchButton
+            Layout.topMargin: Kirigami.Units.smallSpacing
+            Layout.rightMargin: Kirigami.Units.smallSpacing
+            onClicked: searchModel.search()
+            icon.name: "search"
+        }
+    }
+
+    ListView {
+        id: messageListView
+        Layout.fillWidth: true
+        Layout.fillHeight: true
+        spacing: 0
+        verticalLayoutDirection: ListView.BottomToTop
+
+        section.property: "section"
+
+        Kirigami.PlaceholderMessage {
+            anchors.centerIn: parent
+            visible: searchField.text.length === 0 && messageListView.count === 0
+            text: i18n("Enter a text to start searching")
+        }
+
+        Kirigami.PlaceholderMessage {
+            anchors.centerIn: parent
+            visible: searchField.text.length > 0 && messageListView.count === 0 && !searchModel.searching
+            text: i18n("No results found")
+        }
+
+        Kirigami.LoadingPlaceholder {
+            anchors.centerIn: parent
+            visible: searchModel.searching
+        }
+
+        model: searchModel
+        delegate: EventDelegate {}
+    }
+}