Consider server from room id when joining a room

(cherry picked from commit c66c035dbb)

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 "04")
-set(RELEASE_SERVICE_VERSION_MICRO "80")
+set(RELEASE_SERVICE_VERSION_MINOR "07")
+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():
-
-    result = load_json("sync_response_no_rooms") if ("login" in request.headers.get("Authorization")) else load_json("sync_response_rooms")
+    global next_sync_payload
+    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("richHttps") << QStringLiteral("test-validrichlink-event.json") << QUrl("https://kde.org"_ls);
-    QTest::newRow("plainWww") << QStringLiteral("test-validplainwwwlink-event.json") << QUrl("www.example.org"_ls);
-    QTest::newRow("multipleHttps") << QStringLiteral("test-multiplelink-event.json") << QUrl("www.example.org"_ls);
+    QTest::newRow("plainHttps") << QStringLiteral("https://kde.org") << QUrl("https://kde.org"_ls);
+    QTest::newRow("richHttps") << QStringLiteral("<a href=\"https://kde.org\">Rich Link</a>") << QUrl("https://kde.org"_ls);
+    QTest::newRow("richHttpsLinkDescription") << QStringLiteral("<a href=\"https://kde.org\">https://kde.org</a>") << QUrl("https://kde.org"_ls);
 }
 
 void LinkPreviewerTest::linkPreviewsMatch()
 {
-    QFETCH(QString, eventSource);
+    QFETCH(QString, inputString);
     QFETCH(QUrl, testOutputLink);
 
-    auto event = TestUtils::loadEventFromFile<RoomMessageEvent>(eventSource);
-    auto linkPreviewer = LinkPreviewer(LinkPreviewer::linkPreview(event.get()), connection);
+    auto link = LinkPreviewer::linkPreviews(inputString)[0];
 
-    QCOMPARE(linkPreviewer.empty(), false);
-    QCOMPARE(linkPreviewer.url(), testOutputLink);
+    QCOMPARE(link, 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("matrixTo") << QStringLiteral("test-invalidmatrixtolink-event.json");
-    QTest::newRow("noSpace") << QStringLiteral("test-invalidnospacelink-event.json");
+    QTest::newRow("mxc") << QStringLiteral("mxc://example.org/SEsfnsuifSDFSSEF");
+    QTest::newRow("matrixTo") << QStringLiteral("https://matrix.to/#/@alice:example.org");
+    QTest::newRow("noSpace") << QStringLiteral("testhttps://kde.org");
 }
 
 void LinkPreviewerTest::linkPreviewsReject()
 {
-    QFETCH(QString, eventSource);
+    QFETCH(QString, inputString);
 
-    auto event = TestUtils::loadEventFromFile<RoomMessageEvent>(eventSource);
-    auto linkPreviewer = LinkPreviewer(LinkPreviewer::linkPreview(event.get()), connection);
+    auto links = LinkPreviewer::linkPreviews(inputString);
 
-    QCOMPARE(linkPreviewer.empty(), true);
-    QCOMPARE(linkPreviewer.url(), QUrl());
+    QCOMPARE(links.empty(), true);
 }
 
 QTEST_MAIN(LinkPreviewerTest)

org.kde.neochat.appdata.xml

@@ -84,7 +84,7 @@
     <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="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="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>
     <p xml:lang="it">NeoChat è un'applicazione di chat che ti consente di sfruttare appieno la rete Matrix. Ti fornisce un modo sicuro per inviare messaggi di testo, video e file audio a familiari, colleghi e amici.</p>
@@ -118,6 +118,7 @@
     <p xml:lang="nn">NeoChat har som mål å støtta all funksjonalitet i Matrix-spesifikasjonen. Førebels er alt i den gjeldande stabile spesifikasjonen støtta, med unntak av VoIP, trådar og nokre delar av ende-til-kryptering. Det finst òg andre småting som ikkje er støtta, sidan Matrix-spesifikasjon er i stadig endring, men målet er altså støtte for alt.</p>
     <p xml:lang="pl">NeoChat w zamyśle ma być pełnowartościową aplikacją wg wytycznych Matriksa. Z tego powodu, wszystko, co jest obecnie w stabilnych wytycznych z pominięciem VoIP, wątków i niektórych części szyfrowania Użytkownik-do-Użytkownika są obecnie obsługiwane. Pominięto też kilka mniejszych rzeczy ze względu na ciągły rozwój wytycznych Matriksa, lecz celem nadal jest zapewnienie obsługi wszystkich wytycznych.</p>
     <p xml:lang="pt">O NeoChat pretende ser uma aplicação completa para a especificação do Matrix. Como tal, tudo o que existe na especificação estável actual, com as notáveis excepções do VoIP, tópicos e alguns aspectos da Encriptação Ponto-a-Ponto, são suportados. Existem mais algumas omissões, devido ao facto que a norma do Matrix está em constante evolução, mas o objectivo continua a ser oferecer o suporte eventual para a norma por inteiro.</p>
+    <p xml:lang="ru">Целью создания NeoChat является полноценная реализация программы для спецификации Matrix. Как следствие, реализовано всё в текущей стабильной спецификации (за исключением голосовой интернет-связи, потоков и некоторых аспектов сквозного шифрования). Есть также несколько других незначительных пробелов, обусловленных постоянными изменениями спецификации Matrix. Тем не менее, стоит задача в итоге предоставить полную поддержку спецификации.</p>
     <p xml:lang="sl">Neochat cilja, da bi bila popolna aplikacija po specifikaciji Matrixa. Kot takšna vsebuje vse v trenutni stabilni specifikaciji z pomembnimi izjemami pri VoIP, nitih in nekaterih vidikov šifriranja od konca do konca. Obstaja nekaj drugih manjših opustitev zaradi dejstva, da se specifikacija Matrix nenehno razvija, vendar cilj ostaja zagotoviti morebitno podporo celotni specifikaciji.</p>
     <p xml:lang="sv">NeoChat har som mål att vara ett fullständigt program enligt Matrix-specifikationen. Som sådant stöds allt i den nuvarande stabila specifikationen, med de nämnvärda undantagen VoIP, trådar och några aspekter av kryptering hela vägen. Det finns några ytterligare utelämnanden på grund av att Matrix-specifikationen hela tiden utvecklas, men målet förblir att till slut erbjuda stöd för hela specifikationen.</p>
     <p xml:lang="tr">NeoChat, Matrix belirtimi için tam özellikli bir uygulama olmayı hedefler. Bu nedenle; VoIP, ileti zincirleri ve Uçtan Uca Şifreleme’nin bazı yönleri gibi dikkate değer istisnalar dışında var olan kararlı belirtimdeki her şey desteklenir. Matrix belirtiminin sürekli gelişmesi nedeniyle birkaç küçük eksiklik daha var; ancak amaç tüm belirtim için nihai destek sağlamak olmayı sürdürüyor.</p>
@@ -145,6 +146,7 @@
     <p xml:lang="nn">På grunn av måten Matrix-spesifikasjonen vert utvikla på, støttar NeoChat òg nokre uferdige funksjonar:</p>
     <p xml:lang="pl">Ze względu na sposób rozwoju Matriksa, NeoChat obsługuje także kilka niestabilnych możliwości. Obecnie są to:</p>
     <p xml:lang="pt">Devido à natureza do desenvolvimento da especificação do Matrix, o NeoChat também suporta diversas funcionalidades instáveis. De momento são:</p>
+    <p xml:lang="ru">В силу природы разработки спецификации Matrix в NeoChat тоже предусмотрена поддержка многочисленных нестабильных возможностей. В текущей версии это следующие возможности:</p>
     <p xml:lang="sl">Zaradi narave razvoja specifikacije Matrixa NeoChat podpira tudi številne nestabilne zmožnosti. Trenutno so to:</p>
     <p xml:lang="sv">På grund av sättet Matrix-specifikationens utvecklas, stöder NeoChat också ett stor antal instabila funktioner. För närvarande är de:</p>
     <p xml:lang="ta">மேட்ரிக்ஸு நெறிமுறை வரையறுக்கப்படும் வித‍த்தின் காரணமாக, பல நிலையற்ற அம்சங்களையும் நியோச்சாட் ஆதரிக்கிறது. தற்போது ஆதரிக்கப்படுபவை:</p>
@@ -202,6 +204,7 @@
       <li xml:lang="nn">Klistremerke-pakkar – MSC2545</li>
       <li xml:lang="pl">Paczki naklejek - MSC2545</li>
       <li xml:lang="pt">Pacotes de Autocolantes - MSC2545</li>
+      <li xml:lang="ru">Наборы стикеров — MSC2545</li>
       <li xml:lang="sl">Sticker Packs - MSC2545</li>
       <li xml:lang="sv">Sticker Packs - MSC2545</li>
       <li xml:lang="ta">ஒட்டி தொகுப்புகள் - MSC2545</li>
@@ -230,6 +233,7 @@
       <li xml:lang="nn">Posisjonshendingar – MSC3488</li>
       <li xml:lang="pl">Wydarzenia w miejscach - MSC3488</li>
       <li xml:lang="pt">Eventos com Localizações - MSC3488</li>
+      <li xml:lang="ru">События местоположения — MSC3488</li>
       <li xml:lang="sl">Location Events - MSC3488</li>
       <li xml:lang="sv">Location Events - MSC3488</li>
       <li xml:lang="ta">இட நிகழ்வுகள் - MSC3488</li>
@@ -291,6 +295,7 @@
       <caption xml:lang="nn">Hovudvising med romliste, pratevindauge og rominformasjon</caption>
       <caption xml:lang="pl">Główny widok z wykazem pokojów, rozmowami i szczegółami pokojów</caption>
       <caption xml:lang="pt">A área principal com a lista de salas e com informações sobre a conversa e a sala</caption>
+      <caption xml:lang="ru">Главное окно со списком комнат, чатом и информацией о комнате</caption>
       <caption xml:lang="sl">Glavni pogled s seznamom sob, klepetom in informacijami o sobah</caption>
       <caption xml:lang="sv">Huvudvy med rumslista, chatt, och rumsinformation</caption>
       <caption xml:lang="ta">அரங்குப்பட்டியல், உரையாடல், மற்றும் அரங்குவிவரங்களைக் கொண்டுள்ள பிரதான காட்சி</caption>
@@ -350,6 +355,7 @@
       <caption xml:lang="nn">Hovudvising med romliste, pratevindauge og rominformasjon</caption>
       <caption xml:lang="pl">Główny widok z wykazem pokojów, rozmowami i szczegółami pokojów</caption>
       <caption xml:lang="pt">A área principal com a lista de salas e com informações sobre a conversa e a sala</caption>
+      <caption xml:lang="ru">Главное окно со списком комнат, чатом и информацией о комнате</caption>
       <caption xml:lang="sl">Glavni pogled s seznamom sob, klepetom in informacijami o sobah</caption>
       <caption xml:lang="sv">Huvudvy med rumslista, chatt, och rumsinformation</caption>
       <caption xml:lang="ta">அரங்குப்பட்டியல், உரையாடல், மற்றும் அரங்குவிவரங்களைக் கொண்டுள்ள பிரதான காட்சி</caption>
@@ -381,6 +387,7 @@
       <caption xml:lang="nn">Innloggingsbilete</caption>
       <caption xml:lang="pl">Ekran logowania</caption>
       <caption xml:lang="pt">Ecrã de autenticação</caption>
+      <caption xml:lang="ru">Окно входа</caption>
       <caption xml:lang="sl">Prijavni zaslon</caption>
       <caption xml:lang="sv">Inloggningsfönster</caption>
       <caption xml:lang="ta">நுழைவுத் திரை</caption>
@@ -394,6 +401,7 @@
     <content_attribute id="social-chat">intense</content_attribute>
   </content_rating>
   <releases>
+    <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"/>
     <release version="24.02.0" date="2024-02-28">

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,12 @@ 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
 )
 
 set_source_files_properties(qml/OsmLocationPlugin.qml PROPERTIES
@@ -207,16 +211,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 +234,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 +257,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 +274,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)
@@ -368,16 +366,18 @@ endif()
 
 if (NOT ANDROID AND NOT WIN32 AND NOT APPLE)
     target_compile_definitions(neochat PUBLIC -DHAVE_RUNNER)
-    target_compile_definitions(neochat PUBLIC -DHAVE_X11)
+    target_compile_definitions(neochat PUBLIC -DHAVE_X11=1)
     target_sources(neochat PRIVATE runner.cpp)
 
     if (TARGET KUnifiedPush)
         target_sources(neochat PRIVATE fakerunner.cpp)
     endif()
+else()
+    target_compile_definitions(neochat PUBLIC -DHAVE_X11=0)
 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/actionshandler.cpp

@@ -14,7 +14,6 @@
 #include "models/actionsmodel.h"
 #include "neochatconfig.h"
 #include "texthandler.h"
-#include "utils.h"
 
 using namespace Quotient;
 
@@ -146,26 +145,6 @@ void ActionsHandler::handleMessage(const QString &text, QString handledText, Cha
         return;
     }
 
-    // We want to add back the <mx-reply> if it's in the original message but not in the edit, to preserve the reply.
-    for (auto it = m_room->messageEvents().crbegin(); it != m_room->messageEvents().crend(); it++) {
-        if (const auto event = eventCast<const RoomMessageEvent>(&**it)) {
-            if (event->senderId() == m_room->localUser()->id() && event->hasTextContent()) {
-                QString originalString;
-                if (event->content()) {
-                    originalString = static_cast<const Quotient::EventContent::TextContent *>(event->content())->body;
-                } else {
-                    originalString = event->plainBody();
-                }
-
-                const QRegularExpression exp(TextRegex::removeRichReply);
-                const auto match = exp.match(originalString);
-                if (match.hasCaptured(0) && !handledText.contains(TextRegex::removeRichReply)) {
-                    handledText.prepend(match.captured(0));
-                }
-            }
-        }
-    }
-
     m_room->postMessage(text, handledText, messageType, chatBarCache->replyId(), chatBarCache->editId(), chatBarCache->threadId());
 }
 

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/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/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
@@ -1038,7 +1041,11 @@ QString EventHandler::getReadMarkersString() const
     QString readMarkersString = i18np("1 user: ", "%1 users: ", userIds.size());
     for (const auto &userId : userIds) {
         auto user = m_room->user(userId);
-        readMarkersString += user->displayname(m_room) + i18nc("list separator", ", ");
+        auto displayName = user->displayname(m_room);
+        if (displayName.isEmpty()) {
+            displayName = userId;
+        }
+        readMarkersString += displayName + i18nc("list separator", ", ");
     }
     readMarkersString.chop(2);
     return readMarkersString;

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,154 @@
+// 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();
+}

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) {
-        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 data = string.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"))) {
-            return QUrl(link);
+        if (!link.contains(QStringLiteral("matrix.to")) && !links.contains(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(NeoChatConfig::self(), &NeoChatConfig::ShowLinkPreviewChanged, this, &MessageContentModel::updateLinkPreviewer);
+        connect(m_room, &NeoChatRoom::urlPreviewEnabledChanged, this, [this]() {
+            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) {
-            return QVariant::fromValue<LinkPreviewer *>(m_linkPreviewer);
+        if (component.type == MessageComponentType::LinkPreview) {
+            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_linkPreviewer->loaded()) {
-            m_components += MessageComponent{MessageComponentType::LinkPreview, QString(), {}};
-        } else {
-            m_components += MessageComponent{MessageComponentType::LinkPreviewLoad, QString(), {}};
-        }
+    if (m_room->urlPreviewEnabled()) {
+        addLinkPreviews();
     }
 
     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) {
-        if (m_linkPreviewer != nullptr) {
-            m_linkPreviewer->disconnect(this);
-            m_linkPreviewer = nullptr;
-            updateComponents();
-        }
-        return;
+    const auto linkPreviewer = dynamic_cast<NeoChatConnection *>(m_room->connection())->previewerForLink(link);
+    if (linkPreviewer == nullptr) {
+        return {};
     }
-    if (!m_room->urlPreviewEnabled()) {
-        if (m_linkPreviewer != nullptr) {
-            m_linkPreviewer->disconnect(this);
-            m_linkPreviewer = nullptr;
-            updateComponents();
-        }
-        return;
-    }
-
-    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()) {
+    if (linkPreviewer->loaded()) {
+        return MessageComponent{MessageComponentType::LinkPreview, QString(), {{"link"_ls, link}}};
+    } else {
+        connect(linkPreviewer, &LinkPreviewer::loadedChanged, [this, link]() {
+            const auto linkPreviewer = dynamic_cast<NeoChatConnection *>(m_room->connection())->previewerForLink(link);
+            if (linkPreviewer != nullptr && linkPreviewer->loaded()) {
+                for (auto &component : m_components) {
+                    if (component.attributes["link"_ls].toUrl() == link) {
                         // 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/reactionmodel.cpp

@@ -5,6 +5,7 @@
 #include "neochatroom.h"
 
 #include <QDebug>
+#include <QFont>
 #ifdef HAVE_ICU
 #include <QTextBoundaryFinder>
 #include <QTextCharFormat>
@@ -68,7 +69,8 @@ QVariant ReactionModel::data(const QModelIndex &index, int role) const
                     text += i18nc("Separate the usernames of users", " and ");
                 }
             }
-            text += reaction.authors.at(i).toMap()[QStringLiteral("displayName")].toString();
+            auto displayName = reaction.authors.at(i).toMap()[QStringLiteral("displayName")].toString();
+            text += displayName.isEmpty() ? reaction.authors.at(i).toMap()[QStringLiteral("id")].toString() : displayName;
         }
 
         if (reaction.authors.count() > 3) {

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());
-        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();
-            });
-        }
+        refreshModel();
     });
 }
 
@@ -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/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

@@ -1156,7 +1156,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;

src/neochatroom.h

@@ -8,13 +8,11 @@
 #include <QCache>
 #include <QObject>
 #include <QQmlEngine>
-#include <QTextCursor>
 
 #include <QCoroTask>
 #include <Quotient/user.h>
 
 #include "enums/pushrule.h"
-#include "events/pollevent.h"
 #include "pollhandler.h"
 
 namespace Quotient

src/proxycontroller.cpp

@@ -4,6 +4,7 @@
 #include "proxycontroller.h"
 
 #include <QNetworkProxy>
+#include <QNetworkProxyFactory>
 
 #include "neochatconfig.h"
 
@@ -15,18 +16,28 @@ void ProxyController::setApplicationProxy()
     switch (cfg->proxyType()) {
     case 1:
         proxy.setType(QNetworkProxy::HttpProxy);
+        proxy.setHostName(cfg->proxyHost());
+        proxy.setPort(cfg->proxyPort());
+        proxy.setUser(cfg->proxyUser());
+        proxy.setPassword(cfg->proxyPassword());
+        QNetworkProxy::setApplicationProxy(proxy);
         break;
     case 2:
         proxy.setType(QNetworkProxy::Socks5Proxy);
+        proxy.setHostName(cfg->proxyHost());
+        proxy.setPort(cfg->proxyPort());
+        proxy.setUser(cfg->proxyUser());
+        proxy.setPassword(cfg->proxyPassword());
+        QNetworkProxy::setApplicationProxy(proxy);
+        break;
+    case 3:
+        proxy.setType(QNetworkProxy::NoProxy);
+        QNetworkProxy::setApplicationProxy(proxy);
         break;
     default:
+        QNetworkProxyFactory::setUseSystemConfiguration(true);
         break;
     }
-    proxy.setHostName(cfg->proxyHost());
-    proxy.setPort(cfg->proxyPort());
-    proxy.setUser(cfg->proxyUser());
-    proxy.setPassword(cfg->proxyPassword());
-    QNetworkProxy::setApplicationProxy(proxy);
 }
 
 ProxyController::ProxyController(QObject *parent)

src/purpose/purposeplugin.json

@@ -7,9 +7,11 @@
                 "Name[ca]": "Tobias Fella",
                 "Name[cs]": "Tobias Fella",
                 "Name[de]": "Tobias Fella",
+                "Name[eo]": "Tobias Fella",
                 "Name[es]": "Tobias Fella",
                 "Name[eu]": "Tobias Fella",
                 "Name[fr]": "Tobias Fella",
+                "Name[gl]": "Tobias Fella",
                 "Name[hu]": "Tobias Fella",
                 "Name[ia]": "Tobias Fella",
                 "Name[it]": "Tobias Fella",
@@ -17,6 +19,7 @@
                 "Name[lv]": "Tobias Fella",
                 "Name[nl]": "Tobias Fella",
                 "Name[pl]": "Tobias Fella",
+                "Name[ru]": "Tobias Fella",
                 "Name[sl]": "Tobias Fella",
                 "Name[ta]": "டோபியாஸ் ஃபெல்லா",
                 "Name[tr]": "Tobias Fella",
@@ -30,9 +33,11 @@
         "Description[ca@valencia]": "Compartix a través de NeoChat",
         "Description[ca]": "Comparteix a través del NeoChat",
         "Description[de]": "Über NeoChat teilen",
+        "Description[eo]": "Kundividi per NeoChat",
         "Description[es]": "Compartir mediante NeoChat",
         "Description[eu]": "Partekatu NeoChat bidez",
         "Description[fr]": "Partager grâce à NeoChat",
+        "Description[gl]": "Compartir por NeoChat",
         "Description[hu]": "Megosztás NeoChatben",
         "Description[ia]": "Comparti via NeoChat",
         "Description[it]": "Condividi tramite NeoChat",
@@ -40,6 +45,7 @@
         "Description[lv]": "Kopīgot ar „NeoChat“",
         "Description[nl]": "Delen via NeoChat",
         "Description[pl]": "Udostępnij przez NeoChat",
+        "Description[ru]": "Опубликовать в NeoChat",
         "Description[sl]": "Deli prek NeoChat",
         "Description[ta]": "நியோச்சாட் மூலம் பகிர்",
         "Description[tr]": "NeoChat ile Paylaş",
@@ -54,9 +60,11 @@
         "Name[ca]": "NeoChat",
         "Name[cs]": "NeoChat",
         "Name[de]": "NeoChat",
+        "Name[eo]": "NeoChat",
         "Name[es]": "NeoChat",
         "Name[eu]": "NeoChat",
         "Name[fr]": "NeoChat",
+        "Name[gl]": "NeoChat",
         "Name[hu]": "NeoChat",
         "Name[ia]": "Neochat",
         "Name[it]": "NeoChat",
@@ -64,6 +72,7 @@
         "Name[lv]": "NeoChat",
         "Name[nl]": "NeoChat",
         "Name[pl]": "NeoChat",
+        "Name[ru]": "NeoChat",
         "Name[sl]": "NeoChat",
         "Name[ta]": "நியோச்சாட்",
         "Name[tr]": "NeoChat",

src/qml/AccountSwitchDialog.qml

@@ -125,7 +125,7 @@ Kirigami.Dialog {
                         width: Kirigami.Units.gridUnit + Kirigami.Units.largeSpacing
                         height: Kirigami.Units.gridUnit + Kirigami.Units.largeSpacing
                     }
-                    source: userDelegate.connection.localUser.avatarMediaId ? ("image://mxc/" + userDelegate.connection.localUser.avatarMediaId) : ""
+                    source: userDelegate.connection.localUser.avatarMediaId ? userDelegate.connection.makeMediaUrl("mxc://" + userDelegate.connection.localUser.avatarMediaId) : ""
                     name: userDelegate.connection.localUser.displayName ?? userDelegate.connection.localUser.id
                 }
 

src/qml/AskDirectChatConfirmation.qml

@@ -0,0 +1,40 @@
+// SPDX-FileCopyrightText: 2024 Tobias Fella <tobias.fella@kde.org>
+// SPDX-License-Identifier: LGPL-2.0-or-later
+
+import QtQuick
+import QtQuick.Controls as QQC2
+
+import org.kde.kirigami as Kirigami
+
+import org.kde.neochat
+
+Kirigami.Dialog {
+    id: root
+
+    required property var user
+
+    width: Math.min(Kirigami.Units.gridUnit * 24, QQC2.ApplicationWindow.window.width)
+    height: Kirigami.Units.gridUnit * 8
+
+    standardButtons: QQC2.Dialog.Close
+    title: i18nc("@title:dialog", "Start a chat")
+
+    contentItem: QQC2.Label {
+        text: i18n("Do you want to start a chat with %1?", root.user.displayName)
+        textFormat: Text.PlainText
+        wrapMode: Text.Wrap
+        horizontalAlignment: Qt.AlignHCenter
+        verticalAlignment: Qt.AlignVCenter
+    }
+
+    customFooterActions: [
+        Kirigami.Action {
+            text: i18nc("@action:button", "Start Chat")
+            icon.name: "im-user"
+            onTriggered: {
+                root.user.requestDirectChat();
+                root.close();
+            }
+        }
+    ]
+}

src/qml/AttachmentPane.qml

@@ -46,7 +46,7 @@ ColumnLayout {
             }
 
             onClicked: {
-                let imageEditor = applicationWindow().pageStack.layers.push(imageEditorPage);
+                let imageEditor = applicationWindow().pageStack.pushDialogLayer(imageEditorPage);
                 imageEditor.newPathChanged.connect(function (newPath) {
                     applicationWindow().pageStack.layers.pop();
                     root.attachmentPath = newPath;

src/qml/CollapsedRoomDelegate.qml

@@ -32,7 +32,7 @@ QQC2.ItemDelegate {
     visible: root.categoryVisible || filterText.length > 0
 
     contentItem: KirigamiComponents.Avatar {
-        source: root.avatar ? `image://mxc/${root.avatar}` : ""
+        source: root.avatar ? root.currentRoom.connection.makeMediaUrl("mxc://" + root.avatar) : ""
         name: root.displayName
 
         sourceSize {