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

.kde-ci.yml

@@ -18,7 +18,6 @@ Dependencies:
     'third-party/libquotient': '@latest'
     'third-party/qtkeychain': '@latest'
     'third-party/cmark': '@latest'
-    'third-party/qcoro': '@latest'
 - 'on': ['Windows', 'Linux', 'FreeBSD']
   'require':
     'frameworks/qqc2-desktop-style': '@stable'

autotests/neochatroomtest.cpp

@@ -5,7 +5,9 @@
 #include <QSignalSpy>
 #include <QTest>
 
+#define protected public // please don't hate me
 #include "neochatroom.h"
+#undef protected
 
 #include <connection.h>
 #include <quotient_common.h>
@@ -13,23 +15,12 @@
 
 using namespace Quotient;
 
-class TestRoom : public NeoChatRoom
-{
-public:
-    using NeoChatRoom::NeoChatRoom;
-
-    void update(SyncRoomData &&data, bool fromCache = false)
-    {
-        Room::updateData(std::move(data), fromCache);
-    }
-};
-
 class NeoChatRoomTest : public QObject {
     Q_OBJECT
 
 private:
     Connection *connection = nullptr;
-    TestRoom *room = nullptr;
+    NeoChatRoom *room = nullptr;
 
 private Q_SLOTS:
     void initTestCase();
@@ -40,7 +31,7 @@ private Q_SLOTS:
 void NeoChatRoomTest::initTestCase()
 {
     connection = Connection::makeMockConnection(QStringLiteral("@bob:kde.org"));
-    room = new TestRoom(connection, QStringLiteral("#myroom:kde.org"), JoinState::Join);
+    room = new NeoChatRoom(connection, QStringLiteral("#myroom:kde.org"), JoinState::Join);
 
     auto json = QJsonDocument::fromJson(R"EVENT({
   "account_data": {
@@ -130,7 +121,7 @@ void NeoChatRoomTest::initTestCase()
   }
 })EVENT");
     SyncRoomData roomData(QStringLiteral("@bob:kde.org"), JoinState::Join, json.object());
-    room->update(std::move(roomData));
+    room->updateData(std::move(roomData));
 }
 
 void NeoChatRoomTest::subtitleTextTest()

org.kde.neochat.appdata.xml

@@ -16,7 +16,6 @@
   <name xml:lang="ca-valencia">NeoChat</name>
   <name xml:lang="cs">NeoChat</name>
   <name xml:lang="de">NeoChat</name>
-  <name xml:lang="el">NeoChat</name>
   <name xml:lang="en-GB">NeoChat</name>
   <name xml:lang="es">NeoChat</name>
   <name xml:lang="eu">NeoChat</name>
@@ -51,7 +50,6 @@
   <summary xml:lang="ca-valencia">Un client per a Matrix, el protocol de comunicacions descentralitzat</summary>
   <summary xml:lang="cs">Klient pro decentralizovaný komunikační protokol matrix</summary>
   <summary xml:lang="de">Ein Programm für Matrix, das dezentrale Kommunikationsprotokoll</summary>
-  <summary xml:lang="el">Ένας πελάτης για το Matrix, το αποκεντρωμένο πρωτόκολλο επικοινωνίας</summary>
   <summary xml:lang="en-GB">A client for matrix, the decentralised communication protocol</summary>
   <summary xml:lang="es">Un cliente para Matrix, el protocolo de comunicaciones descentralizado</summary>
   <summary xml:lang="eu">Matrix, deszentralizatutako komunikazio protokolorako bezero bat</summary>
@@ -85,7 +83,6 @@
     <p xml:lang="ca">El NeoChat és un client de Matrix. Permet enviar missatges de text, fitxers de vídeo i d'àudio a la família, col·legues i amics usant el protocol Matrix.</p>
     <p xml:lang="ca-valencia">NeoChat és un client de Matrix. Permet enviar missatges de text, fitxers de vídeo i d'àudio a la família, col·legues i amics utilitzant el protocol Matrix.</p>
     <p xml:lang="de">NeoChat ist ein Matrix-Client. Er ermöglicht Ihnen das Senden von Textnachrichten, Videos und Audiodateien an Ihre Familie, Kollegen und Freunde unter Verwendung des Matrix-Protokolls.</p>
-    <p xml:lang="el">Το NeoChat είναι μια εφαρμογή του Matrix. Σας επιτρέπει να στέλνετε μηνύματα κειμένου, βίντεο και ήχο στην οικογένειά σας, σε συναδέλφους και φίλους με το πρωτόκολλο Matrix.</p>
     <p xml:lang="en-GB">NeoChat is a Matrix client. It allows you to send text messages, videos and audio files to your family, colleagues and friends using the Matrix protocol.</p>
     <p xml:lang="es">NeoChat es un cliente para Matrix. Le permite enviar mensajes de texto, vídeos y archivos de sonido a su familia, compañeros de trabajo y amigos usando el protocolo Matrix.</p>
     <p xml:lang="eu">NeoChat Matrix bezero bat da. Familiari, lankideei eta lagunei testu-mezuak, bideoak eta audio-fitxategiak bidaltzeko aukera ematen du, Matrix protokoloa erabiliz.</p>
@@ -116,7 +113,6 @@
     <p xml:lang="ca">Matrix és un protocol de comunicacions descentralitzat, que retorna el control a l'usuari. Actualment el NeoChat implementa una gran part del protocol amb l'excepció dels xats encriptats i els xats de vídeo.</p>
     <p xml:lang="ca-valencia">Matrix és un protocol de comunicacions descentralitzat, que retorna el control a l'usuari. Actualment NeoChat implementa una gran part del protocol amb l'excepció dels xats encriptats i els xats de vídeo.</p>
     <p xml:lang="de">Matrix ist ein dezentralisiertes Kommunikationsprotokoll, das dem Benutzer wieder die Kontrolle zurückgibt. Derzeit implementiert NeoChat einen großen Teil des Protokolls mit der Ausnahme von verschlüsselten Chats und Video-Chat.</p>
-    <p xml:lang="el">Το Matrix είναι ένα αποκεντρωμένο πρωτόκολλο επικοινωνίας, δίνοντας πίσω στον χρήστη τον έλεγχο. Προς το παρόν το NeoChat υλοποιεί ένα μεγάλο μέρος του πρωτοκόλλου με εξαίρεση τις κρυπτογραφημένες συνομιλίες και τη συνομιλία με βίντεο.</p>
     <p xml:lang="en-GB">Matrix is a decentralised communication protocol, putting the user back in control. Currently NeoChat implements large part of the protocol with the exception of encrypted chats and video chat.</p>
     <p xml:lang="es">Matrix es un protocolo de comunicaciones descentralizado, que devuelve el control al usuario. En la actualidad, NeoChat implementa gran parte del protocolo con la excepción de chats cifrados y chats de vídeo.</p>
     <p xml:lang="eu">Matrix komunikazio-protokolo deszentralizatu bat da, erabiltzaileari kontrola itzultzen diona. Gaur egun, NeoChat-ek protokoloaren zati handi bat inplementatzen du, berriketa zifratuak eta bideo berriketak izan ezik.</p>
@@ -146,8 +142,7 @@
     <p xml:lang="az">Vahid istifadəçi interfeysi ilə təmin olunan NeoChat, həm mobil telefonda həm də kompyuterlərdə işləyir.</p>
     <p xml:lang="ca">El NeoChat funciona en els mòbils i a l'escriptori, proporcionant una experiència d'usuari coherent.</p>
     <p xml:lang="ca-valencia">NeoChat funciona en els mòbils i en l'escriptori, proporcionant una experiència d'usuari coherent.</p>
-    <p xml:lang="de">NeoChat funktioniert sowohl auf Mobilgeräten als auch auf dem PC und bietet ein einheitliches Benutzererlebnis.</p>
-    <p xml:lang="el">Το NeoChat λειτουργεί και στα κινητά και στους υπολογιστές γραφείου παρέχοντας μια αδιάλειπτη εμπειρία χρήσης.</p>
+    <p xml:lang="de">NeoChat funktioniert sowohl auf dem Mobiltelefon als auch auf dem Arbeitsfläche und bietet ein einheitliches Benutzererlebnis. </p>
     <p xml:lang="en-GB">NeoChat works both on mobile and desktop while providing a consistent user experience.</p>
     <p xml:lang="es">NeoChat funciona en móviles y en el escritorio a la vez que proporciona una experiencia de usuario consistente.</p>
     <p xml:lang="eu">NeoChat mugikorretan eta mahaigainean dabil, erabiltzaile esperientzia koherentea eskainiz.</p>
@@ -185,7 +180,6 @@
   <developer_name xml:lang="ca-valencia">La comunitat KDE</developer_name>
   <developer_name xml:lang="cs">Komunita KDE</developer_name>
   <developer_name xml:lang="de">Die KDE-Gemeinschaft</developer_name>
-  <developer_name xml:lang="el">Η Κοινότητα του KDE</developer_name>
   <developer_name xml:lang="en-GB">The KDE Community</developer_name>
   <developer_name xml:lang="es">La comunidad KDE</developer_name>
   <developer_name xml:lang="eu">KDE komunitatea</developer_name>
@@ -216,7 +210,6 @@
   <project_license>GPL-3.0</project_license>
   <custom>
     <value key="KDE::matrix">#neochat:kde.org</value>
-    <value key="KDE::windows_store">https://www.microsoft.com/store/apps/9PNXWVNRC29H</value>
   </custom>
   <launchable type="desktop-id">org.kde.neochat.desktop</launchable>
   <screenshots>

org.kde.neochat.desktop

@@ -9,7 +9,6 @@ Name[ca]=NeoChat
 Name[ca@valencia]=NeoChat
 Name[cs]=NeoChat
 Name[de]=NeoChat
-Name[el]=NeoChat
 Name[en_GB]=NeoChat
 Name[es]=NeoChat
 Name[eu]=NeoChat
@@ -46,7 +45,6 @@ GenericName[ca]=Client de Matrix
 GenericName[ca@valencia]=Client de Matrix
 GenericName[cs]=Klient protokolu Matrix
 GenericName[de]=Matrix-Programm
-GenericName[el]=Εφαρμογή του Matrix
 GenericName[en_GB]=Matrix Client
 GenericName[es]=Cliente para Matrix
 GenericName[eu]=Matrix bezeroa
@@ -82,7 +80,6 @@ Comment[az]=Matrix protokolu üçün müştəri
 Comment[ca]=Client per al protocol Matrix
 Comment[ca@valencia]=Client per al protocol Matrix
 Comment[de]=Programm für das Matrix-Protokoll
-Comment[el]=Πελάτης για το πρωτόκολλο Matrix
 Comment[en_GB]=Client for the Matrix protocol
 Comment[es]=Cliente para el protocolo Matrix
 Comment[eu]=Matrix protokolorako bezeroa

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

@@ -1,122 +0,0 @@
-<?xml version="1.0" ?>
-<!DOCTYPE refentry PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [
-<!ENTITY % Italian "INCLUDE">
-]>
-<!--
-SPDX-FileCopyrightText: 2022 Carl Schwan <carl@carlschwan.eu>
-SPDX-License-Identifier: CC-BY-SA-4.0
--->
-
-<refentry lang="&language;">
-<refentryinfo>
-<title
->Manuale utente di NeoChat</title>
-<author
-><firstname
->Carl</firstname
-><surname
->Schwan</surname
-> <contrib
->Pagina man di NeoChat.</contrib
-> <email
->carl@carlschwan.eu</email
-></author>
-<date
->1/11/2022</date>
-<releaseinfo
->22.09</releaseinfo>
-<productname
->NeoChat</productname>
-</refentryinfo>
-
-<refmeta>
-  <refentrytitle>
-    <command
->neochat</command>
-  </refentrytitle>
-  <manvolnum
->1</manvolnum>
-</refmeta>
-
-<refnamediv>
-  <refname
->neochat</refname>
-  <refpurpose
->Client per l'interazione con il protocollo di messaggistica matrix</refpurpose>
-  </refnamediv>
-  <!-- body begins here -->
-  <refsynopsisdiv id='synopsis'>
-  <cmdsynopsis
-><command
->neochat</command
-> <arg choice="opt"
-><replaceable
->URI</replaceable
-></arg
-> </cmdsynopsis>
-</refsynopsisdiv>
-
-
-<refsect1 id="description">
-  <title
->Descrizione</title>
-  <para
-><command
->neochat</command
-> è un'applicazione di chat per il protocollo Matrix che funziona sia su desktop che su dispositivi mobili. </para>
-</refsect1>
-
-<refsect1 id="options"
-><title
->Opzioni</title>
-<variablelist>
-  <varlistentry>
-  <term
-><option
->URI</option
-></term>
-  <listitem>
-    <para
->L'URI matrix per un utente o una stanza. ad esempio matrix:u/utente:esempio.org e matrix:r/stanza:esempio.org. Questo farà in modo che NeoChat provi ad aprire la stanza o la conversazione specificata. </para>
-  </listitem>
-  </varlistentry>
-</variablelist>
-</refsect1>
-
-<refsect1 id="bug">
-  <title
->Segnalazione bug</title>
-  <para
->Puoi segnalare bug e richiedere funzionalità su <ulink url="https://bugs.kde.org/enter_bug.cgi?product=NeoChat&amp;component=General"
->https://bugs.kde.org/enter_bug.cgi? product=NeoChat&amp;component=General</ulink
-></para>
-</refsect1>
-
-<refsect1>
-  <title
->Vedi anche</title>
-  <simplelist>
-    <member
->Un elenco di domande frequenti su Matrix <ulink url="https://matrix.org/faq/"
->https://matrix.org/faq/</ulink
-> </member>
-    <member
->kf5options(7)</member>
-    <member
->qt5options(7)</member>
-  </simplelist>
-</refsect1>
-
-<refsect1 id="copyright"
-><title
->Copyright</title>
-<para
->Copyright &copy; 2020-2022 Tobias Fella </para>
-<para
->Copyright &copy; 2020-2022 Carl Schwan </para>
-<para
->Licenza: GNU General Public Version 3 o successiva &lt;<ulink url="https://www.gnu.org/licenses/gpl-3.0.html"
->https://www.gnu.org/licenses/gpl-3.0.html</ulink
->&gt;</para>
-</refsect1>
-</refentry>

src/CMakeLists.txt

@@ -20,7 +20,6 @@ add_library(neochat STATIC
     neochatroom.cpp
     neochatuser.cpp
     userlistmodel.cpp
-    userfiltermodel.cpp
     publicroomlistmodel.cpp
     userdirectorylistmodel.cpp
     keywordnotificationrulemodel.cpp
@@ -159,7 +158,7 @@ if(ANDROID)
         "zoom-out"
         "image-rotate-left-symbolic"
         "image-rotate-right-symbolic"
-        "channel-secure-symbolic"
+        "channel-insecure-symbolic"
         "download"
         "smiley"
         "tools-check-spelling"
@@ -170,7 +169,6 @@ if(ANDROID)
         "favorite"
         "window-new"
         "globe"
-        "visibility"
     )
 else()
     target_link_libraries(neochat PUBLIC Qt::Widgets KF5::KIOWidgets)

src/clipboard.cpp

@@ -52,8 +52,8 @@ QString Clipboard::saveImage(QString localPath) const
     }
 
     QDir dir;
-    if (!dir.exists(QFileInfo(url.fileName()).absoluteFilePath())) {
-        dir.mkpath(QFileInfo(url.fileName()).absoluteFilePath());
+    if (!dir.exists(localPath)) {
+        dir.mkpath(localPath);
     }
 
     image.save(url.toLocalFile());

src/login.cpp

@@ -181,8 +181,8 @@ void Login::loginWithSso()
     connectSingleShot(m_connection, &Connection::loginFlowsChanged, this, [this]() {
         SsoSession *session = m_connection->prepareForSso(m_deviceName);
         m_ssoUrl = session->ssoUrl();
-        Q_EMIT ssoUrlChanged();
     });
+    Q_EMIT ssoUrlChanged();
 }
 
 bool Login::testing() const

src/main.cpp

@@ -72,7 +72,6 @@
 #include "spacehierarchycache.h"
 #include "urlhelper.h"
 #include "userdirectorylistmodel.h"
-#include "userfiltermodel.h"
 #include "userlistmodel.h"
 #include "webshortcutmodel.h"
 #include "windowcontroller.h"
@@ -221,7 +220,6 @@ int main(int argc, char *argv[])
     qmlRegisterType<MessageEventModel>("org.kde.neochat", 1, 0, "MessageEventModel");
     qmlRegisterType<CollapseStateProxyModel>("org.kde.neochat", 1, 0, "CollapseStateProxyModel");
     qmlRegisterType<MessageFilterModel>("org.kde.neochat", 1, 0, "MessageFilterModel");
-    qmlRegisterType<UserFilterModel>("org.kde.neochat", 1, 0, "UserFilterModel");
     qmlRegisterType<PublicRoomListModel>("org.kde.neochat", 1, 0, "PublicRoomListModel");
     qmlRegisterType<UserDirectoryListModel>("org.kde.neochat", 1, 0, "UserDirectoryListModel");
     qmlRegisterType<ServerListModel>("org.kde.neochat", 1, 0, "ServerListModel");

src/neochat.notifyrc

@@ -7,7 +7,6 @@ Name[ca]=NeoChat
 Name[ca@valencia]=NeoChat
 Name[cs]=NeoChat
 Name[de]=NeoChat
-Name[el]=NeoChat
 Name[en_GB]=NeoChat
 Name[es]=NeoChat
 Name[eu]=NeoChat
@@ -45,7 +44,6 @@ Comment[ca]=Un client per a Matrix, el protocol de comunicacions descentralitzat
 Comment[ca@valencia]=Un client per a Matrix, el protocol de comunicacions descentralitzat
 Comment[cs]=Klient pro decentralizovaný komunikační protokol matrix
 Comment[de]=Ein Programm für Matrix, das dezentrale Kommunikationsprotokoll
-Comment[el]=Ένας πελάτης για το Matrix, το αποκεντρωμένο πρωτόκολλο επικοινωνίας
 Comment[en_GB]=A client for matrix, the decentralised communication protocol
 Comment[es]=Un cliente para Matrix, el protocolo de comunicaciones descentralizado
 Comment[eu]=Matrix, deszentralizatutako komunikazio protokolorako, bezero bat
@@ -84,7 +82,6 @@ Name[ca]=Missatge nou
 Name[ca@valencia]=Missatge nou
 Name[cs]=Nová zpráva
 Name[de]=Neue Nachricht
-Name[el]=Νέο μήνυμα
 Name[en_GB]=New message
 Name[es]=Nuevo mensaje
 Name[eu]=Mezu berria
@@ -119,8 +116,7 @@ Comment[ar]=توجد رسالة جديدة
 Comment[az]=Yeni ismarıc var
 Comment[ca]=Hi ha un missatge nou
 Comment[ca@valencia]=Hi ha un missatge nou
-Comment[de]=Es gibt eine neue Nachricht
-Comment[el]=Υπάρχει ένα νέο μήνυμα
+Comment[de]=Es ist eine neue Nachricht vorhanden
 Comment[en_GB]=There is a new message
 Comment[es]=Hay un mensaje nuevo
 Comment[eu]=Mezu berri bat dago
@@ -160,7 +156,6 @@ Name[ca]=Invitació nova
 Name[ca@valencia]=Invitació nova
 Name[cs]=Nová pozvánka
 Name[de]=Neue Einladung
-Name[el]=Νέα πρόσκληση
 Name[en_GB]=New Invitation
 Name[es]=Nueva invitación
 Name[eu]=Gonbidapen berria
@@ -191,7 +186,6 @@ Comment[ca]=Hi ha una invitació nova a una sala
 Comment[ca@valencia]=Hi ha una invitació nova a una sala
 Comment[cs]=Máte novou pozvánku do místnosti
 Comment[de]=Es gibt eine neue Einladung zu einem Raum
-Comment[el]=Υπάρχει μια νέα πρόσκληση σε μια αίθουσα
 Comment[en_GB]=There is a new invitation to a room
 Comment[es]=Hay una nueva invitación a una sala
 Comment[eu]=Gela baterako gonbidapen berri bat dago

src/neochatconfig.kcfg

@@ -72,11 +72,7 @@
       <default>true</default>
     </entry>
     <entry name="CompactLayout" type="bool">
-      <label>Use a compact chat layout</label>
-      <default>false</default>
-    </entry>
-    <entry name="CompactRoomList" type="bool">
-      <label>Use a compact room list layout</label>
+      <label>Use a compact layout</label>
       <default>false</default>
     </entry>
     <entry name="ShowRename" type="bool">

src/neochatroom.cpp

@@ -31,9 +31,6 @@
 #include <events/roompowerlevelsevent.h>
 #include <events/simplestateevents.h>
 #include <jobs/downloadfilejob.h>
-#ifndef QUOTIENT_07
-#include <joinstate.h>
-#endif
 #include <qt_connection_util.h>
 
 #include "controller.h"
@@ -97,7 +94,6 @@ NeoChatRoom::NeoChatRoom(Connection *connection, QString roomId, JoinState joinS
     connect(this, &Room::changed, this, [this] {
         Q_EMIT canEncryptRoomChanged();
     });
-    connect(connection, &Connection::capabilitiesLoaded, this, &NeoChatRoom::maxRoomVersionChanged);
 }
 
 void NeoChatRoom::uploadFile(const QUrl &url, const QString &body)
@@ -604,10 +600,8 @@ QString NeoChatRoom::eventToString(const RoomEvent &evt, Qt::TextFormat format,
                 } else {
                     return i18n("self-banned from the room");
                 }
-            case MembershipType::Knock: {
-                QString reason(e.contentJson()["reason"_ls].toString().toHtmlEscaped());
-                return reason.isEmpty() ? i18n("requested an invite") : i18n("requested an invite with reason: %1", reason);
-            }
+            case MembershipType::Knock:
+                return i18n("requested an invite");
             default:;
             }
             return i18n("made something unknown");
@@ -946,305 +940,6 @@ void NeoChatRoom::setHistoryVisibility(const QString &historyVisibilityRule)
     // Not emitting historyVisibilityChanged() here, since that would override the change in the UI with the *current* value, which is not the *new* value.
 }
 
-void NeoChatRoom::setUserPowerLevel(const QString &userID, const int &powerLevel)
-{
-    if (joinedCount() <= 1) {
-        qWarning() << "Cannot modify the power level of the only user";
-        return;
-    }
-    if (!canSendState("m.room.power_levels")) {
-        qWarning() << "Power level too low to set user power levels";
-        return;
-    }
-#ifdef QUOTIENT_07
-    if (!isMember(userID)) {
-#else
-    if (memberJoinState(user(userID)) == JoinState::Join) {
-#endif
-        qWarning() << "User is not a member of this room so power level cannot be set";
-        return;
-    }
-    int clampPowerLevel = std::clamp(powerLevel, 0, 100);
-
-#ifdef QUOTIENT_07
-    auto powerLevelContent = currentState().get("m.room.power_levels")->contentJson();
-#else
-    auto powerLevelContent = getCurrentState<RoomPowerLevelsEvent>()->contentJson();
-#endif
-    auto powerLevelUserOverrides = powerLevelContent["users"].toObject();
-
-    if (powerLevelUserOverrides[userID] != clampPowerLevel) {
-        powerLevelUserOverrides[userID] = clampPowerLevel;
-        powerLevelContent["users"] = powerLevelUserOverrides;
-
-#ifdef QUOTIENT_07
-        setState("m.room.power_levels", "", powerLevelContent);
-#else
-        setState<RoomPowerLevelsEvent>(QJsonObject{{"type", "m.room.power_levels"}, {"state_key", ""}, {"content", powerLevelContent}});
-#endif
-    }
-}
-
-int NeoChatRoom::powerLevel(const QString &eventName, const bool &isStateEvent) const
-{
-#ifdef QUOTIENT_07
-    const auto powerLevelEvent = currentState().get<RoomPowerLevelsEvent>();
-#else
-    const auto powerLevelEvent = getCurrentState<RoomPowerLevelsEvent>();
-#endif
-    if (eventName == "ban") {
-        return powerLevelEvent->ban();
-    } else if (eventName == "kick") {
-        return powerLevelEvent->kick();
-    } else if (eventName == "invite") {
-        return powerLevelEvent->invite();
-    } else if (eventName == "redact") {
-        return powerLevelEvent->redact();
-    } else if (eventName == "users_default") {
-        return powerLevelEvent->usersDefault();
-    } else if (eventName == "state_default") {
-        return powerLevelEvent->stateDefault();
-    } else if (eventName == "events_default") {
-        return powerLevelEvent->eventsDefault();
-    } else if (isStateEvent) {
-        return powerLevelEvent->powerLevelForState(eventName);
-    } else {
-        return powerLevelEvent->powerLevelForEvent(eventName);
-    }
-}
-
-void NeoChatRoom::setPowerLevel(const QString &eventName, const int &newPowerLevel, const bool &isStateEvent)
-{
-#ifdef QUOTIENT_07
-    auto powerLevelContent = currentState().get("m.room.power_levels")->contentJson();
-#else
-    auto powerLevelContent = getCurrentState<RoomPowerLevelsEvent>()->contentJson();
-#endif
-    int clampPowerLevel = std::clamp(newPowerLevel, 0, 100);
-    int powerLevel = 0;
-
-    if (powerLevelContent.contains(eventName)) {
-        powerLevel = powerLevelContent[eventName].toInt();
-
-        if (powerLevel != clampPowerLevel) {
-            powerLevelContent[eventName] = clampPowerLevel;
-        }
-    } else {
-        auto eventPowerLevels = powerLevelContent["events"].toObject();
-
-        if (eventPowerLevels.contains(eventName)) {
-            powerLevel = eventPowerLevels[eventName].toInt();
-        } else {
-            if (isStateEvent) {
-                powerLevel = powerLevelContent["state_default"].toInt();
-            } else {
-                powerLevel = powerLevelContent["events_default"].toInt();
-            }
-        }
-
-        if (powerLevel != clampPowerLevel) {
-            eventPowerLevels[eventName] = clampPowerLevel;
-            powerLevelContent["events"] = eventPowerLevels;
-        }
-    }
-
-#ifdef QUOTIENT_07
-    setState("m.room.power_levels", "", powerLevelContent);
-#else
-    setState<RoomPowerLevelsEvent>(QJsonObject{{"type", "m.room.power_levels"}, {"state_key", ""}, {"content", powerLevelContent}});
-#endif
-}
-
-int NeoChatRoom::defaultUserPowerLevel() const
-{
-    return powerLevel("users_default");
-}
-
-void NeoChatRoom::setDefaultUserPowerLevel(const int &newPowerLevel)
-{
-    setPowerLevel("users_default", newPowerLevel);
-}
-
-int NeoChatRoom::invitePowerLevel() const
-{
-    return powerLevel("invite");
-}
-
-void NeoChatRoom::setInvitePowerLevel(const int &newPowerLevel)
-{
-    setPowerLevel("invite", newPowerLevel);
-}
-
-int NeoChatRoom::kickPowerLevel() const
-{
-    return powerLevel("kick");
-}
-
-void NeoChatRoom::setKickPowerLevel(const int &newPowerLevel)
-{
-    setPowerLevel("kick", newPowerLevel);
-}
-
-int NeoChatRoom::banPowerLevel() const
-{
-    return powerLevel("ban");
-}
-
-void NeoChatRoom::setBanPowerLevel(const int &newPowerLevel)
-{
-    setPowerLevel("ban", newPowerLevel);
-}
-
-int NeoChatRoom::redactPowerLevel() const
-{
-    return powerLevel("redact");
-}
-
-void NeoChatRoom::setRedactPowerLevel(const int &newPowerLevel)
-{
-    setPowerLevel("redact", newPowerLevel);
-}
-
-int NeoChatRoom::statePowerLevel() const
-{
-    return powerLevel("state_default");
-}
-
-void NeoChatRoom::setStatePowerLevel(const int &newPowerLevel)
-{
-    setPowerLevel("state_default", newPowerLevel);
-}
-
-int NeoChatRoom::defaultEventPowerLevel() const
-{
-    return powerLevel("events_default");
-}
-
-void NeoChatRoom::setDefaultEventPowerLevel(const int &newPowerLevel)
-{
-    setPowerLevel("events_default", newPowerLevel);
-}
-
-int NeoChatRoom::powerLevelPowerLevel() const
-{
-    return powerLevel("m.room.power_levels", true);
-}
-
-void NeoChatRoom::setPowerLevelPowerLevel(const int &newPowerLevel)
-{
-    setPowerLevel("m.room.power_levels", newPowerLevel, true);
-}
-
-int NeoChatRoom::namePowerLevel() const
-{
-    return powerLevel("m.room.name", true);
-}
-
-void NeoChatRoom::setNamePowerLevel(const int &newPowerLevel)
-{
-    setPowerLevel("m.room.name", newPowerLevel, true);
-}
-
-int NeoChatRoom::avatarPowerLevel() const
-{
-    return powerLevel("m.room.avatar", true);
-}
-
-void NeoChatRoom::setAvatarPowerLevel(const int &newPowerLevel)
-{
-    setPowerLevel("m.room.avatar", newPowerLevel, true);
-}
-
-int NeoChatRoom::canonicalAliasPowerLevel() const
-{
-    return powerLevel("m.room.canonical_alias", true);
-}
-
-void NeoChatRoom::setCanonicalAliasPowerLevel(const int &newPowerLevel)
-{
-    setPowerLevel("m.room.canonical_alias", newPowerLevel, true);
-}
-
-int NeoChatRoom::topicPowerLevel() const
-{
-    return powerLevel("m.room.topic", true);
-}
-
-void NeoChatRoom::setTopicPowerLevel(const int &newPowerLevel)
-{
-    setPowerLevel("m.room.topic", newPowerLevel, true);
-}
-
-int NeoChatRoom::encryptionPowerLevel() const
-{
-    return powerLevel("m.room.encryption", true);
-}
-
-void NeoChatRoom::setEncryptionPowerLevel(const int &newPowerLevel)
-{
-    setPowerLevel("m.room.encryption", newPowerLevel, true);
-}
-
-int NeoChatRoom::historyVisibilityPowerLevel() const
-{
-    return powerLevel("m.room.history_visibility", true);
-}
-
-void NeoChatRoom::setHistoryVisibilityPowerLevel(const int &newPowerLevel)
-{
-    setPowerLevel("m.room.history_visibility", newPowerLevel, true);
-}
-
-int NeoChatRoom::pinnedEventsPowerLevel() const
-{
-    return powerLevel("m.room.pinned_events", true);
-}
-
-void NeoChatRoom::setPinnedEventsPowerLevel(const int &newPowerLevel)
-{
-    setPowerLevel("m.room.pinned_events", newPowerLevel, true);
-}
-
-int NeoChatRoom::tombstonePowerLevel() const
-{
-    return powerLevel("m.room.tombstone", true);
-}
-
-void NeoChatRoom::setTombstonePowerLevel(const int &newPowerLevel)
-{
-    setPowerLevel("m.room.tombstone", newPowerLevel, true);
-}
-
-int NeoChatRoom::serverAclPowerLevel() const
-{
-    return powerLevel("m.room.server_acl", true);
-}
-
-void NeoChatRoom::setServerAclPowerLevel(const int &newPowerLevel)
-{
-    setPowerLevel("m.room.server_acl", newPowerLevel, true);
-}
-
-int NeoChatRoom::spaceChildPowerLevel() const
-{
-    return powerLevel("m.space.child", true);
-}
-
-void NeoChatRoom::setSpaceChildPowerLevel(const int &newPowerLevel)
-{
-    setPowerLevel("m.space.child", newPowerLevel, true);
-}
-
-int NeoChatRoom::spaceParentPowerLevel() const
-{
-    return powerLevel("m.space.parent", true);
-}
-
-void NeoChatRoom::setSpaceParentPowerLevel(const int &newPowerLevel)
-{
-    setPowerLevel("m.space.parent", newPowerLevel, true);
-}
-
 QCoro::Task<void> NeoChatRoom::doDeleteMessagesByUser(const QString &user, QString reason)
 {
     QStringList events;
@@ -1673,14 +1368,3 @@ void NeoChatRoom::setCanonicalAlias(const QString &newAlias)
         }
     });
 }
-
-int NeoChatRoom::maxRoomVersion() const
-{
-    int maxVersion = 0;
-    for (auto roomVersion : connection()->availableRoomVersions()) {
-        if (roomVersion.id.toInt() > maxVersion) {
-            maxVersion = roomVersion.id.toInt();
-        }
-    }
-    return maxVersion;
-}

src/neochatroom.h

@@ -47,32 +47,9 @@ class NeoChatRoom : public Quotient::Room
     Q_PROPERTY(QString avatarMediaId READ avatarMediaId NOTIFY avatarChanged STORED false)
     Q_PROPERTY(bool readMarkerLoaded READ readMarkerLoaded NOTIFY readMarkerLoadedChanged)
     Q_PROPERTY(QDateTime lastActiveTime READ lastActiveTime NOTIFY lastActiveTimeChanged)
-    Q_PROPERTY(bool isSpace READ isSpace CONSTANT)
     Q_PROPERTY(bool isInvite READ isInvite NOTIFY isInviteChanged)
     Q_PROPERTY(QString joinRule READ joinRule WRITE setJoinRule NOTIFY joinRuleChanged)
     Q_PROPERTY(QString historyVisibility READ historyVisibility WRITE setHistoryVisibility NOTIFY historyVisibilityChanged)
-
-    // Properties for the various permission levels for the room
-    Q_PROPERTY(int defaultUserPowerLevel READ defaultUserPowerLevel WRITE setDefaultUserPowerLevel NOTIFY defaultUserPowerLevelChanged)
-    Q_PROPERTY(int invitePowerLevel READ invitePowerLevel WRITE setInvitePowerLevel NOTIFY invitePowerLevelChanged)
-    Q_PROPERTY(int kickPowerLevel READ kickPowerLevel WRITE setKickPowerLevel NOTIFY kickPowerLevelChanged)
-    Q_PROPERTY(int banPowerLevel READ banPowerLevel WRITE setBanPowerLevel NOTIFY banPowerLevelChanged)
-    Q_PROPERTY(int redactPowerLevel READ redactPowerLevel WRITE setRedactPowerLevel NOTIFY redactPowerLevelChanged)
-    Q_PROPERTY(int statePowerLevel READ statePowerLevel WRITE setStatePowerLevel NOTIFY statePowerLevelChanged)
-    Q_PROPERTY(int defaultEventPowerLevel READ defaultEventPowerLevel WRITE setDefaultEventPowerLevel NOTIFY defaultEventPowerLevelChanged)
-    Q_PROPERTY(int powerLevelPowerLevel READ powerLevelPowerLevel WRITE setPowerLevelPowerLevel NOTIFY powerLevelPowerLevelChanged)
-    Q_PROPERTY(int namePowerLevel READ namePowerLevel WRITE setNamePowerLevel NOTIFY namePowerLevelChanged)
-    Q_PROPERTY(int avatarPowerLevel READ avatarPowerLevel WRITE setAvatarPowerLevel NOTIFY avatarPowerLevelChanged)
-    Q_PROPERTY(int canonicalAliasPowerLevel READ canonicalAliasPowerLevel WRITE setCanonicalAliasPowerLevel NOTIFY canonicalAliasPowerLevelChanged)
-    Q_PROPERTY(int topicPowerLevel READ topicPowerLevel WRITE setTopicPowerLevel NOTIFY topicPowerLevelChanged)
-    Q_PROPERTY(int encryptionPowerLevel READ encryptionPowerLevel WRITE setEncryptionPowerLevel NOTIFY encryptionPowerLevelChanged)
-    Q_PROPERTY(int historyVisibilityPowerLevel READ historyVisibilityPowerLevel WRITE setHistoryVisibilityPowerLevel NOTIFY historyVisibilityPowerLevelChanged)
-    Q_PROPERTY(int pinnedEventsPowerLevel READ pinnedEventsPowerLevel WRITE setPinnedEventsPowerLevel NOTIFY pinnedEventsPowerLevelChanged)
-    Q_PROPERTY(int tombstonePowerLevel READ tombstonePowerLevel WRITE setTombstonePowerLevel NOTIFY tombstonePowerLevelChanged)
-    Q_PROPERTY(int serverAclPowerLevel READ serverAclPowerLevel WRITE setServerAclPowerLevel NOTIFY serverAclPowerLevelChanged)
-    Q_PROPERTY(int spaceChildPowerLevel READ spaceChildPowerLevel WRITE setSpaceChildPowerLevel NOTIFY spaceChildPowerLevelChanged)
-    Q_PROPERTY(int spaceParentPowerLevel READ spaceParentPowerLevel WRITE setSpaceParentPowerLevel NOTIFY spaceParentPowerLevelChanged)
-
     Q_PROPERTY(QString htmlSafeDisplayName READ htmlSafeDisplayName NOTIFY displayNameChanged)
     Q_PROPERTY(PushNotificationState::State pushNotificationState MEMBER m_currentPushNotificationState WRITE setPushNotificationState NOTIFY
                    pushNotificationStateChanged)
@@ -88,13 +65,6 @@ class NeoChatRoom : public Quotient::Room
     Q_PROPERTY(QString chatBoxAttachmentPath READ chatBoxAttachmentPath WRITE setChatBoxAttachmentPath NOTIFY chatBoxAttachmentPathChanged)
     Q_PROPERTY(bool canEncryptRoom READ canEncryptRoom NOTIFY canEncryptRoomChanged)
 
-    /**
-     * @brief Get the maximum room version that the server supports.
-     *
-     * Only returns main integer room versions (i.e. no msc room versions).
-     */
-    Q_PROPERTY(int maxRoomVersion READ maxRoomVersion NOTIFY maxRoomVersionChanged)
-
 public:
     enum MessageType {
         Positive,
@@ -147,68 +117,6 @@ public:
     [[nodiscard]] QString historyVisibility() const;
     void setHistoryVisibility(const QString &historyVisibilityRule);
 
-    Q_INVOKABLE void setUserPowerLevel(const QString &userID, const int &powerLevel);
-
-    [[nodiscard]] int powerLevel(const QString &eventName, const bool &isStateEvent = false) const;
-    void setPowerLevel(const QString &eventName, const int &newPowerLevel, const bool &isStateEvent = false);
-
-    [[nodiscard]] int defaultUserPowerLevel() const;
-    void setDefaultUserPowerLevel(const int &newPowerLevel);
-
-    [[nodiscard]] int invitePowerLevel() const;
-    void setInvitePowerLevel(const int &newPowerLevel);
-
-    [[nodiscard]] int kickPowerLevel() const;
-    void setKickPowerLevel(const int &newPowerLevel);
-
-    [[nodiscard]] int banPowerLevel() const;
-    void setBanPowerLevel(const int &newPowerLevel);
-
-    [[nodiscard]] int redactPowerLevel() const;
-    void setRedactPowerLevel(const int &newPowerLevel);
-
-    [[nodiscard]] int statePowerLevel() const;
-    void setStatePowerLevel(const int &newPowerLevel);
-
-    [[nodiscard]] int defaultEventPowerLevel() const;
-    void setDefaultEventPowerLevel(const int &newPowerLevel);
-
-    [[nodiscard]] int powerLevelPowerLevel() const;
-    void setPowerLevelPowerLevel(const int &newPowerLevel);
-
-    [[nodiscard]] int namePowerLevel() const;
-    void setNamePowerLevel(const int &newPowerLevel);
-
-    [[nodiscard]] int avatarPowerLevel() const;
-    void setAvatarPowerLevel(const int &newPowerLevel);
-
-    [[nodiscard]] int canonicalAliasPowerLevel() const;
-    void setCanonicalAliasPowerLevel(const int &newPowerLevel);
-
-    [[nodiscard]] int topicPowerLevel() const;
-    void setTopicPowerLevel(const int &newPowerLevel);
-
-    [[nodiscard]] int encryptionPowerLevel() const;
-    void setEncryptionPowerLevel(const int &newPowerLevel);
-
-    [[nodiscard]] int historyVisibilityPowerLevel() const;
-    void setHistoryVisibilityPowerLevel(const int &newPowerLevel);
-
-    [[nodiscard]] int pinnedEventsPowerLevel() const;
-    void setPinnedEventsPowerLevel(const int &newPowerLevel);
-
-    [[nodiscard]] int tombstonePowerLevel() const;
-    void setTombstonePowerLevel(const int &newPowerLevel);
-
-    [[nodiscard]] int serverAclPowerLevel() const;
-    void setServerAclPowerLevel(const int &newPowerLevel);
-
-    [[nodiscard]] int spaceChildPowerLevel() const;
-    void setSpaceChildPowerLevel(const int &newPowerLevel);
-
-    [[nodiscard]] int spaceParentPowerLevel() const;
-    void setSpaceParentPowerLevel(const int &newPowerLevel);
-
     [[nodiscard]] bool hasFileUploading() const
     {
         return m_hasFileUploading;
@@ -315,8 +223,6 @@ public:
     }
 #endif
 
-    int maxRoomVersion() const;
-
 private:
     QSet<const Quotient::RoomEvent *> highlights;
 
@@ -368,26 +274,6 @@ Q_SIGNALS:
     void canEncryptRoomChanged();
     void joinRuleChanged();
     void historyVisibilityChanged();
-    void maxRoomVersionChanged();
-    void defaultUserPowerLevelChanged();
-    void invitePowerLevelChanged();
-    void kickPowerLevelChanged();
-    void banPowerLevelChanged();
-    void redactPowerLevelChanged();
-    void statePowerLevelChanged();
-    void defaultEventPowerLevelChanged();
-    void powerLevelPowerLevelChanged();
-    void namePowerLevelChanged();
-    void avatarPowerLevelChanged();
-    void canonicalAliasPowerLevelChanged();
-    void topicPowerLevelChanged();
-    void encryptionPowerLevelChanged();
-    void historyVisibilityPowerLevelChanged();
-    void pinnedEventsPowerLevelChanged();
-    void tombstonePowerLevelChanged();
-    void serverAclPowerLevelChanged();
-    void spaceChildPowerLevelChanged();
-    void spaceParentPowerLevelChanged();
 
 public Q_SLOTS:
     void uploadFile(const QUrl &url, const QString &body = QString());

src/plasma-runner-neochat.desktop

@@ -8,7 +8,6 @@ Name[ca]=NeoChat
 Name[ca@valencia]=NeoChat
 Name[cs]=NeoChat
 Name[de]=NeoChat
-Name[el]=NeoChat
 Name[en_GB]=NeoChat
 Name[es]=NeoChat
 Name[eu]=NeoChat
@@ -43,8 +42,6 @@ Comment[ar]=اعثر على غرف في نيوتشات
 Comment[az]=NeoChat-da otaqları tapın
 Comment[ca]=Cerca sales en el NeoChat
 Comment[ca@valencia]=Busca sales en NeoChat
-Comment[de]=Räume in NeoChat finden
-Comment[el]=Εύρεση αιθουσών στο NeoChat
 Comment[en_GB]=Find rooms in NeoChat
 Comment[es]=Buscar salas en NeoChat
 Comment[eu]=Bilatu gelak NeoChat-en

src/qml/Component/ChatBox/ChatBar.qml

@@ -85,7 +85,6 @@ QQC2.ToolBar {
 
                 Kirigami.Theme.colorSet: Kirigami.Theme.View
                 Kirigami.Theme.inherit: false
-                Kirigami.SpellChecking.enabled: true
 
                 color: Kirigami.Theme.textColor
                 selectionColor: Kirigami.Theme.highlightColor

src/qml/Component/Emoji/EmojiPicker.qml

@@ -27,10 +27,6 @@ ColumnLayout {
 
     signal chosen(string emoji)
 
-    onActiveFocusChanged: if (activeFocus) {
-        searchField.forceActiveFocus()
-    }
-
     spacing: 0
 
     QQC2.ScrollView {
@@ -82,12 +78,6 @@ ColumnLayout {
         id: searchField
         Layout.margins: Kirigami.Units.smallSpacing
         Layout.fillWidth: true
-
-        /**
-         * The focus is manged by the parent and we don't want to use the standard
-         * shortcut as it could block other SearchFields from using it.
-         */
-        focusSequence: ""
     }
 
     EmojiGrid {

src/qml/Component/Login/Sso.qml

@@ -20,9 +20,6 @@ LoginStep {
             target: LoginHelper
             function onSsoUrlChanged() {
                 UrlHelper.openUrl(LoginHelper.ssoUrl)
-                root.showMessage(i18n("Complete the authentication steps in your browser"))
-                loginButton.enabled = true
-                loginButton.text = i18n("Login")
             }
             function onConnected() {
                 processed("qrc:/Loading.qml")
@@ -37,12 +34,10 @@ LoginStep {
                 }
             }
             QQC2.Button {
-                id: loginButton
                 text: i18n("Login")
                 onClicked: {
                     LoginHelper.loginWithSso()
-                    loginButton.enabled = false
-                    loginButton.text = i18n("Loading…")
+                    root.showMessage(i18n("Complete the authentication steps in your browser"))
                 }
                 Component.onCompleted: forceActiveFocus()
                 Keys.onReturnPressed: clicked()

src/qml/Component/QuickSwitcher.qml

@@ -40,11 +40,6 @@ QQC2.Popup {
             // we used to be able to expect that the text field wouldn't attempt to
             // perform a mini-DDOS attack using signals.
             autoAccept: false
-            /**
-             * The focus is manged by the popup and we don't want to use the standard
-             * shortcut as it could block other SearchFields from using it.
-             */
-            focusSequence: ""
 
             Layout.preferredWidth: Kirigami.Units.gridUnit * 21 // 3 * 7 = 21, roughly 7 avatars on screen
             Keys.onLeftPressed: cView.decrementCurrentIndex()

src/qml/Component/Timeline/FileDelegate.qml

@@ -33,7 +33,10 @@ TimelineContainer {
     }
 
     innerObject: RowLayout {
-        Layout.maximumWidth: Math.min(fileDelegate.contentMaxWidth, implicitWidth)
+
+        Layout.fillWidth: true
+        Layout.maximumWidth: fileDelegate.contentMaxWidth
+        Layout.margins: Kirigami.Units.largeSpacing
 
         spacing: Kirigami.Units.largeSpacing
 
@@ -108,16 +111,24 @@ TimelineContainer {
         }
 
         ColumnLayout {
+            Layout.alignment: Qt.AlignVCenter
+            Layout.fillWidth: true
+
             spacing: 0
+
             QQC2.Label {
                 text: model.display
                 wrapMode: Text.Wrap
+
+                Layout.fillWidth: true
             }
             QQC2.Label {
                 id: sizeLabel
 
                 text: Controller.formatByteSize(content.info ? content.info.size : 0)
                 opacity: 0.7
+
+                Layout.fillWidth: true
             }
         }
 

src/qml/Dialog/EmojiDialog.qml

@@ -24,13 +24,6 @@ QQC2.Popup {
         }
     }
 
-    onVisibleChanged: {
-        if (!visible) {
-            return
-        }
-        emojiPicker.forceActiveFocus()
-    }
-
     background: Kirigami.ShadowedRectangle {
         Kirigami.Theme.colorSet: Kirigami.Theme.View
         color: Kirigami.Theme.backgroundColor
@@ -50,7 +43,6 @@ QQC2.Popup {
     implicitHeight: Kirigami.Units.gridUnit * 20 + 2 * padding
     width: Math.min(contentItem.categoryIconSize * contentItem.categoryCount + 2 * padding, QQC2.Overlay.overlay.width)
     contentItem: EmojiPicker {
-        id: emojiPicker
         height: 400
         includeCustom: emojiPopup.includeCustom
         showQuickReaction: emojiPopup.showQuickReaction

src/qml/Dialog/UserDetailDialog.qml

@@ -97,19 +97,6 @@ Kirigami.OverlaySheet {
                 }
             }
         }
-        Kirigami.BasicListItem {
-            visible: user !== room.localUser && room.canSendState("invite") && !room.containsUser(user.id)
-
-            action: Kirigami.Action {
-                enabled: !room.isUserBanned(user.id)
-                text: i18n("Invite this user")
-                icon.name: "list-add-user"
-                onTriggered: {
-                    room.inviteToRoom(user.id)
-                    root.close()
-                }
-            }
-        }
         Kirigami.BasicListItem {
             visible: user !== room.localUser && room.canSendState("ban") && !room.isUserBanned(user.id)
 

src/qml/Menu/SpaceListContextMenu.qml

@@ -21,11 +21,6 @@ Loader {
     Component {
         id: regularMenu
         QQC2.Menu {
-            QQC2.MenuItem {
-                text: i18nc("'Space' is a matrix space", "View Space")
-                onTriggered: RoomManager.enterRoom(room);
-            }
-
             QQC2.MenuItem {
                 text: i18nc("@action:inmenu", "Copy Address to Clipboard")
                 onTriggered: if (room.canonicalAlias.length === 0) {

src/qml/Page/RoomListPage.qml

@@ -28,7 +28,7 @@ Kirigami.ScrollablePage {
             clip: true
             visible: spaceList.count > 0
 
-            Layout.preferredHeight: Kirigami.Units.gridUnit * 2
+            Layout.preferredHeight: Kirigami.Units.gridUnit * 3
             Layout.fillWidth: true
 
             model: SortFilterSpaceListModel {
@@ -39,28 +39,26 @@ Kirigami.ScrollablePage {
                 }
             }
 
-            header: QQC2.ItemDelegate {
-                id: homeButton
-                icon.name: "home"
-                text: i18nc("@action:button", "Show All Rooms")
-                height: parent.height
-                width: height
-                leftPadding: topPadding
-                rightPadding: topPadding
+            header: QQC2.Control {
+                contentItem: QQC2.RoundButton {
+                    id: homeButton
+                    flat: true
+                    padding: Kirigami.Units.gridUnit / 2
+                    icon.name: "home"
+                    text: i18nc("@action:button", "Show All Rooms")
+                    display: QQC2.AbstractButton.IconOnly
 
-                contentItem: Kirigami.Icon {
-                    source: "home"
+                    onClicked: {
+                        sortFilterRoomListModel.activeSpaceId = "";
+                        spaceList.activeSpaceId = '';
+                        listView.positionViewAtIndex(0, ListView.Beginning);
+                    }
+
+                    QQC2.ToolTip {
+                        text: homeButton.text
+                    }
+                    Accessible.name: text
                 }
-
-                onClicked: {
-                    sortFilterRoomListModel.activeSpaceId = "";
-                    spaceList.activeSpaceId = '';
-                    listView.positionViewAtIndex(0, ListView.Beginning);
-                }
-
-                QQC2.ToolTip.text: homeButton.text
-                QQC2.ToolTip.visible: hovered
-                QQC2.ToolTip.delay: Kirigami.Units.toolTipDelay
             }
 
             delegate: QQC2.ItemDelegate {
@@ -86,9 +84,9 @@ Kirigami.ScrollablePage {
 
                 Accessible.name: currentRoom.displayName
 
-                QQC2.ToolTip.text: currentRoom.displayName
-                QQC2.ToolTip.visible: hovered
-                QQC2.ToolTip.delay: Kirigami.Units.toolTipDelay
+                QQC2.ToolTip {
+                    text: currentRoom.displayName
+                }
 
                 onPressAndHold: {
                     spaceList.createContextMenu(currentRoom)
@@ -118,7 +116,9 @@ Kirigami.ScrollablePage {
     title: i18n("Rooms")
 
     property var enteredRoom
-    property bool collapsedMode: Config.roomListPageWidth < applicationWindow().minPageWidth && applicationWindow().shouldUseSidebars
+    property bool collapsedMode: Config.roomListPageWidth === applicationWindow().collapsedPageWidth && applicationWindow().shouldUseSidebars
+
+    verticalScrollBarPolicy: collapsedMode ? QQC2.ScrollBar.AlwaysOff : QQC2.ScrollBar.AsNeeded
 
     onCollapsedModeChanged: if (collapsedMode) {
         sortFilterRoomListModel.filterText = "";
@@ -180,7 +180,7 @@ Kirigami.ScrollablePage {
             leftPadding: Kirigami.Units.largeSpacing
             rightPadding: Kirigami.Units.largeSpacing
             bottomPadding: Kirigami.Units.largeSpacing
-            width: visible ? ListView.view.width : 0
+            width: visible ? page.width : 0
             height: visible ? Kirigami.Units.gridUnit * 2 : 0
 
             Kirigami.Icon {
@@ -234,44 +234,19 @@ Kirigami.ScrollablePage {
         }
 
         section.property: sortFilterRoomListModel.filterText.length === 0 && !Config.mergeRoomList ? "category" : null
-        section.delegate: page.collapsedMode ? foldButton : sectionHeader
-
-        Component {
+        section.delegate: Kirigami.ListSectionHeader {
             id: sectionHeader
-            Kirigami.ListSectionHeader {
-                height: implicitHeight
-                label: roomListModel.categoryName(section)
-                action: Kirigami.Action {
-                    onTriggered: roomListModel.setCategoryVisible(section, !roomListModel.categoryVisible(section))
-                }
-                contentItem.children: QQC2.ToolButton {
-                    icon.name: (roomListModel.categoryVisible(section) ? "go-up" : "go-down")
-                    icon.width: Kirigami.Units.iconSizes.small
-                    icon.height: Kirigami.Units.iconSizes.small
-
-                    onClicked: roomListModel.setCategoryVisible(section, !roomListModel.categoryVisible(section))
-                }
+            height: implicitHeight
+            label: roomListModel.categoryName(section)
+            action: Kirigami.Action {
+                onTriggered: roomListModel.setCategoryVisible(section, !roomListModel.categoryVisible(section))
             }
-        }
-        Component {
-            id: foldButton
-            Item {
-                width: ListView.view.width
-                height: visible ? width : 0
-                QQC2.ToolButton {
-                    id: button
-                    anchors.centerIn: parent
+            contentItem.children: QQC2.ToolButton {
+                icon.name: page.collapsedMode ? roomListModel.categoryIconName(section) : (roomListModel.categoryVisible(section) ? "go-up" : "go-down")
+                icon.width: Kirigami.Units.iconSizes.small
+                icon.height: Kirigami.Units.iconSizes.small
 
-                    icon.name: hovered ? (roomListModel.categoryVisible(section) ? "go-up" : "go-down") : roomListModel.categoryIconName(section)
-                    icon.width: Kirigami.Units.iconSizes.smallMedium
-                    icon.height: Kirigami.Units.iconSizes.smallMedium
-
-                    onClicked: roomListModel.setCategoryVisible(section, !roomListModel.categoryVisible(section))
-
-                    QQC2.ToolTip.text: roomListModel.categoryName(section)
-                    QQC2.ToolTip.visible: hovered
-                    QQC2.ToolTip.delay: Kirigami.Units.toolTipDelay
-                }
+                onClicked: roomListModel.setCategoryVisible(section, !roomListModel.categoryVisible(section))
             }
         }
 
@@ -297,8 +272,7 @@ Kirigami.ScrollablePage {
                 rightPadding: Kirigami.Units.largeSpacing
                 bottomPadding: Kirigami.Units.largeSpacing
                 width: ListView.view.width
-                height: visible ? ListView.view.width : 0
-                visible: model.categoryVisible || sortFilterRoomListModel.filterText.length > 0 || Config.mergeRoomList
+                height: ListView.view.width
 
                 contentItem: Kirigami.Avatar {
                     source: avatar ? "image://mxc/" + avatar : ""
@@ -342,7 +316,6 @@ Kirigami.ScrollablePage {
                 labelItem.textFormat: Text.PlainText
                 subtitle: subtitleText
                 subtitleItem.textFormat: Text.PlainText
-                subtitleItem.visible: !Config.compactRoomList
                 onPressAndHold: {
                     createRoomListContextMenu()
                 }
@@ -372,13 +345,11 @@ Kirigami.ScrollablePage {
                         Accessible.name: i18n("Muted room")
                     }
                     QQC2.Label {
-                        id: notificationCountLabel
                         text: notificationCount > 0 ? notificationCount : "●"
                         visible: unreadCount > 0
+                        padding: Kirigami.Units.smallSpacing
                         color: Kirigami.Theme.textColor
-                        Layout.rightMargin: Kirigami.Units.smallSpacing
-                        Layout.minimumHeight: Kirigami.Units.iconSizes.smallMedium
-                        Layout.minimumWidth: Math.max(notificationCountTextMetrics.advanceWidth + Kirigami.Units.smallSpacing * 2, height)
+                        Layout.minimumWidth: height
                         horizontalAlignment: Text.AlignHCenter
                         background: Rectangle {
                             visible: notificationCount > 0
@@ -387,15 +358,10 @@ Kirigami.ScrollablePage {
                             opacity: highlightCount > 0 ? 1 : 0.3
                             radius: height / 2
                         }
-
-                        TextMetrics {
-                            id: notificationCountTextMetrics
-                            text: notificationCountLabel.text
-                        }
                     }
                     QQC2.Button {
                         id: configButton
-                        visible: roomListItem.hovered && !Kirigami.Settings.isMobile && !Config.compactRoomList
+                        visible: roomListItem.hovered && !Kirigami.Settings.isMobile
                         Accessible.name: i18n("Configure room")
 
                         action: Kirigami.Action {
@@ -410,13 +376,13 @@ Kirigami.ScrollablePage {
 
                 function createRoomListContextMenu() {
                     const menu = roomListContextMenu.createObject(page, {room: currentRoom})
-                    if (!Kirigami.Settings.isMobile && !Config.compactRoomList) {
+                    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 && !Config.compactRoomList })
+                        configButton.visible = Qt.binding(function() { return roomListItem.hovered && !Kirigami.Settings.isMobile })
                     })
                     menu.open()
                 }

src/qml/Page/RoomPage.qml

@@ -48,7 +48,6 @@ Kirigami.ScrollablePage {
 
     onCurrentRoomChanged: {
         applicationWindow().hoverLinkIndicator.text = "";
-        messageListView.positionViewAtBeginning();
         hasScrolledUpBefore = false;
     }
 

src/qml/Panel/RoomDrawer.qml

@@ -75,7 +75,7 @@ Kirigami.OverlayDrawer {
             id: columnLayout
             property alias userSearchText: userListSearchField.text
             property alias highlightedUser: userListView.currentIndex
-            spacing: Kirigami.Units.largeSpacing
+            spacing: 0
 
             Kirigami.AbstractApplicationHeader {
                 Layout.fillWidth: true
@@ -86,19 +86,111 @@ Kirigami.OverlayDrawer {
 
                 RowLayout {
                     anchors.fill: parent
+                    spacing: Kirigami.Units.smallSpacing
+
                     Kirigami.Heading {
                         Layout.fillWidth: true
                         text: i18n("Room information")
                         level: 1
                     }
+                    QQC2.ToolButton {
+                        id: devtoolsButton
+
+                        Layout.alignment: Qt.AlignRight
+                        icon.name: "tools"
+                        text: i18n("Open developer tools")
+                        display: QQC2.AbstractButton.IconOnly
+                        visible: Config.developerTools && Controller.quotientMinorVersion > 6
+
+                        onClicked: {
+                            applicationWindow().pageStack.layers.push("qrc:/DevtoolsPage.qml", {room: room}, {title: i18n("Developer Tools")})
+                            roomDrawer.close();
+                        }
+
+                        QQC2.ToolTip {
+                            text: devtoolsButton.text
+                        }
+                    }
+                    QQC2.ToolButton {
+                        id: searchButton
+
+                        Layout.alignment: Qt.AlignRight
+                        icon.name: "search"
+                        text: i18n("Search in this room")
+                        display: QQC2.AbstractButton.IconOnly
+                        visible: Controller.quotientMinorVersion > 6
+
+                        onClicked: {
+                            pageStack.pushDialogLayer("qrc:/SearchPage.qml", {
+                                currentRoom: room
+                            }, {
+                                title: i18nc("@action:title", "Search")
+                            })
+                        }
+                    }
+                    QQC2.ToolButton {
+                        id: inviteButton
+
+                        Layout.alignment: Qt.AlignRight
+                        icon.name: "list-add-user"
+                        text: i18n("Invite user to room")
+                        display: QQC2.AbstractButton.IconOnly
+
+                        onClicked: {
+                            applicationWindow().pageStack.layers.push("qrc:/InviteUserPage.qml", {room: room})
+                            roomDrawer.close();
+                        }
+
+                        QQC2.ToolTip {
+                            text: inviteButton.text
+                        }
+                    }
+                    QQC2.ToolButton {
+                        id: favouriteButton
+
+                        Layout.alignment: Qt.AlignRight
+                        icon.name: room && room.isFavourite ? "rating" : "rating-unrated"
+                        checkable: true
+                        checked: room && room.isFavourite
+                        text: room && room.isFavourite ? i18n("Remove room from favorites") : i18n("Make room favorite")
+                        display: QQC2.AbstractButton.IconOnly
+
+                        onClicked: room.isFavourite ? room.removeTag("m.favourite") : room.addTag("m.favourite", 1.0)
+
+                        QQC2.ToolTip {
+                            text: favouriteButton.text
+                        }
+                    }
+                    QQC2.ToolButton {
+                        id: encryptButton
+
+                        Layout.alignment: Qt.AlignRight
+                        icon.name: 'channel-insecure-symbolic'
+                        enabled: roomDrawer.room.canEncryptRoom
+                        visible: !roomDrawer.room.usesEncryption && Controller.encryptionSupported
+                        text: i18n("Enable encryption")
+                        display: QQC2.AbstractButton.IconOnly
+
+                        onClicked: {
+                            let dialog = confirmEncryptionDialog.createObject(applicationWindow(), {room: roomDrawer.room});
+                            roomDrawer.close();
+                            dialog.open();
+                        }
+
+                        QQC2.ToolTip {
+                            text: encryptButton.text
+                        }
+                    }
                     QQC2.ToolButton {
                         id: settingsButton
 
-                        icon.name: "settings-configure"
+                        Layout.alignment: Qt.AlignRight
+                        icon.name: 'settings-configure'
                         text: i18n("Room settings")
                         display: QQC2.AbstractButton.IconOnly
 
                         onClicked: QQC2.ApplicationWindow.window.pageStack.pushDialogLayer('qrc:/Categories.qml', {room: room}, { title: i18n("Room Settings") })
+
                         QQC2.ToolTip {
                             text: settingsButton.text
                         }
@@ -106,151 +198,74 @@ Kirigami.OverlayDrawer {
                 }
             }
 
-            RowLayout {
+            ColumnLayout {
                 Layout.fillWidth: true
-                Layout.leftMargin: Kirigami.Units.largeSpacing
+                Layout.margins: Kirigami.Units.largeSpacing
                 spacing: Kirigami.Units.largeSpacing
 
-                Kirigami.Avatar {
-                    Layout.preferredWidth: Kirigami.Units.gridUnit * 3.5
-                    Layout.preferredHeight: Kirigami.Units.gridUnit * 3.5
+                RowLayout {
+                    Layout.fillWidth: true
+                    Layout.leftMargin: Kirigami.Units.smallSpacing
+                    spacing: Kirigami.Units.largeSpacing
 
-                    name: room ? room.displayName : ""
-                    source: room ? ("image://mxc/" +  room.avatarMediaId) : ""
+                    Kirigami.Avatar {
+                        Layout.preferredWidth: Kirigami.Units.gridUnit * 3.5
+                        Layout.preferredHeight: Kirigami.Units.gridUnit * 3.5
 
-                    Rectangle {
-                        visible: room.usesEncryption
-                        color: Kirigami.Theme.backgroundColor
+                        name: room ? room.displayName : ""
+                        source: room ? ("image://mxc/" +  room.avatarMediaId) : ""
+                    }
 
-                        width: Kirigami.Units.gridUnit
-                        height: Kirigami.Units.gridUnit
-                        anchors.bottom: parent.bottom
-                        anchors.right: parent.right
+                    ColumnLayout {
+                        Layout.fillWidth: true
+                        Layout.alignment: Qt.AlignVCenter
+                        spacing: 0
 
-                        radius: width / 2
-
-                        Kirigami.Icon {
-                            source: "channel-secure-symbolic"
-                            anchors.fill: parent
+                        Kirigami.Heading {
+                            Layout.fillWidth: true
+                            level: 1
+                            type: Kirigami.Heading.Type.Primary
+                            wrapMode: QQC2.Label.Wrap
+                            text: room ? room.displayName : i18n("No name")
+                            textFormat: Text.PlainText
+                        }
+                        TextEdit {
+                            Layout.fillWidth: true
+                            textFormat: TextEdit.PlainText
+                            wrapMode: Text.WordWrap
+                            selectByMouse: true
+                            color: Kirigami.Theme.textColor
+                            selectedTextColor: Kirigami.Theme.highlightedTextColor
+                            selectionColor: Kirigami.Theme.highlightColor
+                            readOnly: true
+                            text: room && room.canonicalAlias ? room.canonicalAlias : i18n("No Canonical Alias")
                         }
                     }
                 }
 
-                ColumnLayout {
+                TextEdit {
                     Layout.fillWidth: true
-                    Layout.alignment: Qt.AlignVCenter
-                    spacing: 0
-
-                    Kirigami.Heading {
-                        Layout.fillWidth: true
-                        level: 1
-                        type: Kirigami.Heading.Type.Primary
-                        wrapMode: QQC2.Label.Wrap
-                        text: room ? room.displayName : i18n("No name")
-                        textFormat: Text.PlainText
-                    }
-                    TextEdit {
-                        Layout.fillWidth: true
-                        textFormat: TextEdit.PlainText
-                        wrapMode: Text.WordWrap
-                        selectByMouse: true
-                        color: Kirigami.Theme.textColor
-                        selectedTextColor: Kirigami.Theme.highlightedTextColor
-                        selectionColor: Kirigami.Theme.highlightColor
-                        readOnly: true
-                        text: room && room.canonicalAlias ? room.canonicalAlias : i18n("No Canonical Alias")
+                    text: room && room.topic ? room.topic.replace(replaceLinks, "<a href=\"$1\">$1</a>") : i18n("No Topic")
+                    readonly property var replaceLinks: /(http[s]?:\/\/[^ \r\n]*)/g
+                    textFormat: TextEdit.MarkdownText
+                    wrapMode: Text.WordWrap
+                    selectByMouse: true
+                    color: Kirigami.Theme.textColor
+                    selectedTextColor: Kirigami.Theme.highlightedTextColor
+                    selectionColor: Kirigami.Theme.highlightColor
+                    onLinkActivated: UrlHelper.openUrl(link)
+                    readOnly: true
+                    MouseArea {
+                        anchors.fill: parent
+                        acceptedButtons: Qt.NoButton
+                        cursorShape: parent.hoveredLink ? Qt.PointingHandCursor : Qt.IBeamCursor
                     }
                 }
             }
 
-            TextEdit {
-                Layout.leftMargin: Kirigami.Units.largeSpacing
-                Layout.rightMargin: Kirigami.Units.largeSpacing
-                Layout.fillWidth: true
-                text: room && room.topic ? room.topic.replace(replaceLinks, "<a href=\"$1\">$1</a>") : i18n("No Topic")
-                readonly property var replaceLinks: /(http[s]?:\/\/[^ \r\n]*)/g
-                textFormat: TextEdit.MarkdownText
-                wrapMode: Text.WordWrap
-                selectByMouse: true
-                color: Kirigami.Theme.textColor
-                selectedTextColor: Kirigami.Theme.highlightedTextColor
-                selectionColor: Kirigami.Theme.highlightColor
-                onLinkActivated: UrlHelper.openUrl(link)
-                readOnly: true
-                MouseArea {
-                    anchors.fill: parent
-                    acceptedButtons: Qt.NoButton
-                    cursorShape: parent.hoveredLink ? Qt.PointingHandCursor : Qt.IBeamCursor
-                }
-            }
-
-            Kirigami.ListSectionHeader {
-                label: i18n("Options")
-                activeFocusOnTab: false
-            }
-
-            Kirigami.BasicListItem {
-                id: devtoolsButton
-
-                icon: "tools"
-                text: i18n("Open developer tools")
-                visible: Config.developerTools
-
-                onClicked: {
-                    applicationWindow().pageStack.layers.push("qrc:/DevtoolsPage.qml", {room: room}, {title: i18n("Developer Tools")})
-                    roomDrawer.close();
-                }
-            }
-            Kirigami.BasicListItem {
-                id: searchButton
-
-                icon: "search"
-                text: i18n("Search in this room")
-
-                onClicked: {
-                    pageStack.pushDialogLayer("qrc:/SearchPage.qml", {
-                        currentRoom: room
-                    }, {
-                        title: i18nc("@action:title", "Search")
-                    })
-                }
-            }
-            Kirigami.BasicListItem {
-                id: favouriteButton
-
-                icon: room && room.isFavourite ? "rating" : "rating-unrated"
-                text: room && room.isFavourite ? i18n("Remove room from favorites") : i18n("Make room favorite")
-
-                onClicked: room.isFavourite ? room.removeTag("m.favourite") : room.addTag("m.favourite", 1.0)
-            }
-
             Kirigami.ListSectionHeader {
                 label: i18n("Members")
                 activeFocusOnTab: false
-                spacing: 0
-
-                QQC2.ToolButton {
-                    id: memberSearchToggle
-                    checkable: true
-                    icon.name: "search"
-                    QQC2.ToolTip.text: i18n("Search user in room")
-                    QQC2.ToolTip.visible: hovered
-                    QQC2.ToolTip.delay: Kirigami.Units.toolTipDelay
-                }
-
-                QQC2.ToolButton {
-                    visible: roomDrawer.room.canSendState("invite")
-                    icon.name: "list-add-user"
-
-                    onClicked: {
-                        applicationWindow().pageStack.layers.push("qrc:/InviteUserPage.qml", {room: roomDrawer.room})
-                        roomDrawer.close();
-                    }
-
-                    QQC2.ToolTip.text: i18n("Invite user to room")
-                    QQC2.ToolTip.visible: hovered
-                    QQC2.ToolTip.delay: Kirigami.Units.toolTipDelay
-                }
 
                 QQC2.Label {
                     Layout.alignment: Qt.AlignRight
@@ -260,15 +275,12 @@ Kirigami.OverlayDrawer {
 
             Kirigami.SearchField {
                 id: userListSearchField
-                visible: memberSearchToggle.checked
 
                 Layout.fillWidth: true
                 Layout.leftMargin: Kirigami.Units.largeSpacing - 1
                 Layout.rightMargin: Kirigami.Units.largeSpacing - 1
                 Layout.bottomMargin: Kirigami.Units.smallSpacing
 
-                focusSequence: "Ctrl+Shift+F"
-
                 onAccepted: sortedMessageEventModel.filterString = text;
             }
 
@@ -366,4 +378,10 @@ Kirigami.OverlayDrawer {
 
         UserDetailDialog {}
     }
+
+    Component {
+        id: confirmEncryptionDialog
+
+        ConfirmEncryptionDialog {}
+    }
 }

src/qml/RoomSettings/Categories.qml

@@ -31,16 +31,6 @@ Kirigami.CategorizedSettings {
                 }
             }
         },
-        Kirigami.SettingAction {
-            text: i18n("Permissions")
-            icon.name: "visibility"
-            page: Qt.resolvedUrl("Permissions.qml")
-            initialProperties: {
-                return {
-                    room: root.room
-                }
-            }
-        },
         Kirigami.SettingAction {
             text: i18n("Notifications")
             icon.name: "notifications"

src/qml/RoomSettings/General.qml

@@ -119,33 +119,6 @@ Kirigami.ScrollablePage {
                         }
                     }
                 }
-                MobileForm.FormTextDelegate {
-                    text: i18n("Room ID")
-                    description: room.id
-                }
-                MobileForm.FormTextDelegate {
-                    text: i18n("Room version")
-                    description: room.version
-
-                    contentItem.children: QQC2.Button {
-                        visible: room.canSwitchVersions()
-                        enabled: room.version < room.maxRoomVersion
-                        text: i18n("Upgrade Room")
-                        icon.name: "arrow-up-double"
-
-                        onClicked: {
-                            if (room.canSwitchVersions()) {
-                                roomUpgradeSheet.currentRoomVersion = room.version
-                                roomUpgradeSheet.open()
-                            }
-                        }
-
-                        QQC2.ToolTip {
-                            text: text
-                            delay: Kirigami.Units.toolTipDelay
-                        }
-                    }
-                }
             }
         }
         MobileForm.FormCard {
@@ -283,30 +256,6 @@ Kirigami.ScrollablePage {
 
             OpenFileDialog {}
         }
-
-        Kirigami.OverlaySheet {
-            id: roomUpgradeSheet
-
-            property var currentRoomVersion
-
-            title: i18n("Upgrade the Room")
-            Kirigami.FormLayout {
-                QQC2.SpinBox {
-                    id: spinBox
-                    Kirigami.FormData.label: i18n("Select new version")
-                    from: room.version
-                    to: room.maxRoomVersion
-                    value: room.version
-                }
-                QQC2.Button {
-                    text: i18n("Confirm")
-                    onClicked: {
-                        room.switchVersion(spinBox.value)
-                        roomUpgradeSheet.close()
-                    }
-                }
-            }
-        }
     }
 }
 

src/qml/RoomSettings/Permissions.qml

@@ -1,453 +0,0 @@
-// SPDX-FileCopyrightText: 2022 James Graham <james.h.graham@protonmail.com>
-// SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
-
-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.kirigamiaddons.labs.mobileform 0.1 as MobileForm
-import org.kde.kitemmodels 1.0
-
-import org.kde.neochat 1.0
-
-Kirigami.ScrollablePage {
-    id: root
-
-    property var room
-
-    title: i18nc('@title:window', 'Permissions')
-
-    leftPadding: 0
-    rightPadding: 0
-
-    UserListModel {
-        id: userListModel
-        room: root.room
-    }
-
-    ListModel {
-        id: powerLevelModel
-        ListElement {text: "Member (0)"; powerLevel: 0}
-        ListElement {text: "Moderator (50)"; powerLevel: 50}
-        ListElement {text: "Admin (100)"; powerLevel: 100}
-    }
-
-    ColumnLayout {
-        MobileForm.FormCard {
-            Layout.fillWidth: true
-            contentItem: ColumnLayout {
-                spacing: 0
-                MobileForm.FormCardHeader {
-                    title: i18n("Privileged Users")
-                }
-                Repeater {
-                    model: KSortFilterProxyModel {
-                        sourceModel: userListModel
-                        sortRole: "perm"
-                        filterRowCallback: function(source_row, source_parent) {
-                            let permRole = sourceModel.data(sourceModel.index(source_row, 0, source_parent), Qt.UserRole + 5)
-                            return permRole != UserType.Muted && permRole != UserType.Member;
-                        }
-                    }
-                    delegate: MobileForm.FormTextDelegate {
-                        text: name
-                        description: userId
-                        contentItem.children: RowLayout {
-                            spacing: Kirigami.Units.largeSpacing
-                            QQC2.Label {
-                                visible: !room.canSendState("m.room.power_levels")
-                                text: {
-                                    switch (perm) {
-                                        case UserType.Owner:
-                                            return i18n("Owner");
-                                        case UserType.Admin:
-                                            return i18n("Admin");
-                                        case UserType.Moderator:
-                                            return i18n("Mod");
-                                        case UserType.Muted:
-                                            return i18n("Muted");
-                                        case UserType.Member:
-                                            return i18n("Member");
-                                        default:
-                                            return ""
-                                    }
-                                }
-                                color: Kirigami.Theme.disabledTextColor
-                            }
-                            QQC2.ComboBox {
-                                focusPolicy: Qt.NoFocus // provided by parent
-                                model: powerLevelModel
-                                textRole: "text"
-                                valueRole: "powerLevel"
-                                visible: room.canSendState("m.room.power_levels")
-                                Component.onCompleted: currentIndex = indexOfValue(powerLevel)
-                                onActivated: {
-                                    room.setUserPowerLevel(userId, currentValue)
-                                }
-                            }
-                        }
-                    }
-                }
-                MobileForm.FormDelegateSeparator { below: userListSearchCard }
-                MobileForm.AbstractFormDelegate {
-                    id: userListSearchCard
-                    Layout.fillWidth: true
-                    visible: room.canSendState("m.room.power_levels")
-
-                    contentItem: Kirigami.SearchField {
-                            id: userListSearchField
-                            Layout.fillWidth: true
-                            autoAccept: false
-
-                            Keys.onUpPressed: userListView.decrementCurrentIndex()
-                            Keys.onDownPressed: userListView.incrementCurrentIndex()
-
-                            onAccepted: {
-                                let currentUser = userListView.itemAtIndex(userListView.currentIndex);
-                                currentUser.action.trigger();
-                            }
-                    }
-                    QQC2.Popup {
-                        id: userListSearchPopup
-
-                        x: userListSearchField.x
-                        y: userListSearchField.y - height
-                        width: userListSearchField.width
-                        height: {
-                            let maxHeight = userListSearchField.mapToGlobal(userListSearchField.x, userListSearchField.y).y - Kirigami.Units.largeSpacing * 3;
-                            let minHeight = Kirigami.Units.gridUnit * 2 + userListSearchPopup.padding * 2;
-                            let filterContentHeight = userListView.contentHeight + userListSearchPopup.padding * 2;
-
-                            return Math.max(Math.min(filterContentHeight, maxHeight), minHeight);
-                        }
-                        padding: Kirigami.Units.smallSpacing
-                        modal: false
-                        onClosed: userListSearchField.text = ""
-
-                        background: Kirigami.ShadowedRectangle {
-                            radius: 4
-                            color: Kirigami.Theme.backgroundColor
-
-                            property color borderColor: Kirigami.Theme.textColor
-                            border.color: Qt.rgba(borderColor.r, borderColor.g, borderColor.b, 0.3)
-                            border.width: 1
-
-                            shadow.xOffset: 0
-                            shadow.yOffset: 4
-                            shadow.color: Qt.rgba(0, 0, 0, 0.3)
-                            shadow.size: 8
-                        }
-
-                        contentItem: QQC2.ScrollView {
-                            // HACK: Hide unnecessary horizontal scrollbar (https://bugreports.qt.io/browse/QTBUG-83890)
-                            QQC2.ScrollBar.horizontal.policy: QQC2.ScrollBar.AlwaysOff
-
-                            ListView {
-                                id: userListView
-                                clip: true
-
-                                model: UserFilterModel {
-                                    id: userListFilterModel
-                                    sourceModel: userListModel
-                                    filterText: userListSearchField.text
-
-                                    onFilterTextChanged: {
-                                        if (filterText.length > 0 && !userListSearchPopup.visible) {
-                                            userListSearchPopup.open()
-                                        } else if (filterText.length <= 0 && userListSearchPopup.visible) {
-                                            userListSearchPopup.close()
-                                        }
-                                    }
-                                }
-
-                                delegate: Kirigami.BasicListItem {
-                                    id: userListItem
-
-                                    implicitHeight: Kirigami.Units.gridUnit * 2
-                                    leftPadding: Kirigami.Units.largeSpacing + Kirigami.Units.smallSpacing
-
-                                    label: name
-                                    labelItem.textFormat: Text.PlainText
-                                    subtitle: userId
-                                    subtitleItem.textFormat: Text.PlainText
-
-                                    action: Kirigami.Action {
-                                        id: editPowerLevelAction
-                                        onTriggered: {
-                                            userListSearchPopup.close()
-                                            powerLevelSheet.userId = userId
-                                            powerLevelSheet.powerLevel = powerLevel
-                                            powerLevelSheet.open()
-                                        }
-                                    }
-
-                                    leading: Kirigami.Avatar {
-                                        implicitWidth: height
-                                        sourceSize.height: Kirigami.Units.gridUnit + Kirigami.Units.smallSpacing * 2.5
-                                        sourceSize.width: Kirigami.Units.gridUnit + Kirigami.Units.smallSpacing * 2.5
-                                        source: avatar ? ("image://mxc/" + avatar) : ""
-                                        name: model.userId
-                                    }
-
-                                    trailing: QQC2.Label {
-                                        visible: perm != UserType.Member
-
-                                        text: {
-                                            switch (perm) {
-                                                case UserType.Owner:
-                                                    return i18n("Owner");
-                                                case UserType.Admin:
-                                                    return i18n("Admin");
-                                                case UserType.Moderator:
-                                                    return i18n("Mod");
-                                                case UserType.Muted:
-                                                    return i18n("Muted");
-                                                default:
-                                                    return "";
-                                            }
-                                        }
-                                        color: Kirigami.Theme.disabledTextColor
-                                        textFormat: Text.PlainText
-                                        wrapMode: Text.NoWrap
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        MobileForm.FormCard {
-            Layout.fillWidth: true
-            Layout.topMargin: Kirigami.Units.largeSpacing
-            visible: room.canSendState("m.room.power_levels")
-            contentItem: ColumnLayout {
-                spacing: 0
-                MobileForm.FormCardHeader {
-                    title: i18n("Default permissions")
-                }
-                MobileForm.FormComboBoxDelegate {
-                    text: i18n("Default user power level")
-                    description: i18n("This is power level for all new users when joining the room")
-                    textRole: "text"
-                    valueRole: "powerLevel"
-                    model: powerLevelModel
-                    Component.onCompleted: currentIndex = indexOfValue(room.defaultUserPowerLevel)
-                    onCurrentValueChanged: if(room.canSendState("m.room.power_levels")) room.defaultUserPowerLevel = currentValue
-                }
-                MobileForm.FormComboBoxDelegate {
-                    text: i18n("Default power level to set the room state")
-                    description: i18n("This is used for all state events that do not have their own entry here")
-                    textRole: "text"
-                    valueRole: "powerLevel"
-                    model: powerLevelModel
-                    Component.onCompleted: currentIndex = indexOfValue(room.statePowerLevel)
-                    onCurrentValueChanged: if(room.canSendState("m.room.power_levels")) room.statePowerLevel = currentValue
-                }
-                MobileForm.FormComboBoxDelegate {
-                    text: i18n("Default power level to send messages")
-                    description: i18n("This is used for all message events that do not have their own entry here")
-                    textRole: "text"
-                    valueRole: "powerLevel"
-                    model: powerLevelModel
-                    Component.onCompleted: currentIndex = indexOfValue(room.defaultEventPowerLevel)
-                    onCurrentValueChanged: if(room.canSendState("m.room.power_levels")) room.defaultEventPowerLevel = currentValue
-                }
-            }
-        }
-        MobileForm.FormCard {
-            Layout.fillWidth: true
-            Layout.topMargin: Kirigami.Units.largeSpacing
-            visible: room.canSendState("m.room.power_levels")
-            contentItem: ColumnLayout {
-                spacing: 0
-                MobileForm.FormCardHeader {
-                    title: i18n("Basic permissions")
-                }
-                MobileForm.FormComboBoxDelegate {
-                    text: i18n("Invite users")
-                    textRole: "text"
-                    valueRole: "powerLevel"
-                    model: powerLevelModel
-                    Component.onCompleted: currentIndex = indexOfValue(room.invitePowerLevel)
-                    onCurrentValueChanged: if(room.canSendState("m.room.power_levels")) room.invitePowerLevel = currentValue
-                }
-                MobileForm.FormComboBoxDelegate {
-                    text: i18n("Kick users")
-                    textRole: "text"
-                    valueRole: "powerLevel"
-                    model: powerLevelModel
-                    Component.onCompleted: currentIndex = indexOfValue(room.kickPowerLevel)
-                    onCurrentValueChanged: if(room.canSendState("m.room.power_levels")) room.kickPowerLevel = currentValue
-                }
-                MobileForm.FormComboBoxDelegate {
-                    text: i18n("Ban users")
-                    textRole: "text"
-                    valueRole: "powerLevel"
-                    model: powerLevelModel
-                    Component.onCompleted: currentIndex = indexOfValue(room.banPowerLevel)
-                    onCurrentValueChanged: if(room.canSendState("m.room.power_levels")) room.banPowerLevel = currentValue
-                }
-                MobileForm.FormComboBoxDelegate {
-                    text: i18n("Remove message sent by other users")
-                    textRole: "text"
-                    valueRole: "powerLevel"
-                    model: powerLevelModel
-                    Component.onCompleted: currentIndex = indexOfValue(room.redactPowerLevel)
-                    onCurrentValueChanged: if(room.canSendState("m.room.power_levels")) room.redactPowerLevel = currentValue
-                }
-            }
-        }
-        MobileForm.FormCard {
-            Layout.fillWidth: true
-            Layout.topMargin: Kirigami.Units.largeSpacing
-            visible: room.canSendState("m.room.power_levels")
-            contentItem: ColumnLayout {
-                spacing: 0
-                MobileForm.FormCardHeader {
-                    title: i18n("Event permissions")
-                }
-                MobileForm.FormComboBoxDelegate {
-                    text: i18n("Change user permissions")
-                    description: "m.room.power_levels"
-                    textRole: "text"
-                    valueRole: "powerLevel"
-                    model: powerLevelModel
-                    Component.onCompleted: currentIndex = indexOfValue(room.powerLevelPowerLevel)
-                    onCurrentValueChanged: if(room.canSendState("m.room.power_levels")) room.powerLevelPowerLevel = currentValue
-                }
-                MobileForm.FormComboBoxDelegate {
-                    text: i18n("Change the room name")
-                    description: "m.room.name"
-                    textRole: "text"
-                    valueRole: "powerLevel"
-                    model: powerLevelModel
-                    Component.onCompleted: currentIndex = indexOfValue(room.namePowerLevel)
-                    onCurrentValueChanged: if(room.canSendState("m.room.power_levels")) room.namePowerLevel = currentValue
-                }
-                MobileForm.FormComboBoxDelegate {
-                    text: i18n("Change the room avatar")
-                    description: "m.room.avatar"
-                    textRole: "text"
-                    valueRole: "powerLevel"
-                    model: powerLevelModel
-                    Component.onCompleted: currentIndex = indexOfValue(room.avatarPowerLevel)
-                    onCurrentValueChanged: if(room.canSendState("m.room.power_levels")) room.avatarPowerLevel = currentValue
-                }
-                MobileForm.FormComboBoxDelegate {
-                    text: i18n("Change the room canonical alias")
-                    description: "m.room.canonical_alias"
-                    textRole: "text"
-                    valueRole: "powerLevel"
-                    model: powerLevelModel
-                    Component.onCompleted: currentIndex = indexOfValue(room.canonicalAliasPowerLevel)
-                    onCurrentValueChanged: if(room.canSendState("m.room.power_levels")) room.canonicalAliasPowerLevel = currentValue
-                }
-                MobileForm.FormComboBoxDelegate {
-                    text: i18n("Change the room topic")
-                    description: "m.room.topic"
-                    textRole: "text"
-                    valueRole: "powerLevel"
-                    model: powerLevelModel
-                    Component.onCompleted: currentIndex = indexOfValue(room.topicPowerLevel)
-                    onCurrentValueChanged: if(room.canSendState("m.room.power_levels")) room.topicPowerLevel = currentValue
-                }
-                MobileForm.FormComboBoxDelegate {
-                    text: i18n("Enable encryption for the room")
-                    description: "m.room.encryption"
-                    textRole: "text"
-                    valueRole: "powerLevel"
-                    model: powerLevelModel
-                    Component.onCompleted: currentIndex = indexOfValue(room.encryptionPowerLevel)
-                    onCurrentValueChanged: if(room.canSendState("m.room.power_levels")) room.encryptionPowerLevel = currentValue
-                }
-                MobileForm.FormComboBoxDelegate {
-                    text: i18n("Change the room history visibility")
-                    description: "m.room.history_visibility"
-                    textRole: "text"
-                    valueRole: "powerLevel"
-                    model: powerLevelModel
-                    Component.onCompleted: currentIndex = indexOfValue(room.historyVisibilityPowerLevel)
-                    onCurrentValueChanged: if(room.canSendState("m.room.power_levels")) room.historyVisibilityPowerLevel = currentValue
-                }
-                MobileForm.FormComboBoxDelegate {
-                    text: i18n("Set pinned events")
-                    description: "m.room.pinned_events"
-                    textRole: "text"
-                    valueRole: "powerLevel"
-                    model: powerLevelModel
-                    Component.onCompleted: currentIndex = indexOfValue(room.pinnedEventsPowerLevel)
-                    onCurrentValueChanged: if(room.canSendState("m.room.power_levels")) room.pinnedEventsPowerLevel = currentValue
-                }
-                MobileForm.FormComboBoxDelegate {
-                    text: i18n("Upgrade the room")
-                    description: "m.room.tombstone"
-                    textRole: "text"
-                    valueRole: "powerLevel"
-                    model: powerLevelModel
-                    Component.onCompleted: currentIndex = indexOfValue(room.tombstonePowerLevel)
-                    onCurrentValueChanged: if(room.canSendState("m.room.power_levels")) room.tombstonePowerLevel = currentValue
-                }
-                MobileForm.FormComboBoxDelegate {
-                    text: i18n("Set the room server access control list (ACL)")
-                    description: "m.room.server_acl"
-                    textRole: "text"
-                    valueRole: "powerLevel"
-                    model: powerLevelModel
-                    Component.onCompleted: currentIndex = indexOfValue(room.serverAclPowerLevel)
-                    onCurrentValueChanged: if(room.canSendState("m.room.power_levels")) room.serverAclPowerLevel = currentValue
-                }
-                MobileForm.FormComboBoxDelegate {
-                    visible: room.isSpace
-                    text: i18n("Set the children of this space")
-                    description: "m.space.child"
-                    textRole: "text"
-                    valueRole: "powerLevel"
-                    model: powerLevelModel
-                    Component.onCompleted: currentIndex = indexOfValue(room.spaceChildPowerLevel)
-                    onCurrentValueChanged: if(room.canSendState("m.room.power_levels")) room.spaceChildPowerLevel = currentValue
-                }
-                MobileForm.FormComboBoxDelegate {
-                    text: i18n("Set the parent space of this room")
-                    description: "m.space.parent"
-                    textRole: "text"
-                    valueRole: "powerLevel"
-                    model: powerLevelModel
-                    Component.onCompleted: currentIndex = indexOfValue(room.spaceChildPowerLevel)
-                    onCurrentValueChanged: if(room.canSendState("m.room.power_levels")) room.spaceParentPowerLevel = currentValue
-                }
-            }
-        }
-    }
-    Kirigami.OverlaySheet {
-        id: powerLevelSheet
-        title: i18n("Edit user power level")
-
-        property var userId
-        property int powerLevel
-
-        onSheetOpenChanged: {
-            if (sheetOpen) {
-                powerLevelComboBox.currentIndex = powerLevelComboBox.indexOfValue(powerLevelSheet.powerLevel)
-            }
-        }
-        Kirigami.FormLayout {
-            QQC2.ComboBox {
-                id: powerLevelComboBox
-                focusPolicy: Qt.NoFocus // provided by parent
-                model: powerLevelModel
-                textRole: "text"
-                valueRole: "powerLevel"
-                visible: room.canSendState("m.room.power_levels")
-            }
-            QQC2.Button {
-                text: i18n("Confirm")
-                onClicked: {
-                    room.setUserPowerLevel(powerLevelSheet.userId, powerLevelComboBox.currentValue)
-                    powerLevelSheet.close()
-                }
-            }
-        }
-    }
-}

src/qml/RoomSettings/Security.qml

@@ -14,7 +14,6 @@ Kirigami.ScrollablePage {
     id: root
 
     property var room
-    property string needUpgradeRoom: i18n("You need to upgrade this room to a newer version to enable this setting.")
 
     title: i18n("Security")
 
@@ -22,29 +21,6 @@ Kirigami.ScrollablePage {
     rightPadding: 0
 
     ColumnLayout {
-        MobileForm.FormCard {
-            visible: Controller.encryptionSupported
-            Layout.topMargin: Kirigami.Units.largeSpacing
-            Layout.fillWidth: true
-            contentItem: ColumnLayout {
-                spacing: 0
-                MobileForm.FormCardHeader {
-                    title: i18nc("@option:check", "Encryption")
-                }
-                MobileForm.FormSwitchDelegate {
-                    id: enableEncryptionSwitch
-                    text: i18n("Enable encryption")
-                    description: i18nc("option:check", "Once enabled, encryption cannot be disabled.")
-                    enabled: room.canEncryptRoom
-                    checked: room.usesEncryption
-                    onToggled: if (checked) {
-                        let dialog = confirmEncryptionDialog.createObject(applicationWindow(), {room: room});
-                        dialog.open();
-                    }
-                }
-            }
-        }
-
         MobileForm.FormCard {
             Layout.topMargin: Kirigami.Units.largeSpacing
             Layout.fillWidth: true
@@ -64,25 +40,16 @@ Kirigami.ScrollablePage {
                 }
                 MobileForm.FormRadioDelegate {
                     text: i18nc("@option:check", "Space members")
-                    description: i18n("Anyone in a space can find and join.") +
-                                 (!["8", "9", "10"].includes(room.version) ? `\n${needUpgradeRoom}` : "")
+                    description: !["8", "9", "10"].includes(room.version)
+                                    ? i18n("Anyone in a space can find and join.") + '\n' +
+                                      i18n("You need to upgrade this room to a newer version to enable this setting.")
+                                    : i18n("Anyone in a space can find and join.")
                     checked: room.joinRule === "restricted"
                     enabled: room.canSendState("m.room.join_rules") && ["8", "9", "10"].includes(room.version) && false
                     onCheckedChanged: if (checked) {
                         room.joinRule = "restricted";
                     }
                 }
-                MobileForm.FormRadioDelegate {
-                    text: i18nc("@option:check", "Knock")
-                    description: i18n("People not in the room need to request an invite to join the room.") +
-                                 (!["7", "8", "9", "10"].includes(room.version) ? `\n${needUpgradeRoom}` : "")
-                    checked: room.joinRule === "knock"
-                    // https://spec.matrix.org/v1.4/rooms/#feature-matrix
-                    enabled: room.canSendState("m.room.join_rules") && ["7", "8", "9", "10"].includes(room.version)
-                    onCheckedChanged: if (checked) {
-                        room.joinRule = "knock";
-                    }
-                }
                 MobileForm.FormRadioDelegate {
                     text: i18nc("@option:check", "Public")
                     description: i18nc("@option:check", "Anyone can find and join.")
@@ -155,25 +122,5 @@ Kirigami.ScrollablePage {
             }
         }
     }
-
-    Component {
-        id: confirmEncryptionDialog
-
-        ConfirmEncryptionDialog {
-            onClosed: {
-                // At the point this is executed, the state in the room is not yet changed.
-                // The value will be updated when room.onEncryption() emitted.
-                // This is in case if user simply closed the dialog.
-                enableEncryptionSwitch.checked = false
-            }
-        }
-    }
-
-    Connections {
-        target: room
-        onEncryption: {
-            enableEncryptionSwitch.checked = room.usesEncryption
-        }
-    }
 }
 

src/qml/Settings/AppearanceSettingsPage.qml

@@ -199,20 +199,8 @@ Kirigami.ScrollablePage {
                         }
                     }
                 }
-
-                MobileForm.FormDelegateSeparator { below: compactRoomListDelegate }
-
-                MobileForm.FormCheckDelegate {
-                    id: compactRoomListDelegate
-                    text: i18n("Use compact room list")
-                    checked: Config.compactRoomList
-                    onToggled: {
-                        Config.compactRoomList = checked;
-                        Config.save();
-                    }
-                }
                 
-                MobileForm.FormDelegateSeparator { above: compactRoomListDelegate ; below: colorSchemeDelegate.item ; visible: colorSchemeDelegate.visible }
+                MobileForm.FormDelegateSeparator { below: colorSchemeDelegate.item ; visible: colorSchemeDelegate.visible }
                 
                 Loader {
                     id: colorSchemeDelegate

src/qml/Settings/NetworkProxyPage.qml

@@ -83,7 +83,7 @@ Kirigami.ScrollablePage {
                             value: Config.proxyPort
                             from: 0
                             to: 65536
-                            validator: IntValidator {bottom: portField.from; top: portField.to}
+                            validator: IntValidator {bottom: from; top: to}
                             textFromValue: function(value, locale) {
                                 return value // it will add a thousands separator if we don't do this, not sure why
                             }

src/qml/main.qml

@@ -24,7 +24,6 @@ Kirigami.ApplicationWindow {
     pageStack.initialPage: LoadingPage {}
     pageStack.globalToolBar.canContainHandles: true
 
-    property RoomListPage roomListPage
     property bool roomListLoaded: false
 
     property RoomPage roomPage
@@ -165,7 +164,7 @@ Kirigami.ApplicationWindow {
 
     readonly property int defaultPageWidth: Kirigami.Units.gridUnit * 17
     readonly property int minPageWidth: Kirigami.Units.gridUnit * 10
-    readonly property int collapsedPageWidth: Kirigami.Units.gridUnit * 3 - Kirigami.Units.smallSpacing * 3 + (roomListPage.contentItem.QQC2.ScrollBar.vertical.visible ? roomListPage.contentItem.QQC2.ScrollBar.vertical.width : 0)
+    readonly property int collapsedPageWidth: Kirigami.Units.gridUnit * 3 - Kirigami.Units.smallSpacing * 3
     readonly property bool shouldUseSidebars: RoomManager.hasOpenRoom && (Config.roomListPageWidth > minPageWidth ? root.width >= Kirigami.Units.gridUnit * 35 : root.width > Kirigami.Units.gridUnit * 27) && roomListLoaded
     readonly property int pageWidth: {
         if (Config.roomListPageWidth === -1) {
@@ -352,7 +351,6 @@ Kirigami.ApplicationWindow {
                     activeConnection: Controller.activeConnection
                 });
                 roomListLoaded = true;
-                roomListPage = pageStack.currentItem
                 RoomManager.loadInitialRoom();
             }
         }

src/res.qrc

@@ -16,7 +16,6 @@
         <file alias="Security.qml">qml/RoomSettings/Security.qml</file>
         <file alias="PushNotification.qml">qml/RoomSettings/PushNotification.qml</file>
         <file alias="Categories.qml">qml/RoomSettings/Categories.qml</file>
-        <file alias="Permissions.qml">qml/RoomSettings/Permissions.qml</file>
         <file alias="FullScreenImage.qml">qml/Component/FullScreenImage.qml</file>
         <file alias="UserInfo.qml">qml/Component/UserInfo.qml</file>
         <file alias="FancyEffectsContainer.qml">qml/Component/FancyEffectsContainer.qml</file>

src/userfiltermodel.cpp

@@ -1,28 +0,0 @@
-// SPDX-FileCopyrightText: 2022 James Graham <james.h.graham@protonmail.com>
-// SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
-
-#include "userfiltermodel.h"
-
-#include "userlistmodel.h"
-
-bool UserFilterModel::filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const
-{
-    Q_UNUSED(sourceParent);
-    if (m_filterText.length() < 1) {
-        return false;
-    }
-    return sourceModel()->data(sourceModel()->index(sourceRow, 0), UserListModel::NameRole).toString().contains(m_filterText, Qt::CaseInsensitive)
-        || sourceModel()->data(sourceModel()->index(sourceRow, 0), UserListModel::UserIdRole).toString().contains(m_filterText, Qt::CaseInsensitive);
-}
-
-QString UserFilterModel::filterText() const
-{
-    return m_filterText;
-}
-
-void UserFilterModel::setFilterText(const QString &filterText)
-{
-    m_filterText = filterText;
-    Q_EMIT filterTextChanged();
-    invalidateFilter();
-}

src/userfiltermodel.h

@@ -1,42 +0,0 @@
-// SPDX-FileCopyrightText: 2022 James Graham <james.h.graham@protonmail.com>
-// SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
-
-#pragma once
-
-#include <QSortFilterProxyModel>
-
-/**
- * @class UserFilterModel
- *
- * This class creates a custom QSortFilterProxyModel for filtering a users by either
- * display name or matrix ID. The filter can accept a full matrix id i.e. example:kde.org
- * to separate between accounts on different servers with similar names.
- */
-class UserFilterModel : public QSortFilterProxyModel
-{
-    Q_OBJECT
-
-    /**
-     * @brief This property hold the text of the filter.
-     *
-     * The text is either a desired display name or matrix id.
-     */
-    Q_PROPERTY(QString filterText READ filterText WRITE setFilterText NOTIFY filterTextChanged)
-
-public:
-    /**
-     * @brief Custom filter function checking boith the display name and matrix ID.
-     *
-     * @note The filter cannot be modified and will always use the same filter properties.
-     */
-    bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const override;
-
-    QString filterText() const;
-    void setFilterText(const QString &filterText);
-
-Q_SIGNALS:
-    void filterTextChanged();
-
-private:
-    QString m_filterText;
-};

src/userlistmodel.cpp

@@ -38,7 +38,6 @@ void UserListModel::setRoom(NeoChatRoom *room)
         connect(m_currentRoom, &Room::userRemoved, this, &UserListModel::userRemoved);
         connect(m_currentRoom, &Room::memberAboutToRename, this, &UserListModel::userRemoved);
         connect(m_currentRoom, &Room::memberRenamed, this, &UserListModel::userAdded);
-        connect(m_currentRoom, &Room::changed, this, &UserListModel::refreshAll);
         {
             m_users = m_currentRoom->users();
             std::sort(m_users.begin(), m_users.end(), room->memberSorter());
@@ -133,10 +132,6 @@ QVariant UserListModel::data(const QModelIndex &index, int role) const
 
         return UserType::Member;
     }
-    if (role == PowerLevelRole) {
-        auto pl = m_currentRoom->getCurrentState<RoomPowerLevelsEvent>();
-        return pl->powerLevelForUser(user->id());
-    }
 
     return {};
 }
@@ -188,34 +183,6 @@ void UserListModel::refresh(Quotient::User *user, const QVector<int> &roles)
     }
 }
 
-void UserListModel::refreshAll()
-{
-    beginResetModel();
-    for (User *user : std::as_const(m_users)) {
-        user->disconnect(this);
-    }
-    m_users.clear();
-
-    {
-        m_users = m_currentRoom->users();
-        std::sort(m_users.begin(), m_users.end(), m_currentRoom->memberSorter());
-    }
-    for (User *user : std::as_const(m_users)) {
-#ifdef QUOTIENT_07
-        connect(user, &User::defaultAvatarChanged, this, [this, user]() {
-            avatarChanged(user, m_currentRoom);
-        });
-#else
-        connect(user, &User::avatarChanged, this, &UserListModel::avatarChanged);
-#endif
-    }
-    connect(m_currentRoom->connection(), &Connection::loggedOut, this, [this]() {
-        setRoom(nullptr);
-    });
-    endResetModel();
-    Q_EMIT usersRefreshed();
-}
-
 void UserListModel::avatarChanged(Quotient::User *user, const Quotient::Room *context)
 {
     if (context == m_currentRoom) {
@@ -242,7 +209,6 @@ QHash<int, QByteArray> UserListModel::roleNames() const
     roles[AvatarRole] = "avatar";
     roles[ObjectRole] = "user";
     roles[PermRole] = "perm";
-    roles[PowerLevelRole] = "powerLevel";
 
     return roles;
 }

src/userlistmodel.h

@@ -3,8 +3,6 @@
 
 #pragma once
 
-#include <room.h>
-
 #include <QAbstractListModel>
 #include <QObject>
 
@@ -42,7 +40,6 @@ public:
         AvatarRole,
         ObjectRole,
         PermRole,
-        PowerLevelRole,
     };
 
     UserListModel(QObject *parent = nullptr);
@@ -57,17 +54,13 @@ public:
 
     [[nodiscard]] QHash<int, QByteArray> roleNames() const override;
 
-    // Q_INVOKABLE
-
 Q_SIGNALS:
     void roomChanged();
-    void usersRefreshed();
 
 private Q_SLOTS:
     void userAdded(Quotient::User *user);
     void userRemoved(Quotient::User *user);
     void refresh(Quotient::User *user, const QVector<int> &roles = {});
-    void refreshAll();
     void avatarChanged(Quotient::User *user, const Quotient::Room *context);
 
 private: