Refactor based on better implementation

There are 2 main reason for doing this:
1. Because I can, I wanted to see if I could do it
2. It gets rid of the janky qml re parenting stuff so should be faster.

.kde-ci.yml

@@ -40,4 +40,4 @@ Dependencies:
 
 Options:
   per-test-timeout: 90
-  require-passing-tests-on: [ 'Linux', 'Android', 'FreeBSD' ]
+  require-passing-tests-on: [ '@all' ]

CMakeLists.txt

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

appiumtests/createroomtest.py

@@ -0,0 +1,56 @@
+#!/usr/bin/env python3
+
+# SPDX-License-Identifier: MIT
+# SPDX-FileCopyrightText: 2024 Tobias Fella <tobias.fella@kde.org>
+
+import os
+import subprocess
+import sys
+import unittest
+import time
+
+from appium import webdriver
+from appium.options.common.base import AppiumOptions
+from appium.webdriver.common.appiumby import AppiumBy
+
+
+class CreateRoomTest(unittest.TestCase):
+
+    mockServerProcess: subprocess.Popen
+
+    @classmethod
+    def setUpClass(cls):
+        cls.mockServerProcess = subprocess.Popen([sys.executable, os.path.join(os.path.dirname(__file__), "login-server.py")])
+        options = AppiumOptions()
+        options.set_capability("app", "neochat --ignore-ssl-errors --test")
+        cls.driver = webdriver.Remote(command_executor='http://127.0.0.1:4723', options=options)
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        if not self._outcome.result.wasSuccessful():
+            self.driver.get_screenshot_as_file("failed_test_shot_{}.png".format(self.id()))
+
+    @classmethod
+    def tearDownClass(self):
+        self.mockServerProcess.terminate()
+        self.driver.quit()
+
+    def test_create_room(self):
+        self.driver.find_element(by=AppiumBy.NAME, value="@user:localhost:1234").click()
+        self.driver.find_element(by=AppiumBy.NAME, value="Show Menu").click()
+        self.driver.find_element(by=AppiumBy.NAME, value="Create a Room").click()
+        self.driver.find_element(by=AppiumBy.NAME, value="Name:").send_keys("Super awesome room name")#
+        time.sleep(0.1) # without this, the second half of the text is sent to the topic field?!
+        self.driver.find_element(by=AppiumBy.NAME, value="Topic:").send_keys("There are not enough raccoons here")
+        time.sleep(0.1)
+        self.driver.find_element(by=AppiumBy.NAME, value="Create Room").click()
+        time.sleep(0.1)
+        self.driver.find_element(by=AppiumBy.NAME, value="Super awesome room name").click()
+        self.driver.find_element(by=AppiumBy.NAME, value="Show Room Information").click()
+        self.driver.find_element(by=AppiumBy.NAME, value="There are not enough raccoons here")
+
+
+if __name__ == '__main__':
+    unittest.main()

appiumtests/data/sync_response_new_room.json

@@ -0,0 +1,78 @@
+{
+    "next_batch": "batch1234",
+    "rooms": {
+        "join": {
+            "!newroom123321:localhost:1234": {
+                "state": {
+                    "events": [
+                        {
+                            "type": "m.room.member",
+                            "state_key": "@user:localhost:1234",
+                            "sender": "@user:localhost:1234",
+                            "origin_server_ts": 1432735824653,
+                            "event_id": "$event_id_1234_0:localhost:1234",
+                            "room_id": "!newroom123321:localhost:1234",
+                            "content": {
+                                "avatar_url": "",
+                                "displayname": "A Display Name",
+                                "membership": "join",
+                                "reason": "Nothing"
+                            },
+                            "unsigned": {
+                                "age": 1234
+                            }
+                        },
+                        {
+                            "type": "m.room.name",
+                            "state_key": "",
+                            "sender": "@user:localhost:1234",
+                            "origin_server_ts": 1432735824653,
+                            "event_id": "$event_id_1234_1:localhost:1234",
+                            "room_id": "!newroom123321:localhost:1234",
+                            "content": {
+                                "name": "Super awesome room name"
+                            },
+                            "unsigned": {
+                                "age": 1234
+                            }
+                        },
+                        {
+                            "type": "m.room.topic",
+                            "state_key": "",
+                            "sender": "@user:localhost:1234",
+                            "origin_server_ts": 1432735824653,
+                            "event_id": "$event_id_1234_2:localhost:1234",
+                            "room_id": "!newroom123321:localhost:1234",
+                            "content": {
+                                "topic": "There are not enough raccoons here"
+                            },
+                            "unsigned": {
+                                "age": 1234
+                            }
+                        }
+                    ]
+                },
+                "timeline": {
+                    "events": [
+                        {
+                            "type": "m.room.message",
+                            "sender": "@user:localhost:1234",
+                            "origin_server_ts": 1432735824653,
+                            "event_id": "$event_id_1234_1:localhost:1234",
+                            "room_id": "!newroom123321:localhost:1234",
+                            "content": {
+                                "body": "This is a message",
+                                "format": "org.matrix.custom.html",
+                                "formatted_body": "<a href=\"https://matrix.to/#/@user:localhost:1234\">User</a>:",
+                                "msgtype": "m.text"
+                            },
+                            "unsigned": {
+                                "age": 1234
+                            }
+                        }
+                    ]
+                }
+            }
+        }
+    }
+}

appiumtests/login-server.py

@@ -6,6 +6,8 @@ from flask import Flask, request, abort
 import os
 app = Flask(__name__)
 
+next_sync_payload = ""
+
 
 @app.route("/_matrix/client/v3/login", methods=["GET"])
 def login_get():
@@ -42,8 +44,13 @@ def load_json(name):
 
 @app.route("/_matrix/client/r0/sync")
 def sync():
-
+    global next_sync_payload
-    result = load_json("sync_response_no_rooms") if ("login" in request.headers.get("Authorization")) else load_json("sync_response_rooms")
+    result = dict()
+    if len(next_sync_payload) > 0:
+        result = load_json(next_sync_payload)
+        next_sync_payload = ""
+    else:
+        result = load_json("sync_response_no_rooms") if ("login" in request.headers.get("Authorization")) else load_json("sync_response_rooms")
     return result
 
 @app.route("/.well-known/matrix/client")
@@ -65,6 +72,18 @@ def upload_keys():
     reply = dict()
     return reply
 
+@app.route("/_matrix/client/v3/createRoom", methods=["POST"])
+def create_room():
+    global next_sync_payload
+    data = request.get_json()
+    if data["name"] != "Super awesome room name" or data["topic"] != "There are not enough raccoons here":
+        return dict(), 400
+    response = dict()
+    response["room_id"] = "!newroom123321:localhost:1234"
+    next_sync_payload = "sync_response_new_room"
+    return response
+
+
 
 if __name__ == "__main__":
     app.run(ssl_context='adhoc', port=1234)

autotests/data/test-invalidmatrixtolink-event.json

@@ -1,14 +0,0 @@
-{
-    "content": {
-        "body": "https://matrix.to/#/@alice:example.org",
-        "msgtype": "m.text"
-    },
-    "event_id": "$validlink1:example.org",
-    "origin_server_ts": 1432735824654,
-    "room_id": "!test:example.org",
-    "sender": "@example:example.org",
-    "type": "m.room.message",
-    "unsigned": {
-        "age": 1234
-    }
-}

autotests/data/test-invalidmxclink-event.json

@@ -1,14 +0,0 @@
-{
-    "content": {
-        "body": "mxc://example.org/SEsfnsuifSDFSSEF",
-        "msgtype": "m.text"
-    },
-    "event_id": "$validlink1:example.org",
-    "origin_server_ts": 1432735824654,
-    "room_id": "!test:example.org",
-    "sender": "@example:example.org",
-    "type": "m.room.message",
-    "unsigned": {
-        "age": 1234
-    }
-}

autotests/data/test-invalidnospacelink-event.json

@@ -1,14 +0,0 @@
-{
-    "content": {
-        "body": "testhttps://kde.org",
-        "msgtype": "m.text"
-    },
-    "event_id": "$validlink1:example.org",
-    "origin_server_ts": 1432735824654,
-    "room_id": "!test:example.org",
-    "sender": "@example:example.org",
-    "type": "m.room.message",
-    "unsigned": {
-        "age": 1234
-    }
-}

autotests/data/test-validplainlink-event.json

@@ -1,14 +0,0 @@
-{
-    "content": {
-        "body": "https://kde.org",
-        "msgtype": "m.text"
-    },
-    "event_id": "$validlink1:example.org",
-    "origin_server_ts": 1432735824654,
-    "room_id": "!test:example.org",
-    "sender": "@example:example.org",
-    "type": "m.room.message",
-    "unsigned": {
-        "age": 1234
-    }
-}

autotests/data/test-validplainwwwlink-event.json

@@ -1,14 +0,0 @@
-{
-    "content": {
-        "body": "www.example.org",
-        "msgtype": "m.text"
-    },
-    "event_id": "$validlink1:example.org",
-    "origin_server_ts": 1432735824654,
-    "room_id": "!test:example.org",
-    "sender": "@example:example.org",
-    "type": "m.room.message",
-    "unsigned": {
-        "age": 1234
-    }
-}

autotests/data/test-validrichlink-event.json

@@ -1,16 +0,0 @@
-{
-    "content": {
-        "body": "[Rich Link](https://kde.org)",
-        "format": "org.matrix.custom.html",
-        "formatted_body": "<a href=\"https://kde.org\">Rich Link</a>",
-        "msgtype": "m.text"
-    },
-    "event_id": "$validlink1:example.org",
-    "origin_server_ts": 1432735824654,
-    "room_id": "!test:example.org",
-    "sender": "@example:example.org",
-    "type": "m.room.message",
-    "unsigned": {
-        "age": 1234
-    }
-}

autotests/eventhandlertest.cpp

@@ -56,6 +56,7 @@ private Q_SLOTS:
     void genericBody();
     void nullGenericBody();
     void markdownBody();
+    void markdownBodyReply();
     void subtitle();
     void nullSubtitle();
     void mediaInfo();
@@ -301,6 +302,13 @@ void EventHandlerTest::markdownBody()
     QCOMPARE(eventHandler.getMarkdownBody(), QStringLiteral("This is an example\ntext message"));
 }
 
+void EventHandlerTest::markdownBodyReply()
+{
+    EventHandler eventHandler(room, room->messageEvents().at(5).get());
+
+    QCOMPARE(eventHandler.getMarkdownBody(), QStringLiteral("reply"));
+}
+
 void EventHandlerTest::subtitle()
 {
     EventHandler eventHandler(room, room->messageEvents().at(0).get());

autotests/linkpreviewertest.cpp

@@ -6,12 +6,11 @@
 
 #include "linkpreviewer.h"
 
+#include "utils.h"
 #include <Quotient/events/roommessageevent.h>
 #include <Quotient/quotient_common.h>
 #include <Quotient/syncdata.h>
 
-#include "utils.h"
-
 #include "testutils.h"
 
 using namespace Quotient;
@@ -30,6 +29,9 @@ private Q_SLOTS:
     void linkPreviewsMatch_data();
     void linkPreviewsMatch();
 
+    void multipleLinkPreviewsMatch_data();
+    void multipleLinkPreviewsMatch();
+
     void linkPreviewsReject_data();
     void linkPreviewsReject();
 };
@@ -42,45 +44,59 @@ void LinkPreviewerTest::initTestCase()
 
 void LinkPreviewerTest::linkPreviewsMatch_data()
 {
-    QTest::addColumn<QString>("eventSource");
+    QTest::addColumn<QString>("inputString");
     QTest::addColumn<QUrl>("testOutputLink");
 
-    QTest::newRow("plainHttps") << QStringLiteral("test-validplainlink-event.json") << QUrl("https://kde.org"_ls);
+    QTest::newRow("plainHttps") << QStringLiteral("https://kde.org") << QUrl("https://kde.org"_ls);
-    QTest::newRow("richHttps") << QStringLiteral("test-validrichlink-event.json") << QUrl("https://kde.org"_ls);
+    QTest::newRow("richHttps") << QStringLiteral("<a href=\"https://kde.org\">Rich Link</a>") << QUrl("https://kde.org"_ls);
-    QTest::newRow("plainWww") << QStringLiteral("test-validplainwwwlink-event.json") << QUrl("www.example.org"_ls);
+    QTest::newRow("richHttpsLinkDescription") << QStringLiteral("<a href=\"https://kde.org\">https://kde.org</a>") << QUrl("https://kde.org"_ls);
-    QTest::newRow("multipleHttps") << QStringLiteral("test-multiplelink-event.json") << QUrl("www.example.org"_ls);
 }
 
 void LinkPreviewerTest::linkPreviewsMatch()
 {
-    QFETCH(QString, eventSource);
+    QFETCH(QString, inputString);
     QFETCH(QUrl, testOutputLink);
 
-    auto event = TestUtils::loadEventFromFile<RoomMessageEvent>(eventSource);
+    auto link = LinkPreviewer::linkPreviews(inputString)[0];
-    auto linkPreviewer = LinkPreviewer(LinkPreviewer::linkPreview(event.get()), connection);
 
-    QCOMPARE(linkPreviewer.empty(), false);
+    QCOMPARE(link, testOutputLink);
-    QCOMPARE(linkPreviewer.url(), testOutputLink);
+}
+
+void LinkPreviewerTest::multipleLinkPreviewsMatch_data()
+{
+    QTest::addColumn<QString>("inputString");
+    QTest::addColumn<QList<QUrl>>("testOutputLinks");
+
+    QTest::newRow("multipleHttps") << QStringLiteral("www.example.org https://kde.org") << QList{QUrl("www.example.org"_ls), QUrl("https://kde.org"_ls)};
+    QTest::newRow("multipleHttps1Invalid") << QStringLiteral("www.example.org mxc://example.org/SEsfnsuifSDFSSEF") << QList{QUrl("www.example.org"_ls)};
+}
+
+void LinkPreviewerTest::multipleLinkPreviewsMatch()
+{
+    QFETCH(QString, inputString);
+    QFETCH(QList<QUrl>, testOutputLinks);
+
+    auto links = LinkPreviewer::linkPreviews(inputString);
+
+    QCOMPARE(links, testOutputLinks);
 }
 
 void LinkPreviewerTest::linkPreviewsReject_data()
 {
-    QTest::addColumn<QString>("eventSource");
+    QTest::addColumn<QString>("inputString");
 
-    QTest::newRow("mxc") << QStringLiteral("test-invalidmxclink-event.json");
+    QTest::newRow("mxc") << QStringLiteral("mxc://example.org/SEsfnsuifSDFSSEF");
-    QTest::newRow("matrixTo") << QStringLiteral("test-invalidmatrixtolink-event.json");
+    QTest::newRow("matrixTo") << QStringLiteral("https://matrix.to/#/@alice:example.org");
-    QTest::newRow("noSpace") << QStringLiteral("test-invalidnospacelink-event.json");
+    QTest::newRow("noSpace") << QStringLiteral("testhttps://kde.org");
 }
 
 void LinkPreviewerTest::linkPreviewsReject()
 {
-    QFETCH(QString, eventSource);
+    QFETCH(QString, inputString);
 
-    auto event = TestUtils::loadEventFromFile<RoomMessageEvent>(eventSource);
+    auto links = LinkPreviewer::linkPreviews(inputString);
-    auto linkPreviewer = LinkPreviewer(LinkPreviewer::linkPreview(event.get()), connection);
 
-    QCOMPARE(linkPreviewer.empty(), true);
+    QCOMPARE(links.empty(), true);
-    QCOMPARE(linkPreviewer.url(), QUrl());
 }
 
 QTEST_MAIN(LinkPreviewerTest)

org.kde.neochat.appdata.xml

@@ -80,14 +80,12 @@
   <summary xml:lang="zh-TW">在 Matrix 上與您的朋友聊天</summary>
   <description>
     <p>NeoChat is a chat app that lets you take full advantage of the Matrix network. It provides you with a secure way to send text messages, videos and audio files to your family, colleagues and friends.</p>
-    <p xml:lang="ar">نيوتشات هو تطبيق دردشة يتيح لك الاستفادة الكاملة من شبكة Matrix. فهو يوفر لك طريقة آمنة لإرسال الرسائل النصية ومقاطع الفيديو والملفات الصوتية إلى عائلتك وزملائك وأصدقائك.</p>
     <p xml:lang="ca">El NeoChat és una aplicació de xat que us permet aprofitar plenament la xarxa Matrix. Proporciona una manera segura d'enviar missatges de text, vídeos i arxius d'àudio a la vostra família, companys i amics.</p>
     <p xml:lang="ca-valencia">NeoChat és una aplicació de xat que us permet aprofitar plenament la xarxa Matrix. Proporciona una manera segura d'enviar missatges de text, vídeos i arxius d'àudio a la vostra família, companys i amics.</p>
     <p xml:lang="en-GB">NeoChat is a chat app that lets you take full advantage of the Matrix network. It provides you with a secure way to send text messages, videos and audio files to your family, colleagues and friends.</p>
     <p xml:lang="eo">NeoChat estas babilej-apo, kiu ebligas al vi plene profiti de la Matrix-reto. Ĝi provizas al vi sekuran manieron sendi tekstmesaĝojn, filmetojn kaj sondosierojn al via familio, kolegoj kaj amikoj.</p>
     <p xml:lang="es">NeoChat es una aplicación de chat que le permite aprovechar al máximo la red Matrix. Le proporciona un modo seguro de enviar mensajes de texto, vídeos y archivos de sonido a su familia, colegas y amigos.</p>
     <p xml:lang="eu">NeoChat, Matrix sarearen abantaila guztiei probetsua ateratzeko aukera ematen dizun berriketa aplikaizo bat da. Zure familiari, kideei eta lagunei testu mezuak, bideoak eta audio fitxategiak era seguruan bidaltzeko aukera ematen dizu.</p>
-    <p xml:lang="fi">NeoChat on keskustelusovellus, jolla Matrix-verkosta saa täyden hyödyn. Se tarjoaa salatun kanavan lähettää perheelle, työkavereille ja ystäville tekstiviestejä sekä video- ja äänitiedostoja.</p>
     <p xml:lang="fr">NeoChat est une application de discussions vous permettant de profiter pleinement du réseau Matrix. Elle vous offre un moyen sécurisé d'envoyer des messages de texte, des vidéos et des fichiers audio à votre famille, vos collègues et vos ami(e)s.</p>
     <p xml:lang="hu">A NeoChat egy olyan csevegőalkalmazás, amellyel teljes mértékben kihasználhatja a Matrix hálózatot. Biztonságos módot biztosít szöveges üzenetek, videók és hangfájlok küldéséhez családtagjainak, kollégáinak és barátainak.</p>
     <p xml:lang="ia">NeoChat es un app de conversation que te permitte prender avantage plen del rete Matrix. Il te forni un modo secur de inviar messages de texto, videos e files audio a tui familia, collegas e amicos.</p>
@@ -95,10 +93,8 @@
     <p xml:lang="ka">NeoChat ჩატის აპია, რომელიც საშუალება გაძლევთ, Matrix-ის ქსელის საშუალებები ბოლომდე გამოიყენოთ. ის გაძლევთ უსაფრთხო გზას, გააგზავნოთ ტექსტური შეტყობინებები, ვიდეოებ და აუდიოფაილები თქვენს ოჯახთან, კოლეგებთან და მეგობრებთან.</p>
     <p xml:lang="lv">„NeoChat“ ir tērzēšanas programma, kas ļauj pilnvērtīgi izmantot „Matrix“ tīklu. Tā sniedz drošu veidu teksta ziņu, video un audio sūtīšanai ģimenes locekļiem, kolēģiem un draugiem.</p>
     <p xml:lang="nl">NeoChat is een chat-toepassing die u het volledige voordeel van het Matrix-netwerk laat genieten. Het levert u op een veilige manier tekstberichten, video's en geluidsbestanden naar uw familie, collega's en vrienden te verzenden.</p>
-    <p xml:lang="nn">NeoChat er ein prateapp som lèt deg bruka all funksjonalitet i Matrix-nettverket. Du kan utveksla tekst, lyd og videoar med vennar, familie og kollegaar på ein trygg måte.</p>
     <p xml:lang="pl">NoeChat to aplikacja do rozmów, która umożliwia wykorzystanie wszystkich możliwości Matriksa. Umożliwia wysyłanie wiadomości tekstowych, filmów i dźwięków w bezpieczny sposób do twojej rodziny, kolegów i przyjaciół.</p>
     <p xml:lang="sl">NeoChat je aplikacija za klepet, ki vam omogoča, da v celoti izkoristite omrežje Matrix. Zagotavlja vam varen način za pošiljanje besedilnih sporočil, videoposnetkov in zvočnih datotek vaši družini, sodelavcem in prijateljem.</p>
-    <p xml:lang="sv">NeoChat är ett chattprogram som låter dig dra full nytta av Matrix-nätverket. Det ger dig ett säkert sätt att skicka textmeddelanden, videor och ljudfiler till din familj, kollegor och vänner.</p>
     <p xml:lang="tr">NeoChat, Matrix ağının tüm özelliklerini kullanan bir sohbet uygulamasıdır. Ailenize, arkadaşlarınıza ve iş arkadaşlarınıza metin iletileri, ses ve video dosyaları göndermenin kolay bir yolunu sunar.</p>
     <p xml:lang="uk">NeoChat є програмою для спілкування, за допомогою якої ви можете скористатися усіма перевагами мережі Matrix. За її допомогою ви можете безпечно надсилати текстові повідомлення, відео та звукові файли вашим родичам, колегам та друзям.</p>
     <p xml:lang="x-test">xxNeoChat is a chat app that lets you take full advantage of the Matrix network. It provides you with a secure way to send text messages, videos and audio files to your family, colleagues and friends.xx</p>
@@ -115,7 +111,7 @@
     <p xml:lang="fr">L'objectif de NeoChat est d'être une application complète pour le protocole Matrix. En tant que tel, tout dans la spécification stable actuelle avec les exceptions notables de VoIP, les processus et certains aspects du chiffrement de bout en bout sont pris en charge. Il y a quelques autres petites omissions en raison du fait que la spécification du protocole Matrix est en constante évolution. Cependant, l'objectif reste de fournir un soutien éventuel pour l'ensemble de la spécification.</p>
     <p xml:lang="gl">NeoChat pretende ser unha aplicación completa para a especificación de Matrix. Coas excepcións de VoIP, conversas fiadas e algúns aspectos da cifraxe de extremo a extremo, a versión estábel segue as especificacións. Existen algunhas outras pequenas omisións debido ao feito de que Matrix está en continua evolución pero a intención é implementar a especificación completa.</p>
     <p xml:lang="hu">A NeoChat célja, hogy a Matrix specifikációnak megfelelő teljes funkcionalitású alkalmazás legyen. Mint ilyen, a jelenlegi stabil specifikáció támogatott a VoIP, a szálak és a végpontok közötti titkosítás egyes elemeinek kivételével. Van még néhány kisebb hiányosság annak köszönhetően, hogy a Matrix specifikáció folyamatosan fejlődik, de végső cél a teljes specifikáció megvalósítása.</p>
-    <p xml:lang="ia">NeoChat aspira a esser un application plenmente eminente per le specification de Matrix. Tal como omne cosas in le specification currentemente stabile con le exceptiones notabile de VOIP, threads e alcun aspectos del cryptation End-to-End es supportate. Il ha ltere pauc omissiones, debite al facto que le specification de Matrix es in evolution constante ma le aspiration remane a fornir supporto eventual per le integre specification.</p>
+    <p xml:lang="ia">NeoChat aspira a esser un application plenemente eminente per le specification de Matrix. Tal como omne cosas in le specification currentemente stabile con le exceptiones notabile de VOIP, threads e alcun aspectos del cryptation End-to-End es supportate. Il ha ltere pauc omissiones, debite al facto que le specification de Matrix es in evolution constante ma le aspiration remane a fornir supporto eventual per le integre specification.</p>
     <p xml:lang="it">NeoChat mira ad essere un'applicazione completa per le specifiche Matrix. Pertanto, sono supportati tutti gli elementi dell'attuale specifica stabile con le notevoli eccezioni di VoIP, conversazioni e alcuni aspetti della cifratura end-to-end. Ci sono alcune altre piccole omissioni dovute al fatto che le specifiche Matrix sono in continua evoluzione, ma l'obiettivo rimane quello di fornire un eventuale supporto per l'intera specifica.</p>
     <p xml:lang="ka">NeoChat მიზნად ისახავს Matrix სპეციფიკაციის სრული განხორციელება ჰქონდეს. როგორც ასეთი, ყველაფერი მიმდინარე სპეციფიკაციიდან, VoIP-ის, ძაფებისა და გამჭოლი დაშიფვრის ზოგიერთი ასპექტის გარდა, მხარდაჭერილია. შეძლება ასევე იყოს მცირე ლაფსუსებიც იმის გამო, რომ Matrix-ის სპეციფიკაცია მუდმივად ვითარდება, მაგრამ ჩვენი მიზანი მისი სრული მხარდაჭერაა.</p>
     <p xml:lang="ko">NeoChat은 Matrix 표준을 따르는 프로그램을 목표로 합니다. 현재 안정 버전의 표준에서 제공하는 기능의 대부분을 지원하며, VoIP, 스레드, 일부 종단간 암호화와 같은 기능은 아직 지원하지 않습니다. Matrix 표준은 계속하여 진화 중이기 때문에 일부 기능이 빠져 있을 수도 있지만 장기적으로는 전체 표준을 지원하는 것이 목표입니다.</p>
@@ -214,7 +210,7 @@
       <li xml:lang="sl">Sticker Packs - MSC2545</li>
       <li xml:lang="sv">Sticker Packs - MSC2545</li>
       <li xml:lang="ta">ஒட்டி தொகுப்புகள் - MSC2545</li>
-      <li xml:lang="tr">Çıkartma Paketleri — MSC2545</li>
+      <li xml:lang="tr">Yapışkan Paketleri — MSC2545</li>
       <li xml:lang="uk">Пакунки наліпок - MSC2545</li>
       <li xml:lang="x-test">xxSticker Packs - MSC2545xx</li>
       <li xml:lang="zh-TW">貼圖包 - MSC2545</li>
@@ -314,14 +310,12 @@
     <screenshot type="default">
       <image>https://cdn.kde.org/screenshots/neochat/spaces.png</image>
       <caption>Discover new communities with Matrix Spaces</caption>
-      <caption xml:lang="ar">اكتشف مجتمعات جديدة مع فضاءات ماتركس</caption>
       <caption xml:lang="ca">Descobriu comunitats noves amb els espais de Matrix</caption>
       <caption xml:lang="ca-valencia">Descobriu comunitats noves amb els espais de Matrix</caption>
       <caption xml:lang="en-GB">Discover new communities with Matrix Spaces</caption>
       <caption xml:lang="eo">Malkovru novajn komunumojn per Matrix Spaces</caption>
       <caption xml:lang="es">Descubra nuevas comunidades con los espacios de Matrix</caption>
       <caption xml:lang="eu">Ezagutu komunitate berriak Matrixeko Tokiak erabiliz</caption>
-      <caption xml:lang="fi">Löydä uusia yhteisöjä Matrix Spacesillä</caption>
       <caption xml:lang="fr">Découvrez de nouvelles communautés avec les espaces sous Matrix</caption>
       <caption xml:lang="hu">Fedezzen fel új közösségeket a Matrix Terek segítségével</caption>
       <caption xml:lang="ia">Discoperi nove communitate con Matrix Spaces (Spatios de Matrix)</caption>
@@ -329,10 +323,8 @@
       <caption xml:lang="ka">აღმოაჩინეთ ახალი საზოგადოებები Matrix Spaces-თან ერთად</caption>
       <caption xml:lang="lv">Atklājiet jaunas kopienas ar „Matrix“ telpām</caption>
       <caption xml:lang="nl">Ontdek nieuwe gemeenschappen met Matrix-ruimten</caption>
-      <caption xml:lang="nn">Oppdag nye fellesskap med Matrix Spaces</caption>
       <caption xml:lang="pl">Odkrywaj nowe społeczności w Przestrzeniach Matriksa</caption>
       <caption xml:lang="sl">Odkrijte nove skupnosti z Matrix Spaces</caption>
-      <caption xml:lang="sv">Upptäck nya gemenskaper med Matrix Spaces</caption>
       <caption xml:lang="tr">Matrix Alanlar ile yeni topluluklar keşfedin</caption>
       <caption xml:lang="uk">Пошук нових спільнот за допомогою Matrix Spaces</caption>
       <caption xml:lang="x-test">xxDiscover new communities with Matrix Spacesxx</caption>
@@ -415,8 +407,6 @@
     <content_attribute id="social-chat">intense</content_attribute>
   </content_rating>
   <releases>
-    <release version="24.05.2" date="2024-07-04"/>
-    <release version="24.05.1" date="2024-06-13"/>
     <release version="24.05.0" date="2024-05-23"/>
     <release version="24.02.2" date="2024-04-11"/>
     <release version="24.02.1" date="2024-03-21"/>

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

@@ -77,7 +77,7 @@ SPDX-License-Identifier: CC-BY-SA-4.0
 ></term>
   <listitem>
     <para
->L'URI de Matrix per a un usuari o una sala. P. ex. matrix:u/usuari:example.org o matrix:r/root:example.org. Això farà que el NeoChat intenti obrir la sala o conversa indicada. </para>
+>L'URI de Matrix per a un usuari o una sala. P. ex. matrix:u/usuari:exemple.org o matrix:r/root:exemple.org. Això farà que el NeoChat intenti obrir la sala o conversa indicada. </para>
   </listitem>
   </varlistentry>
 </variablelist>

src/CMakeLists.txt

@@ -20,8 +20,6 @@ add_library(neochat STATIC
     models/customemojimodel.h
     clipboard.cpp
     clipboard.h
-    matriximageprovider.cpp
-    matriximageprovider.h
     models/messageeventmodel.cpp
     models/messageeventmodel.h
     models/messagefiltermodel.cpp
@@ -177,6 +175,16 @@ add_library(neochat STATIC
     foreigntypes.h
     models/threepidmodel.cpp
     models/threepidmodel.h
+    threepidaddhelper.cpp
+    threepidaddhelper.h
+    jobs/neochatadd3pidjob.cpp
+    jobs/neochatadd3pidjob.h
+    identityserverhelper.cpp
+    identityserverhelper.h
+    enums/powerlevel.cpp
+    enums/powerlevel.h
+    models/permissionsmodel.cpp
+    models/permissionsmodel.h
 )
 
 set_source_files_properties(qml/OsmLocationPlugin.qml PROPERTIES
@@ -207,16 +215,10 @@ qt_add_qml_module(neochat URI org.kde.neochat NO_PLUGIN
         qml/TypingPane.qml
         qml/QuickSwitcher.qml
         qml/HoverActions.qml
-        qml/ChatBar.qml
         qml/AttachmentPane.qml
-        qml/ReplyPane.qml
-        qml/CompletionMenu.qml
-        qml/PieProgressBar.qml
         qml/QuickFormatBar.qml
-        qml/EmojiPicker.qml
         qml/UserDetailDialog.qml
         qml/CreateRoomDialog.qml
-        qml/EmojiDialog.qml
         qml/OpenFileDialog.qml
         qml/KeyVerificationDialog.qml
         qml/ConfirmLogoutDialog.qml
@@ -236,9 +238,6 @@ qt_add_qml_module(neochat URI org.kde.neochat NO_PLUGIN
         qml/ConfirmEncryptionDialog.qml
         qml/RemoveSheet.qml
         qml/BanSheet.qml
-        qml/EmojiTonesPicker.qml
-        qml/EmojiDelegate.qml
-        qml/EmojiGrid.qml
         qml/RoomSearchPage.qml
         qml/LocationChooser.qml
         qml/TimelineView.qml
@@ -262,7 +261,6 @@ qt_add_qml_module(neochat URI org.kde.neochat NO_PLUGIN
         qml/SelectParentDialog.qml
         qml/QrCodeMaximizeComponent.qml
         qml/SelectSpacesDialog.qml
-        qml/AttachDialog.qml
         qml/NotificationsView.qml
         qml/SearchPage.qml
         qml/ServerComboBox.qml
@@ -280,12 +278,16 @@ qt_add_qml_module(neochat URI org.kde.neochat NO_PLUGIN
         qml/ConfirmLeaveDialog.qml
         qml/CodeMaximizeComponent.qml
         qml/EditStateDialog.qml
+        qml/ConsentDialog.qml
+        qml/AskDirectChatConfirmation.qml
+        qml/HoverLinkIndicator.qml
 )
 
 add_subdirectory(settings)
 add_subdirectory(timeline)
 add_subdirectory(devtools)
 add_subdirectory(login)
+add_subdirectory(chatbar)
 
 if(UNIX)
     qt_target_qml_sources(neochat QML_FILES qml/ShareAction.qml)
@@ -379,7 +381,7 @@ else()
 endif()
 
 target_include_directories(neochat PRIVATE ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/models ${CMAKE_CURRENT_SOURCE_DIR}/enums)
-target_link_libraries(neochat PRIVATE settingsplugin timelineplugin devtoolsplugin loginplugin)
+target_link_libraries(neochat PRIVATE settingsplugin timelineplugin devtoolsplugin loginplugin chatbarplugin)
 target_link_libraries(neochat PUBLIC
     Qt::Core
     Qt::Quick

src/chatbar/AttachDialog.qml

@@ -13,15 +13,13 @@ import org.kde.neochat
 QQC2.Popup {
     id: root
 
-    padding: Kirigami.Units.largeSpacing
+    padding: 16
 
     signal chosen(string path)
 
     contentItem: RowLayout {
-
-        spacing: Kirigami.Units.smallSpacing
-
         QQC2.ToolButton {
+            Layout.preferredWidth: 160
             Layout.fillHeight: true
 
             icon.name: 'mail-attachment'
@@ -39,8 +37,11 @@ QQC2.Popup {
         Kirigami.Separator {}
 
         QQC2.ToolButton {
+            Layout.preferredWidth: 160
             Layout.fillHeight: true
 
+            padding: 16
+
             icon.name: 'insert-image'
             text: i18n("Clipboard image")
             onClicked: {

src/chatbar/CMakeLists.txt

@@ -0,0 +1,19 @@
+# SPDX-FileCopyrightText: 2024 Tobias Fella <tobias.fella@kde.org>
+# SPDX-License-Identifier: BSD-2-Clause
+
+qt_add_library(chatbar STATIC)
+qt_add_qml_module(chatbar
+    URI org.kde.neochat.chatbar
+    OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/src/org/kde/neochat/chatbar
+    QML_FILES
+        AttachDialog.qml
+        ChatBar.qml
+        CompletionMenu.qml
+        EmojiDelegate.qml
+        EmojiGrid.qml
+        ReplyPane.qml
+        PieProgressBar.qml
+        EmojiPicker.qml
+        EmojiDialog.qml
+        EmojiTonesPicker.qml
+)

src/chatbar/EmojiDelegate.qml

@@ -24,7 +24,7 @@ QQC2.ItemDelegate {
     contentItem: Item {
         Kirigami.Heading {
             anchors.fill: parent
-            visible: !root.emoji.startsWith("image") && !root.isImage
+            visible: !root.emoji.startsWith("mxc") && !root.isImage
             text: root.emoji
             horizontalAlignment: Text.AlignHCenter
             verticalAlignment: Text.AlignVCenter
@@ -41,7 +41,7 @@ QQC2.ItemDelegate {
         }
         Image {
             anchors.fill: parent
-            visible: root.emoji.startsWith("image") || root.isImage
+            visible: root.emoji.startsWith("mxc") || root.isImage
             source: visible ? root.emoji : ""
         }
     }

src/chatbar/EmojiDialog.qml

@@ -38,18 +38,22 @@ QQC2.Popup {
     }
 
     background: Kirigami.ShadowedRectangle {
-        Kirigami.Theme.colorSet: Kirigami.Theme.View
-        color: Kirigami.Theme.backgroundColor
         radius: Kirigami.Units.cornerRadius
-        shadow {
+        color: Kirigami.Theme.backgroundColor
-            size: Kirigami.Units.largeSpacing
+
-            color: Qt.rgba(0.0, 0.0, 0.0, 0.3)
-            yOffset: 2
-        }
         border {
-            color: Kirigami.ColorUtils.tintWithAlpha(color, Kirigami.Theme.textColor, 0.15)
+            width: 1
-            width: 2
+            color: Kirigami.ColorUtils.linearInterpolation(Kirigami.Theme.backgroundColor, Kirigami.Theme.textColor, Kirigami.Theme.frameContrast)
         }
+
+        shadow {
+            size: Kirigami.Units.gridUnit
+            yOffset: 0
+            color: Qt.rgba(0, 0, 0, 0.2)
+        }
+
+        Kirigami.Theme.inherit: false
+        Kirigami.Theme.colorSet: Kirigami.Theme.View
     }
 
     modal: true

src/controller.cpp

@@ -9,27 +9,20 @@
 #include <KLocalizedString>
 
 #include <QGuiApplication>
-#include <QNetworkProxy>
-#include <QQuickTextDocument>
-#include <QQuickWindow>
-#include <QStandardPaths>
-#include <QStringBuilder>
 #include <QTimer>
 
 #include <signal.h>
 
 #include <Quotient/accountregistry.h>
-#include <Quotient/csapi/logout.h>
 #include <Quotient/csapi/notifications.h>
-#include <Quotient/eventstats.h>
 #include <Quotient/qt_connection_util.h>
+#include <Quotient/settings.h>
 
 #include "neochatconfig.h"
 #include "neochatconnection.h"
 #include "neochatroom.h"
 #include "notificationsmanager.h"
 #include "proxycontroller.h"
-#include "roommanager.h"
 
 #if defined(Q_OS_WIN) || defined(Q_OS_MAC)
 #include "trayicon.h"
@@ -45,6 +38,10 @@
 #endif
 #endif
 
+#ifdef HAVE_KUNIFIEDPUSH
+#include <kunifiedpush/connector.h>
+#endif
+
 bool testMode = false;
 
 using namespace Quotient;
@@ -189,7 +186,7 @@ void Controller::invokeLogin()
         m_accountsLoading += accountId;
         Q_EMIT accountsLoadingChanged();
         if (!account.homeserver().isEmpty()) {
-            auto accessTokenLoadingJob = loadAccessTokenFromKeyChain(account);
+            auto accessTokenLoadingJob = loadAccessTokenFromKeyChain(account.userId());
             connect(accessTokenLoadingJob, &QKeychain::Job::finished, this, [accountId, this, accessTokenLoadingJob](QKeychain::Job *) {
                 AccountSettings account{accountId};
                 QString accessToken;
@@ -217,11 +214,11 @@ void Controller::invokeLogin()
     }
 }
 
-QKeychain::ReadPasswordJob *Controller::loadAccessTokenFromKeyChain(const AccountSettings &account)
+QKeychain::ReadPasswordJob *Controller::loadAccessTokenFromKeyChain(const QString &userId)
 {
-    qDebug() << "Reading access token from the keychain for" << account.userId();
+    qDebug() << "Reading access token from the keychain for" << userId;
     auto job = new QKeychain::ReadPasswordJob(qAppName(), this);
-    job->setKey(account.userId());
+    job->setKey(userId);
 
     // Handling of errors
     connect(job, &QKeychain::Job::finished, this, [this, job]() {
@@ -252,12 +249,12 @@ QKeychain::ReadPasswordJob *Controller::loadAccessTokenFromKeyChain(const Accoun
     return job;
 }
 
-bool Controller::saveAccessTokenToKeyChain(const AccountSettings &account, const QByteArray &accessToken)
+bool Controller::saveAccessTokenToKeyChain(const QString &userId, const QByteArray &accessToken)
 {
-    qDebug() << "Save the access token to the keychain for " << account.userId();
+    qDebug() << "Save the access token to the keychain for " << userId;
     QKeychain::WritePasswordJob job(qAppName());
     job.setAutoDelete(false);
-    job.setKey(account.userId());
+    job.setKey(userId);
     job.setBinaryData(accessToken);
     QEventLoop loop;
     QKeychain::WritePasswordJob::connect(&job, &QKeychain::Job::finished, &loop, &QEventLoop::quit);

src/controller.h

@@ -5,15 +5,9 @@
 
 #include <QObject>
 #include <QQmlEngine>
-#include <QQuickItem>
 
 #include "neochatconnection.h"
 #include <Quotient/accountregistry.h>
-#include <Quotient/settings.h>
-
-#ifdef HAVE_KUNIFIEDPUSH
-#include <kunifiedpush/connector.h>
-#endif
 
 class TrayIcon;
 class QQuickTextDocument;
@@ -82,7 +76,7 @@ public:
     /**
      * @brief Save an access token to the keychain for the given account.
      */
-    bool saveAccessTokenToKeyChain(const Quotient::AccountSettings &account, const QByteArray &accessToken);
+    bool saveAccessTokenToKeyChain(const QString &userId, const QByteArray &accessToken);
 
     [[nodiscard]] bool supportSystemTray() const;
 
@@ -110,7 +104,7 @@ private:
     QPointer<NeoChatConnection> m_connection;
     TrayIcon *m_trayIcon = nullptr;
 
-    QKeychain::ReadPasswordJob *loadAccessTokenFromKeyChain(const Quotient::AccountSettings &account);
+    QKeychain::ReadPasswordJob *loadAccessTokenFromKeyChain(const QString &account);
 
     void loadSettings();
     void saveSettings() const;

src/devtools/DevtoolsPage.qml

@@ -31,12 +31,12 @@ FormCard.FormCardPage {
             implicitWidth: tabBar.tabWidth
         }
         QQC2.TabButton {
-            text: qsTr("Room Data")
+            text: i18nc("@title:tab", "Room Data")
 
             implicitWidth: tabBar.tabWidth
         }
         QQC2.TabButton {
-            text: qsTr("Server Info")
+            text: i18nc("@title:tab", "Server Info")
 
             implicitWidth: tabBar.tabWidth
         }

src/devtools/FeatureFlagPage.qml

@@ -28,5 +28,14 @@ FormCard.FormCardPage {
 
             onToggled: Config.secretBackup = checked
         }
+        FormCard.FormCheckDelegate {
+            text: i18nc("@option:check Enable the matrix feature to add a phone number as a third party ID", "Add phone numbers as 3PIDs")
+            checked: Config.phone3PId
+
+            onToggled: {
+                Config.phone3PId = checked
+                Config.save();
+            }
+        }
     }
 }

src/enums/powerlevel.cpp

@@ -0,0 +1,109 @@
+// SPDX-FileCopyrightText: 2024 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 "powerlevel.h"
+
+QString PowerLevel::nameForLevel(Level level)
+{
+    switch (level) {
+    case PowerLevel::Member:
+        return i18n("Member");
+    case PowerLevel::Moderator:
+        return i18n("Moderator");
+    case PowerLevel::Admin:
+        return i18n("Admin");
+    case PowerLevel::Mute:
+        return i18n("Mute");
+    case PowerLevel::Custom:
+        return i18n("Custom");
+    default:
+        return {};
+    }
+}
+
+int PowerLevel::valueForLevel(Level level)
+{
+    switch (level) {
+    case PowerLevel::Member:
+        return 0;
+    case PowerLevel::Moderator:
+        return 50;
+    case PowerLevel::Admin:
+        return 100;
+    case PowerLevel::Mute:
+        return -1;
+    default:
+        return {};
+    }
+}
+
+PowerLevel::Level PowerLevel::levelForValue(int value)
+{
+    switch (value) {
+    case 0:
+        return PowerLevel::Member;
+    case 50:
+        return PowerLevel::Moderator;
+    case 100:
+        return PowerLevel::Admin;
+    case -1:
+        return PowerLevel::Mute;
+    default:
+        return PowerLevel::Custom;
+    }
+}
+
+PowerLevelModel::PowerLevelModel(QObject *parent)
+    : QAbstractListModel(parent)
+{
+}
+
+bool PowerLevelModel::showMute() const
+{
+    return m_showMute;
+}
+
+void PowerLevelModel::setShowMute(bool showMute)
+{
+    if (showMute == m_showMute) {
+        return;
+    }
+    m_showMute = showMute;
+    Q_EMIT showMuteChanged();
+}
+
+QVariant PowerLevelModel::data(const QModelIndex &index, int role) const
+{
+    if (!index.isValid()) {
+        return {};
+    }
+    if (index.row() >= rowCount()) {
+        qDebug() << "PowerLevelModel, something's wrong: index.row() >= m_rules.count()";
+        return {};
+    }
+
+    const auto level = static_cast<PowerLevel::Level>(index.row());
+    if (role == NameRole) {
+        return i18nc("%1 is the name of the power level, e.g. admin and %2 is the value that represents.",
+                     "%1 (%2)",
+                     PowerLevel::nameForLevel(level),
+                     PowerLevel::valueForLevel(level));
+    }
+    if (role == ValueRole) {
+        return PowerLevel::valueForLevel(level);
+    }
+    return {};
+}
+
+int PowerLevelModel::rowCount(const QModelIndex &parent) const
+{
+    Q_UNUSED(parent)
+    return PowerLevel::NUMLevels - (m_showMute ? 0 : 1);
+}
+
+QHash<int, QByteArray> PowerLevelModel::roleNames() const
+{
+    return {{NameRole, "name"}, {ValueRole, "value"}};
+}
+
+#include "moc_powerlevel.cpp"

src/enums/powerlevel.h

@@ -0,0 +1,110 @@
+// SPDX-FileCopyrightText: 2024 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 <QAbstractListModel>
+#include <QObject>
+#include <QQmlEngine>
+
+#include <KLocalizedString>
+
+/**
+ * @class PowerLevel
+ *
+ * This class is designed to define the PowerLevel enumeration.
+ */
+class PowerLevel : public QObject
+{
+    Q_OBJECT
+    QML_ELEMENT
+    QML_UNCREATABLE("")
+
+public:
+    /**
+     * @brief The type of delegate that is needed for the event.
+     *
+     * @note While similar this is not the matrix event or message type. This is
+     *       to tell a QML ListView what delegate to show for each event. So while
+     *       similar to the spec it is not the same.
+     */
+    enum Level {
+        Member, /**< A basic member. */
+        Moderator, /**< A moderator with enhanced powers. */
+        Admin, /**< The highest power level in the room. */
+        Mute, /**< The level to remove posting privileges. */
+        NUMLevels,
+        Custom, /**< A non-standard value. Intentionally after NUMLevels so it doesn't appear in the model. */
+    };
+    Q_ENUM(Level);
+
+    /**
+     * @brief Return a string representation of the enum value.
+     */
+    static QString nameForLevel(Level level);
+
+    /**
+     * @brief Return the integer representation of the enum value.
+     */
+    static int valueForLevel(Level level);
+
+    /**
+     * @brief Return the enum value for the given integer power level.
+     */
+    static Level levelForValue(int value);
+};
+
+/**
+ * @class PowerLevelModel
+ *
+ * A model visualize the allowed power levels.
+ */
+class PowerLevelModel : public QAbstractListModel
+{
+    Q_OBJECT
+    QML_ELEMENT
+
+    Q_PROPERTY(bool showMute READ showMute WRITE setShowMute NOTIFY showMuteChanged)
+
+public:
+    /**
+     * @brief Defines the model roles.
+     */
+    enum Roles {
+        NameRole = Qt::DisplayRole, /**< The power level name. */
+        ValueRole, /**< The power level value. */
+    };
+    Q_ENUM(Roles)
+
+    explicit PowerLevelModel(QObject *parent = nullptr);
+
+    [[nodiscard]] bool showMute() const;
+    void setShowMute(bool showMute);
+
+    /**
+     * @brief Get the given role value at the given index.
+     *
+     * @sa QAbstractItemModel::data
+     */
+    [[nodiscard]] QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
+
+    /**
+     * @brief Number of rows in the model.
+     *
+     * @sa  QAbstractItemModel::rowCount
+     */
+    [[nodiscard]] int rowCount(const QModelIndex &parent = QModelIndex()) const override;
+
+    /**
+     * @brief Returns a mapping from Role enum values to role names.
+     *
+     * @sa Roles, QAbstractItemModel::roleNames()
+     */
+    [[nodiscard]] QHash<int, QByteArray> roleNames() const override;
+
+Q_SIGNALS:
+    void showMuteChanged();
+
+private:
+    bool m_showMute = true;
+};

src/eventhandler.cpp

@@ -293,7 +293,10 @@ QString EventHandler::getMarkdownBody() const
     }
 
     const auto roomMessageEvent = eventCast<const RoomMessageEvent>(m_event);
-    return roomMessageEvent->plainBody();
+
+    QString plainBody = roomMessageEvent->plainBody();
+    plainBody.remove(TextRegex::removeReply);
+    return plainBody;
 }
 
 QString EventHandler::getBody(const Quotient::RoomEvent *event, Qt::TextFormat format, bool stripNewlines) const

src/fakerunner.cpp

@@ -33,4 +33,4 @@ FakeRunner::FakeRunner()
     qDBusRegisterMetaType<RemoteImage>();
 }
 
-#include "moc_fakerunner.cpp"
+#include "moc_fakerunner.cpp"

src/identityserverhelper.cpp

@@ -0,0 +1,156 @@
+// SPDX-FileCopyrightText: 2024 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 "identityserverhelper.h"
+
+#include <QNetworkReply>
+
+#include <KLocalizedString>
+
+#include <Quotient/networkaccessmanager.h>
+
+#include "neochatconnection.h"
+
+IdentityServerHelper::IdentityServerHelper(QObject *parent)
+    : QObject(parent)
+{
+}
+
+NeoChatConnection *IdentityServerHelper::connection() const
+{
+    return m_connection;
+}
+
+void IdentityServerHelper::setConnection(NeoChatConnection *connection)
+{
+    if (m_connection == connection) {
+        return;
+    }
+
+    if (m_connection != nullptr) {
+        m_connection->disconnect(this);
+    }
+
+    m_connection = connection;
+    Q_EMIT connectionChanged();
+    Q_EMIT currentServerChanged();
+
+    connect(m_connection, &NeoChatConnection::accountDataChanged, this, [this](const QString &type) {
+        if (type == QLatin1String("m.identity_server")) {
+            Q_EMIT currentServerChanged();
+        }
+    });
+}
+
+QString IdentityServerHelper::currentServer() const
+{
+    if (m_connection == nullptr) {
+        return {};
+    }
+
+    if (!m_connection->hasAccountData(QLatin1String("m.identity_server"))) {
+        return i18nc("@info", "No identity server configured");
+    }
+
+    const auto url = m_connection->accountData(QLatin1String("m.identity_server"))->contentPart<QUrl>(QLatin1String("base_url"));
+    if (!url.isEmpty()) {
+        return url.toString();
+    }
+    return i18nc("@info", "No identity server configured");
+}
+
+bool IdentityServerHelper::hasCurrentServer() const
+{
+    if (m_connection == nullptr && !m_connection->hasAccountData(QLatin1String("m.identity_server"))) {
+        return false;
+    }
+
+    const auto url = m_connection->accountData(QLatin1String("m.identity_server"))->contentPart<QUrl>(QLatin1String("base_url"));
+    if (!url.isEmpty()) {
+        return true;
+    }
+    return false;
+}
+
+QString IdentityServerHelper::url() const
+{
+    return m_url;
+}
+
+void IdentityServerHelper::setUrl(const QString &url)
+{
+    if (url == m_url) {
+        return;
+    }
+    m_url = url;
+    Q_EMIT urlChanged();
+
+    checkUrl();
+}
+
+IdentityServerHelper::IdServerStatus IdentityServerHelper::status() const
+{
+    return m_status;
+}
+
+void IdentityServerHelper::checkUrl()
+{
+    if (m_idServerCheckRequest != nullptr) {
+        m_idServerCheckRequest->abort();
+        m_idServerCheckRequest.clear();
+    }
+
+    if (m_url == currentServer()) {
+        m_status = Match;
+        Q_EMIT statusChanged();
+        return;
+    }
+
+    if (m_url.isEmpty()) {
+        m_status = Valid;
+        Q_EMIT statusChanged();
+        return;
+    }
+
+    const auto requestUrl = QUrl(m_url + QStringLiteral("/_matrix/identity/v2"));
+    if (!(requestUrl.scheme() == QStringLiteral("https") || requestUrl.scheme() == QStringLiteral("http"))) {
+        m_status = Invalid;
+        Q_EMIT statusChanged();
+        return;
+    }
+
+    QNetworkRequest request(requestUrl);
+    m_idServerCheckRequest = Quotient::NetworkAccessManager::instance()->get(request);
+    connect(m_idServerCheckRequest, &QNetworkReply::finished, this, [this]() {
+        if (m_idServerCheckRequest->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt() == 200) {
+            m_status = Valid;
+            Q_EMIT statusChanged();
+        } else {
+            m_status = Invalid;
+            Q_EMIT statusChanged();
+        }
+    });
+}
+
+void IdentityServerHelper::setIdentityServer()
+{
+    if (m_url == currentServer()) {
+        return;
+    }
+
+    m_connection->setAccountData(QLatin1String("m.identity_server"), {{QLatin1String("base_url"), m_url}});
+    m_status = Ready;
+    Q_EMIT statusChanged();
+}
+
+void IdentityServerHelper::clearIdentityServer()
+{
+    if (currentServer().isEmpty()) {
+        return;
+    }
+    m_connection->setAccountData(QLatin1String("m.identity_server"), {{QLatin1String("base_url"), QString()}});
+    m_status = Ready;
+    Q_EMIT statusChanged();
+}
+
+#include "moc_identityserverhelper.cpp"

src/identityserverhelper.h

@@ -0,0 +1,103 @@
+// SPDX-FileCopyrightText: 2024 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 <QObject>
+#include <QQmlEngine>
+
+#include <Quotient/jobs/basejob.h>
+
+class NeoChatConnection;
+
+/**
+ * @class IdentityServerHelper
+ *
+ * This class is designed to help the process of setting an identity server for the account.
+ * It will manage the various stages of verification and authentication.
+ */
+class IdentityServerHelper : public QObject
+{
+    Q_OBJECT
+    QML_ELEMENT
+
+    /**
+     * @brief The connection to add a 3PID to.
+     */
+    Q_PROPERTY(NeoChatConnection *connection READ connection WRITE setConnection NOTIFY connectionChanged)
+
+    /**
+     * @brief The current identity server.
+     */
+    Q_PROPERTY(QString currentServer READ currentServer NOTIFY currentServerChanged)
+
+    /**
+     * @brief Whether an identity server is currently configured.
+     */
+    Q_PROPERTY(bool hasCurrentServer READ hasCurrentServer NOTIFY currentServerChanged)
+
+    /**
+     * @brief The URL for the desired server.
+     */
+    Q_PROPERTY(QString url READ url WRITE setUrl NOTIFY urlChanged)
+
+    /**
+     * @brief The current status.
+     */
+    Q_PROPERTY(IdServerStatus status READ status NOTIFY statusChanged)
+
+public:
+    /**
+     * @brief The current status for adding an identity server
+     */
+    enum IdServerStatus {
+        Ready, /**< The process is ready to start. I.e. there is no ongoing attempt to set a new server. */
+        Valid, /**< The server URL is valid. */
+        Invalid, /**< The server URL is invalid. */
+        Match, /**< The server URL is the one that is already configured. */
+        Other, /**< An unknown problem occurred. */
+    };
+    Q_ENUM(IdServerStatus)
+
+    explicit IdentityServerHelper(QObject *parent = nullptr);
+
+    [[nodiscard]] NeoChatConnection *connection() const;
+    void setConnection(NeoChatConnection *connection);
+
+    [[nodiscard]] QString currentServer() const;
+
+    [[nodiscard]] bool hasCurrentServer() const;
+
+    [[nodiscard]] QString url() const;
+    void setUrl(const QString &url);
+
+    [[nodiscard]] IdServerStatus status() const;
+
+    /**
+     * @brief Set the current URL as the user's identity server.
+     *
+     * Will do nothing if the URL isn't a valid identity server.
+     */
+    Q_INVOKABLE void setIdentityServer();
+
+    /**
+     * @brief Clear the user's identity server.
+     */
+    Q_INVOKABLE void clearIdentityServer();
+
+Q_SIGNALS:
+    void connectionChanged();
+    void currentServerChanged();
+    void urlChanged();
+    void statusChanged();
+
+private:
+    QPointer<NeoChatConnection> m_connection;
+
+    IdServerStatus m_status = Ready;
+    QString m_url;
+
+    QPointer<QNetworkReply> m_idServerCheckRequest;
+
+    void checkUrl();
+};

src/jobs/neochatadd3pidjob.cpp

@@ -0,0 +1,16 @@
+// SPDX-FileCopyrightText: 2024 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 "neochatadd3pidjob.h"
+
+using namespace Quotient;
+
+NeochatAdd3PIdJob::NeochatAdd3PIdJob(const QString &clientSecret, const QString &sid, const Omittable<QJsonObject> &auth)
+    : BaseJob(HttpVerb::Post, QStringLiteral("Add3PIDJob"), makePath("/_matrix/client/v3", "/account/3pid/add"))
+{
+    QJsonObject _dataJson;
+    addParam<IfNotEmpty>(_dataJson, QStringLiteral("auth"), auth);
+    addParam<>(_dataJson, QStringLiteral("client_secret"), clientSecret);
+    addParam<>(_dataJson, QStringLiteral("sid"), sid);
+    setRequestData({_dataJson});
+}

src/jobs/neochatadd3pidjob.h

@@ -0,0 +1,13 @@
+// SPDX-FileCopyrightText: 2024 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 <Quotient/jobs/basejob.h>
+#include <Quotient/omittable.h>
+
+class NeochatAdd3PIdJob : public Quotient::BaseJob
+{
+public:
+    explicit NeochatAdd3PIdJob(const QString &clientSecret, const QString &sid, const Quotient::Omittable<QJsonObject> &auth = Quotient::none);
+};

src/linkpreviewer.cpp

@@ -89,38 +89,23 @@ bool LinkPreviewer::empty() const
     return m_url.isEmpty();
 }
 
-QUrl LinkPreviewer::linkPreview(const Quotient::RoomMessageEvent *event)
+QList<QUrl> LinkPreviewer::linkPreviews(QString string)
 {
-    if (event == nullptr) {
+    auto data = string.remove(TextRegex::removeRichReply);
-        return {};
-    }
-
-    QString text;
-    if (event->hasTextContent()) {
-        auto textContent = static_cast<const Quotient::EventContent::TextContent *>(event->content());
-        if (textContent) {
-            text = textContent->body;
-        } else {
-            text = event->plainBody();
-        }
-    } else {
-        text = event->plainBody();
-    }
-
-    auto data = text.remove(TextRegex::removeRichReply);
     auto linksMatch = TextRegex::url.globalMatch(data);
+    QList<QUrl> links;
     while (linksMatch.hasNext()) {
         auto link = linksMatch.next().captured();
-        if (!link.contains(QStringLiteral("matrix.to"))) {
+        if (!link.contains(QStringLiteral("matrix.to")) && !links.contains(QUrl(link))) {
-            return QUrl(link);
+            links += QUrl(link);
         }
     }
-    return {};
+    return links;
 }
 
-bool LinkPreviewer::hasPreviewableLinks(const Quotient::RoomMessageEvent *event)
+bool LinkPreviewer::hasPreviewableLinks(const QString &string)
 {
-    return !linkPreview(event).isEmpty();
+    return !linkPreviews(string).isEmpty();
 }
 
 #include "moc_linkpreviewer.cpp"

src/linkpreviewer.h

@@ -7,11 +7,6 @@
 #include <QQmlEngine>
 #include <QUrl>
 
-namespace Quotient
-{
-class RoomMessageEvent;
-}
-
 class NeoChatRoom;
 
 /**
@@ -71,19 +66,19 @@ public:
     [[nodiscard]] bool empty() const;
 
     /**
-     * @brief Whether the given event has at least 1 pre-viewable link.
+     * @brief Whether the given string has at least 1 pre-viewable link.
      *
      * A link is only pre-viewable if it is http, https or something starting with www.
      */
-    static bool hasPreviewableLinks(const Quotient::RoomMessageEvent *event);
+    static bool hasPreviewableLinks(const QString &string);
 
     /**
-     * @brief Return the link to be previewed from the given event.
+     * @brief Return previewable links from the given string.
      *
      * This function is designed to give only links that should be previewed so
      * http, https or something starting with www. The first valid link is returned.
      */
-    static QUrl linkPreview(const Quotient::RoomMessageEvent *event);
+    static QList<QUrl> linkPreviews(QString string);
 
 private:
     bool m_loaded;

src/login.cpp

@@ -5,6 +5,7 @@
 
 #include <Quotient/accountregistry.h>
 #include <Quotient/qt_connection_util.h>
+#include <Quotient/settings.h>
 
 #include "controller.h"
 
@@ -72,7 +73,7 @@ void LoginHelper::init()
         account.setHomeserver(m_connection->homeserver());
         account.setDeviceId(m_connection->deviceId());
         account.setDeviceName(m_deviceName);
-        if (!Controller::instance().saveAccessTokenToKeyChain(account, m_connection->accessToken())) {
+        if (!Controller::instance().saveAccessTokenToKeyChain(account.userId(), m_connection->accessToken())) {
             qWarning() << "Couldn't save access token";
         }
         account.sync();

src/main.cpp

@@ -5,6 +5,7 @@
 #include <QIcon>
 #include <QNetworkDiskCache>
 #include <QNetworkProxyFactory>
+#include <QNetworkReply>
 #include <QObject>
 #include <QQmlApplicationEngine>
 #include <QQmlContext>
@@ -46,11 +47,10 @@
 #include "colorschemer.h"
 #include "controller.h"
 #include "logger.h"
-#include "matriximageprovider.h"
 #include "neochatconfig.h"
 #include "roommanager.h"
-#include "windowcontroller.h"
 #include "sharehandler.h"
+#include "windowcontroller.h"
 
 #ifdef HAVE_RUNNER
 #include "runner.h"
@@ -236,6 +236,7 @@ int main(int argc, char *argv[])
     Q_IMPORT_QML_PLUGIN(org_kde_neochat_timelinePlugin)
     Q_IMPORT_QML_PLUGIN(org_kde_neochat_devtoolsPlugin)
     Q_IMPORT_QML_PLUGIN(org_kde_neochat_loginPlugin)
+    Q_IMPORT_QML_PLUGIN(org_kde_neochat_chatbarPlugin)
 
     qml_register_types_org_kde_neochat();
 
@@ -285,7 +286,6 @@ int main(int argc, char *argv[])
         ShareHandler::instance().setText(parser.value(shareOption));
     }
 
-    engine.addImageProvider(QLatin1String("mxc"), MatrixImageProvider::create(&engine, &engine));
     engine.addImageProvider(QLatin1String("blurhash"), new BlurhashImageProvider);
 
     engine.loadFromModule("org.kde.neochat", "Main");

src/models/accountemoticonmodel.cpp

@@ -37,7 +37,7 @@ QVariant AccountEmoticonModel::data(const QModelIndex &index, int role) const
     const auto &row = index.row();
     const auto &image = m_images->images[row];
     if (role == UrlRole) {
-        return m_connection->makeMediaUrl(image.url);
+        return m_connection->makeMediaUrl(image.url).toString();
     }
     if (role == BodyRole) {
         if (image.body) {
@@ -163,7 +163,11 @@ void AccountEmoticonModel::setEmoticonImage(int index, const QUrl &source)
 QCoro::Task<void> AccountEmoticonModel::doSetEmoticonImage(int index, QUrl source)
 {
     auto job = m_connection->uploadFile(source.isLocalFile() ? source.toLocalFile() : source.toString());
+#if Quotient_VERSION_MINOR > 8
+    co_await qCoro(job.get(), &BaseJob::finished);
+#else
     co_await qCoro(job, &BaseJob::finished);
+#endif
     if (job->error() != BaseJob::NoError) {
         co_return;
     }
@@ -185,7 +189,11 @@ QCoro::Task<void> AccountEmoticonModel::doSetEmoticonImage(int index, QUrl sourc
 QCoro::Task<void> AccountEmoticonModel::doAddEmoticon(QUrl source, QString shortcode, QString description, QString type)
 {
     auto job = m_connection->uploadFile(source.isLocalFile() ? source.toLocalFile() : source.toString());
+#if Quotient_VERSION_MINOR > 8
+    co_await qCoro(job.get(), &BaseJob::finished);
+#else
     co_await qCoro(job, &BaseJob::finished);
+#endif
     if (job->error() != BaseJob::NoError) {
         co_return;
     }

src/models/customemojimodel.cpp

@@ -153,13 +153,13 @@ QVariant CustomEmojiModel::data(const QModelIndex &idx, int role) const
 
     switch (Roles(role)) {
     case Roles::ModelData:
-        return QVariant::fromValue(Emoji(QStringLiteral("image://mxc/") + data.url.mid(6), data.name, true));
+        return QVariant::fromValue(Emoji(m_connection->makeMediaUrl(QUrl(data.url)).toString(), data.name, true));
     case Roles::Name:
     case Roles::DisplayRole:
     case Roles::ReplacedTextRole:
         return data.name;
     case Roles::ImageURL:
-        return QUrl(QStringLiteral("image://mxc/") + data.url.mid(6));
+        return m_connection->makeMediaUrl(QUrl(data.url));
     case Roles::MxcUrl:
         return m_connection->makeMediaUrl(QUrl(data.url));
     default:
@@ -205,7 +205,7 @@ QVariantList CustomEmojiModel::filterModel(const QString &filter)
         if (!emoji.name.contains(filter, Qt::CaseInsensitive))
             continue;
 
-        results << QVariant::fromValue(Emoji(QStringLiteral("image://mxc/") + emoji.url.mid(6), emoji.name, true));
+        results << QVariant::fromValue(Emoji(m_connection->makeMediaUrl(QUrl(emoji.url)).toString(), emoji.name, true));
     }
     return results;
 }

src/models/devicesmodel.cpp

@@ -128,8 +128,12 @@ void DevicesModel::logout(const QString &deviceId, const QString &password)
             authData["type"_ls] = "m.login.password"_ls;
             QJsonObject identifier = {{"type"_ls, "m.id.user"_ls}, {"user"_ls, m_connection->user()->id()}};
             authData["identifier"_ls] = identifier;
-            auto *innerJob = m_connection->callApi<NeochatDeleteDeviceJob>(m_devices[index].deviceId, authData);
+            auto innerJob = m_connection->callApi<NeochatDeleteDeviceJob>(m_devices[index].deviceId, authData);
+#if Quotient_VERSION_MINOR > 8
+            connect(innerJob.get(), &BaseJob::success, this, onSuccess);
+#else
             connect(innerJob, &BaseJob::success, this, onSuccess);
+#endif
         } else {
             onSuccess();
         }

src/models/messagecontentmodel.cpp

@@ -110,11 +110,14 @@ MessageContentModel::MessageContentModel(const Quotient::RoomEvent *event, NeoCh
                 endResetModel();
             }
         });
-        connect(m_room, &NeoChatRoom::urlPreviewEnabledChanged, this, &MessageContentModel::updateLinkPreviewer);
+        connect(m_room, &NeoChatRoom::urlPreviewEnabledChanged, this, [this]() {
-        connect(NeoChatConfig::self(), &NeoChatConfig::ShowLinkPreviewChanged, this, &MessageContentModel::updateLinkPreviewer);
+            updateComponents();
+        });
+        connect(NeoChatConfig::self(), &NeoChatConfig::ShowLinkPreviewChanged, this, [this]() {
+            updateComponents();
+        });
     }
 
-    updateLinkPreviewer();
     updateComponents();
 }
 
@@ -197,8 +200,9 @@ QVariant MessageContentModel::data(const QModelIndex &index, int role) const
         return eventHandler.getReplyMediaInfo();
     }
     if (role == LinkPreviewerRole) {
-        if (m_linkPreviewer != nullptr) {
+        if (component.type == MessageComponentType::LinkPreview) {
-            return QVariant::fromValue<LinkPreviewer *>(m_linkPreviewer);
+            return QVariant::fromValue<LinkPreviewer *>(
+                dynamic_cast<NeoChatConnection *>(m_room->connection())->previewerForLink(component.attributes["link"_ls].toUrl()));
         } else {
             return QVariant::fromValue<LinkPreviewer *>(emptyLinkPreview);
         }
@@ -272,12 +276,8 @@ void MessageContentModel::updateComponents(bool isEditing)
         m_components.append(componentsForType(eventHandler.messageComponentType()));
     }
 
-    if (m_linkPreviewer != nullptr) {
+    if (m_room->urlPreviewEnabled()) {
-        if (m_linkPreviewer->loaded()) {
+        addLinkPreviews();
-            m_components += MessageComponent{MessageComponentType::LinkPreview, QString(), {}};
-        } else {
-            m_components += MessageComponent{MessageComponentType::LinkPreviewLoad, QString(), {}};
-        }
     }
 
     endResetModel();
@@ -294,6 +294,9 @@ QList<MessageComponent> MessageContentModel::componentsForType(MessageComponentT
     case MessageComponentType::File: {
         QList<MessageComponent> components;
         components += MessageComponent{MessageComponentType::File, QString(), {}};
+        const auto event = eventCast<const Quotient::RoomMessageEvent>(m_event);
+        auto body = EventHandler::rawMessageBody(*event);
+        components += TextHandler().textComponents(body, EventHandler::messageBodyInputFormat(*event), m_room, event, event->isReplaced());
         if (m_emptyItinerary) {
             auto fileTransferInfo = fileInfo();
 
@@ -321,46 +324,77 @@ QList<MessageComponent> MessageContentModel::componentsForType(MessageComponentT
         }
         return components;
     }
+    case MessageComponentType::Image:
+    case MessageComponentType::Video: {
+        if (!m_event->is<StickerEvent>()) {
+            const auto event = eventCast<const Quotient::RoomMessageEvent>(m_event);
+            QList<MessageComponent> components;
+            components += MessageComponent{type, QString(), {}};
+            auto body = EventHandler::rawMessageBody(*event);
+            components += TextHandler().textComponents(body, EventHandler::messageBodyInputFormat(*event), m_room, event, event->isReplaced());
+            return components;
+        }
+    }
     default:
         return {MessageComponent{type, QString(), {}}};
     }
 }
 
-void MessageContentModel::updateLinkPreviewer()
+MessageComponent MessageContentModel::linkPreviewComponent(const QUrl &link)
 {
-    if (m_room == nullptr || m_event == nullptr) {
+    const auto linkPreviewer = dynamic_cast<NeoChatConnection *>(m_room->connection())->previewerForLink(link);
-        if (m_linkPreviewer != nullptr) {
+    if (linkPreviewer == nullptr) {
-            m_linkPreviewer->disconnect(this);
+        return {};
-            m_linkPreviewer = nullptr;
-            updateComponents();
-        }
-        return;
     }
-    if (!m_room->urlPreviewEnabled()) {
+    if (linkPreviewer->loaded()) {
-        if (m_linkPreviewer != nullptr) {
+        return MessageComponent{MessageComponentType::LinkPreview, QString(), {{"link"_ls, link}}};
-            m_linkPreviewer->disconnect(this);
+    } else {
-            m_linkPreviewer = nullptr;
+        connect(linkPreviewer, &LinkPreviewer::loadedChanged, [this, link]() {
-            updateComponents();
+            const auto linkPreviewer = dynamic_cast<NeoChatConnection *>(m_room->connection())->previewerForLink(link);
-        }
+            if (linkPreviewer != nullptr && linkPreviewer->loaded()) {
-        return;
+                for (auto &component : m_components) {
-    }
+                    if (component.attributes["link"_ls].toUrl() == link) {
-
-    if (const auto event = eventCast<const Quotient::RoomMessageEvent>(m_event)) {
-        if (LinkPreviewer::hasPreviewableLinks(event)) {
-            m_linkPreviewer = dynamic_cast<NeoChatConnection *>(m_room->connection())->previewerForLink(LinkPreviewer::linkPreview(event));
-            updateComponents();
-
-            if (m_linkPreviewer != nullptr) {
-                connect(m_linkPreviewer, &LinkPreviewer::loadedChanged, [this]() {
-                    if (m_linkPreviewer != nullptr && m_linkPreviewer->loaded()) {
                         // HACK: Because DelegateChooser can't switch the delegate on dataChanged it has to think there is a new delegate.
                         beginResetModel();
-                        m_components[m_components.size() - 1].type = MessageComponentType::LinkPreview;
+                        component.type = MessageComponentType::LinkPreview;
                         endResetModel();
                     }
-                });
+                }
+            }
+        });
+        return MessageComponent{MessageComponentType::LinkPreviewLoad, QString(), {{"link"_ls, link}}};
+    }
+}
+
+void MessageContentModel::addLinkPreviews()
+{
+    int i = 0;
+    while (i < m_components.size()) {
+        const auto component = m_components.at(i);
+        if (component.type == MessageComponentType::Text || component.type == MessageComponentType::Quote) {
+            if (LinkPreviewer::hasPreviewableLinks(component.content)) {
+                const auto links = LinkPreviewer::linkPreviews(component.content);
+                for (qsizetype j = 0; j < links.size(); ++j) {
+                    const auto linkPreview = linkPreviewComponent(links[j]);
+                    if (!m_removedLinkPreviews.contains(links[j]) && !linkPreview.isEmpty()) {
+                        m_components.insert(i + j + 1, linkPreview);
+                    }
+                };
             }
         }
+        i++;
+    }
+}
+
+void MessageContentModel::closeLinkPreview(int row)
+{
+    if (m_components[row].type == MessageComponentType::LinkPreview || m_components[row].type == MessageComponentType::LinkPreviewLoad) {
+        beginResetModel();
+        m_removedLinkPreviews += m_components[row].attributes["link"_ls].toUrl();
+        m_components.remove(row);
+        m_components.squeeze();
+        updateComponents();
+        endResetModel();
     }
 }
 

src/models/messagecontentmodel.h

@@ -11,11 +11,9 @@
 #include "enums/messagecomponenttype.h"
 #include "eventhandler.h"
 #include "itinerarymodel.h"
-#include "linkpreviewer.h"
-#include "neochatroom.h"
 
 struct MessageComponent {
-    MessageComponentType::Type type;
+    MessageComponentType::Type type = MessageComponentType::Other;
     QString content;
     QVariantMap attributes;
 
@@ -23,6 +21,11 @@ struct MessageComponent {
     {
         return type == right.type && content == right.content && attributes == right.attributes;
     }
+
+    bool isEmpty() const
+    {
+        return type == MessageComponentType::Other;
+    }
 };
 
 /**
@@ -88,6 +91,13 @@ public:
      */
     [[nodiscard]] QHash<int, QByteArray> roleNames() const override;
 
+    /**
+     * @brief Close the link preview at the given index.
+     *
+     * If the given index is not a link preview component, nothing happens.
+     */
+    Q_INVOKABLE void closeLinkPreview(int row);
+
 private:
     QPointer<NeoChatRoom> m_room;
     const Quotient::RoomEvent *m_event = nullptr;
@@ -95,12 +105,14 @@ private:
     QList<MessageComponent> m_components;
     void updateComponents(bool isEditing = false);
 
-    QPointer<LinkPreviewer> m_linkPreviewer;
     ItineraryModel *m_itineraryModel = nullptr;
 
     QList<MessageComponent> componentsForType(MessageComponentType::Type type);
+    MessageComponent linkPreviewComponent(const QUrl &link);
+    void addLinkPreviews();
+
+    QList<QUrl> m_removedLinkPreviews;
 
-    void updateLinkPreviewer();
     void updateItineraryModel();
     bool m_emptyItinerary = false;
 

src/models/permissionsmodel.cpp

@@ -0,0 +1,254 @@
+// SPDX-FileCopyrightText: 2024 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 "permissionsmodel.h"
+#include "powerlevel.h"
+
+#include <Quotient/events/roompowerlevelsevent.h>
+
+#include <KLazyLocalizedString>
+
+static const QStringList defaultPermissions = {
+    QStringLiteral("users_default"),
+    QStringLiteral("state_default"),
+    QStringLiteral("events_default"),
+    QStringLiteral("invite"),
+    QStringLiteral("kick"),
+    QStringLiteral("ban"),
+    QStringLiteral("redact"),
+    QStringLiteral("m.reaction"),
+    QStringLiteral("m.room.redaction"),
+    QStringLiteral("m.room.power_levels"),
+    QStringLiteral("m.room.name"),
+    QStringLiteral("m.room.avatar"),
+    QStringLiteral("m.room.canonical_alias"),
+    QStringLiteral("m.room.topic"),
+    QStringLiteral("m.room.encryption"),
+    QStringLiteral("m.room.history_visibility"),
+    QStringLiteral("m.room.pinned_events"),
+    QStringLiteral("m.room.tombstone"),
+    QStringLiteral("m.room.server_acl"),
+    QStringLiteral("m.space.child"),
+    QStringLiteral("m.space.parent"),
+};
+
+// Alternate name text for default permissions.
+static const QHash<QString, KLazyLocalizedString> defaultPermissionNames = {
+    {QStringLiteral("users_default"), kli18nc("Room permission type", "Default user power level")},
+    {QStringLiteral("state_default"), kli18nc("Room permission type", "Default power level to set the room state")},
+    {QStringLiteral("events_default"), kli18nc("Room permission type", "Default power level to send messages")},
+    {QStringLiteral("invite"), kli18nc("Room permission type", "Invite users")},
+    {QStringLiteral("kick"), kli18nc("Room permission type", "Kick users")},
+    {QStringLiteral("ban"), kli18nc("Room permission type", "Ban users")},
+    {QStringLiteral("redact"), kli18nc("Room permission type", "Remove messages sent by other users")},
+    {QStringLiteral("m.reaction"), kli18nc("Room permission type", "Send reactions")},
+    {QStringLiteral("m.room.redaction"), kli18nc("Room permission type", "Remove their own messages")},
+    {QStringLiteral("m.room.power_levels"), kli18nc("Room permission type", "Change user permissions")},
+    {QStringLiteral("m.room.name"), kli18nc("Room permission type", "Change the room name")},
+    {QStringLiteral("m.room.avatar"), kli18nc("Room permission type", "Change the room avatar")},
+    {QStringLiteral("m.room.canonical_alias"), kli18nc("Room permission type", "Change the room canonical alias")},
+    {QStringLiteral("m.room.topic"), kli18nc("Room permission type", "Change the room topic")},
+    {QStringLiteral("m.room.encryption"), kli18nc("Room permission type", "Enable encryption for the room")},
+    {QStringLiteral("m.room.history_visibility"), kli18nc("Room permission type", "Change the room history visibility")},
+    {QStringLiteral("m.room.pinned_events"), kli18nc("Room permission type", "Set pinned events")},
+    {QStringLiteral("m.room.tombstone"), kli18nc("Room permission type", "Upgrade the room")},
+    {QStringLiteral("m.room.server_acl"), kli18nc("Room permission type", "Set the room server access control list (ACL)")},
+    {QStringLiteral("m.space.child"), kli18nc("Room permission type", "Set the children of this space")},
+    {QStringLiteral("m.space.parent"), kli18nc("Room permission type", "Set the parent space of this room")},
+};
+
+// Subtitles for the default values.
+static const QHash<QString, KLazyLocalizedString> defaultSubtitles = {
+    {QStringLiteral("users_default"), kli18nc("Room permission type", "This is the power level for all new users when joining the room")},
+    {QStringLiteral("state_default"), kli18nc("Room permission type", "This is used for all state events that do not have their own entry here")},
+    {QStringLiteral("events_default"), kli18nc("Room permission type", "This is used for all message events that do not have their own entry here")},
+};
+
+// Permissions that should use the event default.
+static const QStringList eventPermissions = {
+    QStringLiteral("m.room.message"),
+    QStringLiteral("m.reaction"),
+    QStringLiteral("m.room.redaction"),
+};
+
+PermissionsModel::PermissionsModel(QObject *parent)
+    : QAbstractListModel(parent)
+{
+}
+
+NeoChatRoom *PermissionsModel::room() const
+{
+    return m_room;
+}
+
+void PermissionsModel::setRoom(NeoChatRoom *room)
+{
+    if (room == m_room) {
+        return;
+    }
+    m_room = room;
+    Q_EMIT roomChanged();
+
+    initializeModel();
+}
+
+void PermissionsModel::initializeModel()
+{
+    beginResetModel();
+
+    m_permissions.clear();
+
+    if (m_room == nullptr) {
+        endResetModel();
+        return;
+    }
+
+    const auto currentPowerLevelEvent = m_room->currentState().get<Quotient::RoomPowerLevelsEvent>();
+    if (currentPowerLevelEvent == nullptr) {
+        return;
+    }
+
+    m_permissions.append(defaultPermissions);
+
+    for (const auto &event : currentPowerLevelEvent->events().keys()) {
+        if (!m_permissions.contains(event)) {
+            m_permissions += event;
+        }
+    }
+
+    endResetModel();
+}
+
+QVariant PermissionsModel::data(const QModelIndex &index, int role) const
+{
+    if (m_room == nullptr || !index.isValid()) {
+        return {};
+    }
+    if (index.row() >= rowCount()) {
+        qDebug() << "PushRuleModel, something's wrong: index.row() >= m_rules.count()";
+        return {};
+    }
+
+    const auto permission = m_permissions.value(index.row());
+    if (role == NameRole) {
+        if (defaultPermissionNames.keys().contains(permission)) {
+            return defaultPermissionNames.value(permission).toString();
+        }
+        return permission;
+    }
+    if (role == SubtitleRole) {
+        if (permission.startsWith(QLatin1String("m.")) && defaultPermissionNames.keys().contains(permission)) {
+            return permission;
+        }
+        if (defaultSubtitles.contains(permission)) {
+            return defaultSubtitles.value(permission).toString();
+        }
+        return QString();
+    }
+    if (role == TypeRole) {
+        return permission;
+    }
+    if (role == LevelRole) {
+        const auto level = powerLevel(permission);
+        if (level.has_value()) {
+            return *level;
+        }
+        return {};
+    }
+    if (role == LevelNameRole) {
+        const auto level = powerLevel(permission);
+        if (level.has_value()) {
+            return i18nc("%1 is the name of the power level, e.g. admin and %2 is the value that represents.",
+                         "%1 (%2)",
+                         PowerLevel::nameForLevel(PowerLevel::levelForValue(*level)),
+                         *level);
+        }
+        return QString();
+    }
+    if (role == IsDefaultValueRole) {
+        return permission.contains(QLatin1String("default"));
+    }
+    if (role == IsBasicPermissionRole) {
+        return permission == QStringLiteral("invite") || permission == QStringLiteral("kick") || permission == QStringLiteral("ban")
+            || permission == QStringLiteral("redact");
+    }
+    return {};
+}
+
+int PermissionsModel::rowCount(const QModelIndex &parent) const
+{
+    Q_UNUSED(parent)
+    return m_permissions.count();
+}
+
+QHash<int, QByteArray> PermissionsModel::roleNames() const
+{
+    QHash<int, QByteArray> roles = QAbstractItemModel::roleNames();
+    roles[NameRole] = "name";
+    roles[SubtitleRole] = "subtitle";
+    roles[TypeRole] = "type";
+    roles[LevelRole] = "level";
+    roles[LevelNameRole] = "levelName";
+    roles[IsDefaultValueRole] = "isDefaultValue";
+    roles[IsBasicPermissionRole] = "isBasicPermission";
+    return roles;
+}
+
+std::optional<int> PermissionsModel::powerLevel(const QString &permission) const
+{
+    if (m_room == nullptr) {
+        return std::nullopt;
+    }
+
+    if (const auto currentPowerLevelEvent = m_room->currentState().get<Quotient::RoomPowerLevelsEvent>()) {
+        if (permission == QStringLiteral("ban")) {
+            return currentPowerLevelEvent->ban();
+        } else if (permission == QStringLiteral("kick")) {
+            return currentPowerLevelEvent->kick();
+        } else if (permission == QStringLiteral("invite")) {
+            return currentPowerLevelEvent->invite();
+        } else if (permission == QStringLiteral("redact")) {
+            return currentPowerLevelEvent->redact();
+        } else if (permission == QStringLiteral("users_default")) {
+            return currentPowerLevelEvent->usersDefault();
+        } else if (permission == QStringLiteral("state_default")) {
+            return currentPowerLevelEvent->stateDefault();
+        } else if (permission == QStringLiteral("events_default")) {
+            return currentPowerLevelEvent->eventsDefault();
+        } else if (eventPermissions.contains(permission)) {
+            return currentPowerLevelEvent->powerLevelForEvent(permission);
+        } else {
+            return currentPowerLevelEvent->powerLevelForState(permission);
+        }
+    }
+    return std::nullopt;
+}
+
+void PermissionsModel::setPowerLevel(const QString &permission, const int &newPowerLevel)
+{
+    if (m_room == nullptr) {
+        return;
+    }
+
+    int clampPowerLevel = std::clamp(newPowerLevel, -1, 100);
+
+    const auto currentPowerLevel = powerLevel(permission);
+    if (!currentPowerLevel.has_value() || currentPowerLevel == clampPowerLevel) {
+        return;
+    }
+
+    if (auto currentPowerLevelEvent = m_room->currentState().get<Quotient::RoomPowerLevelsEvent>()) {
+        auto powerLevelContent = currentPowerLevelEvent->contentJson();
+        if (powerLevelContent.contains(permission)) {
+            powerLevelContent[permission] = clampPowerLevel;
+        } else {
+            auto eventPowerLevels = powerLevelContent[QLatin1String("events")].toObject();
+            eventPowerLevels[permission] = clampPowerLevel;
+            powerLevelContent[QLatin1String("events")] = eventPowerLevels;
+        }
+
+        m_room->setState<Quotient::RoomPowerLevelsEvent>(powerLevelContent);
+    }
+}
+
+#include "moc_permissionsmodel.cpp"

src/models/permissionsmodel.h

@@ -0,0 +1,87 @@
+// SPDX-FileCopyrightText: 2024 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 <QAbstractListModel>
+#include <QQmlEngine>
+#include <optional>
+
+#include "neochatroom.h"
+
+/**
+ * @class PermissionsModel
+ *
+ * This class defines the model for managing room permission levels.
+ */
+class PermissionsModel : public QAbstractListModel
+{
+    Q_OBJECT
+    QML_ELEMENT
+
+    /**
+     * @brief The room to show the permissions for
+     */
+    Q_PROPERTY(NeoChatRoom *room READ room WRITE setRoom NOTIFY roomChanged)
+
+public:
+    /**
+     * @brief Defines the model roles.
+     */
+    enum Roles {
+        NameRole = Qt::DisplayRole, /**< The permission name. */
+        SubtitleRole, /**< The description of the permission. */
+        TypeRole, /**< The base type of the permission, normally the event type id except for ban, kick, etc. */
+        LevelRole, /**< The current power level for the permission. */
+        LevelNameRole, /**< The current power level for the permission as a string. */
+        IsDefaultValueRole, /**< Whether the permission is a default value, e.g. for users. */
+        IsBasicPermissionRole, /**< Whether the permission is one of the basic ones, e.g. kick, ban, etc. */
+    };
+    Q_ENUM(Roles)
+
+    explicit PermissionsModel(QObject *parent = nullptr);
+
+    NeoChatRoom *room() const;
+    void setRoom(NeoChatRoom *room);
+
+    /**
+     * @brief Get the given role value at the given index.
+     *
+     * @sa QAbstractItemModel::data
+     */
+    [[nodiscard]] QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
+
+    /**
+     * @brief Number of rows in the model.
+     *
+     * @sa QAbstractItemModel::rowCount
+     */
+    [[nodiscard]] int rowCount(const QModelIndex &parent = QModelIndex()) const override;
+
+    /**
+     * @brief Returns a mapping from Role enum values to role names.
+     *
+     * @sa Roles, QAbstractItemModel::roleNames()
+     */
+    [[nodiscard]] QHash<int, QByteArray> roleNames() const override;
+
+    /**
+     * @brief Return the power level required for the given permission.
+     */
+    std::optional<int> powerLevel(const QString &permission) const;
+
+    /**
+     * @brief Set the power level required for the given permission.
+     */
+    Q_INVOKABLE void setPowerLevel(const QString &permission, const int &newPowerLevel);
+
+Q_SIGNALS:
+    void roomChanged();
+
+private:
+    QPointer<NeoChatRoom> m_room;
+
+    QStringList m_permissions;
+
+    void initializeModel();
+};

src/models/reactionmodel.cpp

@@ -5,6 +5,7 @@
 #include "neochatroom.h"
 
 #include <QDebug>
+#include <QFont>
 #ifdef HAVE_ICU
 #include <QTextBoundaryFinder>
 #include <QTextCharFormat>

src/models/roomlistmodel.cpp

@@ -4,7 +4,7 @@
 #include "roomlistmodel.h"
 
 #include "eventhandler.h"
-#include "neochatconfig.h"
+#include "neochatconnection.h"
 #include "neochatroom.h"
 #include "roommanager.h"
 #include "spacehierarchycache.h"

src/models/searchmodel.h

@@ -122,7 +122,7 @@ private:
 
     QString m_searchText;
     QPointer<NeoChatRoom> m_room;
-    Quotient::Omittable<Quotient::SearchJob::ResultRoomEvents> m_result = Quotient::none;
+    std::optional<Quotient::SearchJob::ResultRoomEvents> m_result = std::nullopt;
     Quotient::SearchJob *m_job = nullptr;
     bool m_searching = false;
 };

src/models/threepidmodel.cpp

@@ -10,15 +10,7 @@ ThreePIdModel::ThreePIdModel(NeoChatConnection *connection)
 {
     Q_ASSERT(connection);
     connect(connection, &NeoChatConnection::stateChanged, this, [this]() {
-        const auto connection = dynamic_cast<NeoChatConnection *>(this->parent());
+        refreshModel();
-        if (connection != nullptr && connection->isLoggedIn()) {
-            const auto threePIdJob = connection->callApi<Quotient::GetAccount3PIDsJob>();
-            connect(threePIdJob, &Quotient::BaseJob::success, this, [this, threePIdJob]() {
-                beginResetModel();
-                m_threePIds = threePIdJob->threepids();
-                endResetModel();
-            });
-        }
     });
 }
 
@@ -56,4 +48,17 @@ QHash<int, QByteArray> ThreePIdModel::roleNames() const
     };
 }
 
+void ThreePIdModel::refreshModel()
+{
+    const auto connection = dynamic_cast<NeoChatConnection *>(this->parent());
+    if (connection != nullptr && connection->isLoggedIn()) {
+        const auto threePIdJob = connection->callApi<Quotient::GetAccount3PIDsJob>();
+        connect(threePIdJob, &Quotient::BaseJob::success, this, [this, threePIdJob]() {
+            beginResetModel();
+            m_threePIds = threePIdJob->threepids();
+            endResetModel();
+        });
+    }
+}
+
 #include "moc_threepidmodel.cpp"

src/models/threepidmodel.h

@@ -53,6 +53,8 @@ public:
      */
     [[nodiscard]] QHash<int, QByteArray> roleNames() const override;
 
+    Q_INVOKABLE void refreshModel();
+
 private:
     QVector<Quotient::GetAccount3PIDsJob::ThirdPartyIdentifier> m_threePIds;
 };

src/models/userlistmodel.cpp

@@ -7,6 +7,7 @@
 
 #include <Quotient/events/roompowerlevelsevent.h>
 
+#include "enums/powerlevel.h"
 #include "neochatroom.h"
 
 using namespace Quotient;
@@ -94,16 +95,10 @@ QVariant UserListModel::data(const QModelIndex &index, int role) const
 
         auto userPl = pl->powerLevelForUser(user->id());
 
-        switch (userPl) {
+        return i18nc("%1 is the name of the power level, e.g. admin and %2 is the value that represents.",
-        case 0:
+                     "%1 (%2)",
-            return QStringLiteral("Member");
+                     PowerLevel::nameForLevel(PowerLevel::levelForValue(userPl)),
-        case 50:
+                     userPl);
-            return QStringLiteral("Moderator");
-        case 100:
-            return QStringLiteral("Admin");
-        default:
-            return QStringLiteral("Custom");
-        }
     }
 
     return {};

src/neochat.notifyrc

@@ -202,7 +202,6 @@ Name[pl]=Nowe zaproszenie
 Name[pt]=Novo Convite
 Name[pt_BR]=Novo convite
 Name[ru]=Новое приглашение
-Name[sk]=Nová pozvánka
 Name[sl]=Novo povabilo
 Name[sv]=Ny inbjudan
 Name[ta]=புதிய அழைப்பிதழ்
@@ -242,7 +241,6 @@ Comment[pl]=Dostępna jest nowe zaproszenie do pokoju
 Comment[pt]=Existe um novo convite para uma sala
 Comment[pt_BR]=Existe um novo convite para uma sala
 Comment[ru]=Доступно новое приглашение в комнату
-Comment[sk]=Máte novú pozvánku do miestnosti
 Comment[sl]=Tam je novo povabilo v sobo
 Comment[sv]=Det finns en ny inbjudan till ett rum
 Comment[ta]=ஓர் அரங்கிற்கான புதிய அழைப்பிதழ் உள்ளது
@@ -255,15 +253,13 @@ Action=Popup
 
 [Event/Share]
 Name=Share
-Name[ar]=شارك
 Name[ca]=Compartició
-Name[ca@valencia]=Compartiu
+Name[ca@valencia]=Compartició
 Name[cs]=Sdílet
 Name[en_GB]=Share
 Name[eo]=Kundividi
 Name[es]=Compartir
 Name[eu]=Partekatu
-Name[fi]=Jaa
 Name[fr]=Partager
 Name[hu]=Megosztás
 Name[ia]=Comparti
@@ -271,25 +267,20 @@ Name[it]=Condivisione
 Name[ka]=გაზიარება
 Name[lv]=Kopīgot
 Name[nl]=Gedeelde
-Name[nn]=Del
 Name[pl]=Udostępnij
-Name[sk]=Zdieľať
 Name[sl]=Deli
-Name[sv]=Dela
 Name[ta]=பகிர்
 Name[tr]=Paylaş
 Name[uk]=Оприлюднення
 Name[x-test]=xxSharexx
 Name[zh_TW]=分享
 Comment=The result of sharing a piece of content
-Comment[ar]=نتيجة مشاركة محتوى
 Comment[ca]=El resultat de compartir una peça de contingut
 Comment[ca@valencia]=El resultat de compartir una peça de contingut
 Comment[en_GB]=The result of sharing a piece of content
 Comment[eo]=La rezulto el kundividado de enhavero
 Comment[es]=El resultado de compartir una parte de contenido
 Comment[eu]=Eduki pieza bat partekatzearen emaitza
-Comment[fi]=Tulos yhden sisältöosasen jakamisesta
 Comment[fr]=Le résultat du partage d'une partie de contenu.
 Comment[hu]=Tartalom megosztásának eredménye
 Comment[ia]=Le exito de compartir un pecietta de contento
@@ -297,11 +288,8 @@ Comment[it]=Il risultato della condivisione di un contenuto
 Comment[ka]=შემცველობის ნაწილის გაზიარების შედეგი
 Comment[lv]=Satura kopīgošanas rezultāts
 Comment[nl]=Het resultaat van het delen van een stukje inhoud
-Comment[nn]=Resultatet av deling av innhald
 Comment[pl]=Wynik udostępniania kawałka treści
-Comment[sk]=Výsledok zdieľania obsahu
 Comment[sl]=Rezultat deljenega kosa vsebine
-Comment[sv]=Resultatet av att dela innehåll
 Comment[ta]=எதையோ பகிர்ந்த‍தன் விளைவு
 Comment[tr]=Bir parça içerik paylaşımının sonucu
 Comment[uk]=Результат оприлюднення даних

src/neochatconfig.kcfg

@@ -136,6 +136,9 @@
         <choice name="Socks5">
           <label>Socks5</label>
         </choice>
+        <choice name="NoProxy">
+          <label>NoProxy</label>
+        </choice>
         <default>System</default>
       </choices>
     </entry>
@@ -179,6 +182,10 @@
       <label>Enable secret backup</label>
       <default>false</default>
     </entry>
+    <entry name="Phone3PId" type="bool">
+      <label>Enable add phone numbers as 3PIDs</label>
+      <default>false</default>
+    </entry>
   </group>
 </kcfg>
 

src/neochatroom.cpp

@@ -69,7 +69,7 @@ NeoChatRoom::NeoChatRoom(Connection *connection, QString roomId, JoinState joinS
         setHasFileUploading(false);
     });
 
-    connect(this, &Room::aboutToAddHistoricalMessages, this, &NeoChatRoom::readMarkerLoadedChanged);
+    connect(this, &Room::addedMessages, this, &NeoChatRoom::readMarkerLoadedChanged);
 
     const auto &roomLastMessageProvider = RoomLastMessageProvider::self();
 
@@ -876,7 +876,7 @@ void NeoChatRoom::setUserPowerLevel(const QString &userID, const int &powerLevel
         qWarning() << "User is not a member of this room so power level cannot be set";
         return;
     }
-    int clampPowerLevel = std::clamp(powerLevel, 0, 100);
+    int clampPowerLevel = std::clamp(powerLevel, -1, 100);
 
     auto powerLevelContent = currentState().get("m.room.power_levels"_ls)->contentJson();
     auto powerLevelUserOverrides = powerLevelContent["users"_ls].toObject();
@@ -898,254 +898,6 @@ int NeoChatRoom::getUserPowerLevel(const QString &userId) const
     return powerLevelEvent->powerLevelForUser(userId);
 }
 
-int NeoChatRoom::powerLevel(const QString &eventName, const bool &isStateEvent) const
-{
-    const auto powerLevelEvent = currentState().get<RoomPowerLevelsEvent>();
-    if (eventName == "ban"_ls) {
-        return powerLevelEvent->ban();
-    } else if (eventName == "kick"_ls) {
-        return powerLevelEvent->kick();
-    } else if (eventName == "invite"_ls) {
-        return powerLevelEvent->invite();
-    } else if (eventName == "redact"_ls) {
-        return powerLevelEvent->redact();
-    } else if (eventName == "users_default"_ls) {
-        return powerLevelEvent->usersDefault();
-    } else if (eventName == "state_default"_ls) {
-        return powerLevelEvent->stateDefault();
-    } else if (eventName == "events_default"_ls) {
-        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)
-{
-    auto powerLevelContent = currentState().get("m.room.power_levels"_ls)->contentJson();
-    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"_ls].toObject();
-
-        if (eventPowerLevels.contains(eventName)) {
-            powerLevel = eventPowerLevels[eventName].toInt();
-        } else {
-            if (isStateEvent) {
-                powerLevel = powerLevelContent["state_default"_ls].toInt();
-            } else {
-                powerLevel = powerLevelContent["events_default"_ls].toInt();
-            }
-        }
-
-        if (powerLevel != clampPowerLevel) {
-            eventPowerLevels[eventName] = clampPowerLevel;
-            powerLevelContent["events"_ls] = eventPowerLevels;
-        }
-    }
-
-    setState("m.room.power_levels"_ls, {}, powerLevelContent);
-}
-
-int NeoChatRoom::defaultUserPowerLevel() const
-{
-    return powerLevel("users_default"_ls);
-}
-
-void NeoChatRoom::setDefaultUserPowerLevel(const int &newPowerLevel)
-{
-    setPowerLevel("users_default"_ls, newPowerLevel);
-}
-
-int NeoChatRoom::invitePowerLevel() const
-{
-    return powerLevel("invite"_ls);
-}
-
-void NeoChatRoom::setInvitePowerLevel(const int &newPowerLevel)
-{
-    setPowerLevel("invite"_ls, newPowerLevel);
-}
-
-int NeoChatRoom::kickPowerLevel() const
-{
-    return powerLevel("kick"_ls);
-}
-
-void NeoChatRoom::setKickPowerLevel(const int &newPowerLevel)
-{
-    setPowerLevel("kick"_ls, newPowerLevel);
-}
-
-int NeoChatRoom::banPowerLevel() const
-{
-    return powerLevel("ban"_ls);
-}
-
-void NeoChatRoom::setBanPowerLevel(const int &newPowerLevel)
-{
-    setPowerLevel("ban"_ls, newPowerLevel);
-}
-
-int NeoChatRoom::redactPowerLevel() const
-{
-    return powerLevel("redact"_ls);
-}
-
-void NeoChatRoom::setRedactPowerLevel(const int &newPowerLevel)
-{
-    setPowerLevel("redact"_ls, newPowerLevel);
-}
-
-int NeoChatRoom::statePowerLevel() const
-{
-    return powerLevel("state_default"_ls);
-}
-
-void NeoChatRoom::setStatePowerLevel(const int &newPowerLevel)
-{
-    setPowerLevel("state_default"_ls, newPowerLevel);
-}
-
-int NeoChatRoom::defaultEventPowerLevel() const
-{
-    return powerLevel("events_default"_ls);
-}
-
-void NeoChatRoom::setDefaultEventPowerLevel(const int &newPowerLevel)
-{
-    setPowerLevel("events_default"_ls, newPowerLevel);
-}
-
-int NeoChatRoom::powerLevelPowerLevel() const
-{
-    return powerLevel("m.room.power_levels"_ls, true);
-}
-
-void NeoChatRoom::setPowerLevelPowerLevel(const int &newPowerLevel)
-{
-    setPowerLevel("m.room.power_levels"_ls, newPowerLevel, true);
-}
-
-int NeoChatRoom::namePowerLevel() const
-{
-    return powerLevel("m.room.name"_ls, true);
-}
-
-void NeoChatRoom::setNamePowerLevel(const int &newPowerLevel)
-{
-    setPowerLevel("m.room.name"_ls, newPowerLevel, true);
-}
-
-int NeoChatRoom::avatarPowerLevel() const
-{
-    return powerLevel("m.room.avatar"_ls, true);
-}
-
-void NeoChatRoom::setAvatarPowerLevel(const int &newPowerLevel)
-{
-    setPowerLevel("m.room.avatar"_ls, newPowerLevel, true);
-}
-
-int NeoChatRoom::canonicalAliasPowerLevel() const
-{
-    return powerLevel("m.room.canonical_alias"_ls, true);
-}
-
-void NeoChatRoom::setCanonicalAliasPowerLevel(const int &newPowerLevel)
-{
-    setPowerLevel("m.room.canonical_alias"_ls, newPowerLevel, true);
-}
-
-int NeoChatRoom::topicPowerLevel() const
-{
-    return powerLevel("m.room.topic"_ls, true);
-}
-
-void NeoChatRoom::setTopicPowerLevel(const int &newPowerLevel)
-{
-    setPowerLevel("m.room.topic"_ls, newPowerLevel, true);
-}
-
-int NeoChatRoom::encryptionPowerLevel() const
-{
-    return powerLevel("m.room.encryption"_ls, true);
-}
-
-void NeoChatRoom::setEncryptionPowerLevel(const int &newPowerLevel)
-{
-    setPowerLevel("m.room.encryption"_ls, newPowerLevel, true);
-}
-
-int NeoChatRoom::historyVisibilityPowerLevel() const
-{
-    return powerLevel("m.room.history_visibility"_ls, true);
-}
-
-void NeoChatRoom::setHistoryVisibilityPowerLevel(const int &newPowerLevel)
-{
-    setPowerLevel("m.room.history_visibility"_ls, newPowerLevel, true);
-}
-
-int NeoChatRoom::pinnedEventsPowerLevel() const
-{
-    return powerLevel("m.room.pinned_events"_ls, true);
-}
-
-void NeoChatRoom::setPinnedEventsPowerLevel(const int &newPowerLevel)
-{
-    setPowerLevel("m.room.pinned_events"_ls, newPowerLevel, true);
-}
-
-int NeoChatRoom::tombstonePowerLevel() const
-{
-    return powerLevel("m.room.tombstone"_ls, true);
-}
-
-void NeoChatRoom::setTombstonePowerLevel(const int &newPowerLevel)
-{
-    setPowerLevel("m.room.tombstone"_ls, newPowerLevel, true);
-}
-
-int NeoChatRoom::serverAclPowerLevel() const
-{
-    return powerLevel("m.room.server_acl"_ls, true);
-}
-
-void NeoChatRoom::setServerAclPowerLevel(const int &newPowerLevel)
-{
-    setPowerLevel("m.room.server_acl"_ls, newPowerLevel, true);
-}
-
-int NeoChatRoom::spaceChildPowerLevel() const
-{
-    return powerLevel("m.space.child"_ls, true);
-}
-
-void NeoChatRoom::setSpaceChildPowerLevel(const int &newPowerLevel)
-{
-    setPowerLevel("m.space.child"_ls, newPowerLevel, true);
-}
-
-int NeoChatRoom::spaceParentPowerLevel() const
-{
-    return powerLevel("m.space.parent"_ls, true);
-}
-
-void NeoChatRoom::setSpaceParentPowerLevel(const int &newPowerLevel)
-{
-    setPowerLevel("m.space.parent"_ls, newPowerLevel, true);
-}
-
 QCoro::Task<void> NeoChatRoom::doDeleteMessagesByUser(const QString &user, QString reason)
 {
     QStringList events;
@@ -1156,7 +908,11 @@ QCoro::Task<void> NeoChatRoom::doDeleteMessagesByUser(const QString &user, QStri
     }
     for (const auto &e : events) {
         auto job = connection()->callApi<RedactEventJob>(id(), QString::fromLatin1(QUrl::toPercentEncoding(e)), connection()->generateTxnId(), reason);
+#if Quotient_VERSION_MINOR > 8
+        co_await qCoro(job.get(), &BaseJob::finished);
+#else
         co_await qCoro(job, &BaseJob::finished);
+#endif
         if (job->error() != BaseJob::Success) {
             qWarning() << "Error: \"" << job->error() << "\" while deleting messages. Aborting";
             break;