CI - Flatpak - Update Runtime/SDK to 6.7

.flatpak-manifest.json

@@ -110,7 +110,7 @@
                 {
                     "type": "git",
                     "url": "https://github.com/quotient-im/libQuotient.git",
-                    "branch": "0.8.x",
+                    "branch": "dev",
                     "disable-submodules": true
                 }
             ],

.gitignore

@@ -12,4 +12,3 @@ kate.project.ctags.*
 .idea/
 cmake-build-*
 src/res.generated.qrc
-.qmlls.ini

.gitlab-ci.yml

@@ -8,7 +8,7 @@ include:
       - /gitlab-templates/android-qt6.yml
       - /gitlab-templates/linux-qt6.yml
       - /gitlab-templates/windows-qt6.yml
-#      - /gitlab-templates/freebsd-qt6.yml
+      - /gitlab-templates/freebsd-qt6.yml
       - /gitlab-templates/flatpak.yml
       - /gitlab-templates/craft-android-qt6-apks.yml
       - /gitlab-templates/craft-appimage-qt6.yml

.kde-ci.yml

@@ -28,7 +28,6 @@ Dependencies:
     'frameworks/kio': '@latest-kf6'
     'frameworks/kwindowsystem': '@latest-kf6'
     'frameworks/kstatusnotifieritem': '@latest-kf6'
-    'frameworks/kcrash': '@latest-kf6'
 - 'on': ['Linux', 'FreeBSD']
   'require':
     'frameworks/kdbusaddons': '@latest-kf6'
@@ -40,4 +39,4 @@ Dependencies:
 
 Options:
   per-test-timeout: 90
-  require-passing-tests-on: [ 'Linux', 'Android', 'FreeBSD' ]
+  require-passing-tests-on: [ '@all' ]

CMakeLists.txt

@@ -8,7 +8,7 @@ cmake_minimum_required(VERSION 3.16)
 
 # KDE Applications version, managed by release script.
 set(RELEASE_SERVICE_VERSION_MAJOR "24")
-set(RELEASE_SERVICE_VERSION_MINOR "07")
+set(RELEASE_SERVICE_VERSION_MINOR "04")
 set(RELEASE_SERVICE_VERSION_MICRO "70")
 set(RELEASE_SERVICE_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE_VERSION_MINOR}.${RELEASE_SERVICE_VERSION_MICRO}")
 
@@ -84,7 +84,7 @@ if(ANDROID)
     )
 else()
     find_package(Qt6 ${QT_MIN_VERSION} COMPONENTS Widgets)
-    find_package(KF6 ${KF_MIN_VERSION} REQUIRED COMPONENTS QQC2DesktopStyle KIO WindowSystem StatusNotifierItem Crash)
+    find_package(KF6 ${KF_MIN_VERSION} REQUIRED COMPONENTS QQC2DesktopStyle KIO WindowSystem StatusNotifierItem)
     find_package(KF6SyntaxHighlighting ${KF_MIN_VERSION} REQUIRED)
     set_package_properties(KF6QQC2DesktopStyle PROPERTIES
         TYPE RUNTIME
@@ -102,7 +102,7 @@ if (NOT ANDROID AND NOT WIN32 AND NOT APPLE)
     find_package(KF6DBusAddons ${KF_MIN_VERSION} REQUIRED)
 endif()
 
-find_package(QuotientQt6 0.8.2)
+find_package(QuotientQt6 0.7)
 set_package_properties(QuotientQt6 PROPERTIES
     TYPE REQUIRED
     DESCRIPTION "Qt wrapper around Matrix API"

README.md

@@ -1,6 +1,6 @@
 <!--
     SPDX-FileCopyrightText: 2020-2021 Carl Schwan <carlschwan@kde.org>
-    SPDX-FileCopyrightText: 2020-2024 Tobias Fella <tobias.fella@kde.org>
+    SPDX-FileCopyrightText: 2020-2021 Tobias Fella <tobias.fella@kde.org>
     SPDX-FileCopyrightText: 2023 James Graham <james.h.graham@protonmail.com>
     SPDX-License-Identifier: CC0-1.0
 -->
@@ -16,18 +16,19 @@ A Qt/QML based Matrix client.
 ## Introduction
 
 NeoChat is a client for [Matrix](https://matrix.org), the decentralized communication protocol for instant
-messaging.
+messaging. It is a fork of Spectral, using KDE frameworks, most notably [Kirigami](https://invent.kde.org/frameworks/kirigami)
+to provide a convergent experience across multiple platforms.
 
-NeoChat is based on KDE frameworks and as [libQuotient](https://github.com/quotient-im/libQuotient), a
+NeoChat also make use of other KDE Frameworks as well as [libQuotient](https://github.com/quotient-im/libQuotient), a
 Qt-based SDK for the [Matrix Protocol](https://spec.matrix.org/).
 
 ![Timeline](https://cdn.kde.org/screenshots/neochat/application.png)
 
 ## Features
 
-NeoChat aims to be a fully featured application for the Matrix specification. As such most parts of the current specification are supported, with the notable exceptions
-of VoIP, threads, and some aspects of End-to-End Encryption. There are a few other smaller omissions due to the fact that the Matrix spec is constantly
-evolving, but the aim remains to provide eventual support for the entire spec.
+NeoChat aims to be a fully featured application for the Matrix specification. As such everything in the current stable specification with the notable exceptions
+of VoIP, threads and some aspects of End-to-End Encryption are supported. There are a few other smaller omissions due to the fact that the Matrix spec is constantly
+evolving but the aim remains to provide eventual support for the entire spec.
 
 Due to the nature of the Matrix specification development NeoChat also supports numerous unstable features. Currently these are:
 - Polls - MSC3381
@@ -38,9 +39,26 @@ Due to the nature of the Matrix specification development NeoChat also supports
 
 Details where to find stable releases for NeoChat can be found on its [homepage](https://apps.kde.org/neochat).
 
-Nightly builds for Linux and Windows can be downloaded from [cdn.kde.org](https://cdn.kde.org/ci-builds/network/neochat/).
-Nightly builds for Android are available from [KDE's nightly F-Droid repository](https://community.kde.org/Android/F-Droid).
-Nightly Flatpaks are available from [KDE's nightly Flatpak repository](https://userbase.kde.org/Tutorials/Flatpak).
+In addition to the stable builds, unstable nightly builds are available for all platforms. These can be downloaded
+from the [binary factory](https://binary-factory.kde.org/). There are unstable versions for the following platforms
+in addition to stable ones:
+- Android
+- MacOS
+- Windows
+
+Additionally the nightly Flatpak version can be obtained from the nightly Flatpak repo using the following commands in your terminal:
+
+```
+flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
+flatpak remote-add --if-not-exists kdeapps --from https://distribute.kde.org/kdeapps.flatpakrepo
+flatpak install kdeapps org.kde.neochat
+```
+
+The unstable Android version can also be obtained from the [KDE nightly F-Droid repo](https://community.kde.org/Android/FDroid).
+
+## Running
+
+Just start the executable in your preferred way - either from the build directory or from the installed location.
 
 ## Building NeoChat
 
@@ -51,18 +69,14 @@ is primarily aimed at Linux development.
 For Windows and Android [Craft](https://invent.kde.org/packaging/craft) is the primary choice. There are guides for setting up
 development environments for [Windows](https://community.kde.org/Get_Involved/development/Windows) and [Android](https://develop.kde.org/docs/packaging/android/building_applications/).
 
-## Running
-
-Just start the executable in your preferred way - either from the build directory or from the installed location.
-
 ## Tests
 
-Tests are in the repository under [autotests](autotests) and [appiumtests](appiumtests).
+Tests are in the repository under [autotests](autotests) and should all pass for any contribution.
 
 The project has CI setup to test new commits to the repository. All tests are expected to pass for a merge request to
 be complete.
 
-## Current build status
+Current build status
 
 ![coverage](https://invent.kde.org/network/neochat/badges/master/pipeline.svg)
 
@@ -86,9 +100,9 @@ The best place to reach the maintainers is on the KDE Matrix instance in the Neo
 
 ## Acknowledgement
 
-NeoChat utilizes [libQuotient](https://github.com/quotient-im/libQuotient/) as its Matrix SDK.
+This program utilizes [libQuotient](https://github.com/quotient-im/libQuotient/) as its Matrix SDK.
 
-NeoChat is a fork of [Spectral](https://gitlab.com/spectral-im/spectral/).
+This program is a fork of [Spectral](https://gitlab.com/spectral-im/spectral/).
 
 ## License
 

appiumtests/createroomtest.py

@@ -1,56 +0,0 @@
-#!/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

@@ -1,78 +0,0 @@
-{
-    "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,8 +6,6 @@ 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():
@@ -44,13 +42,8 @@ def load_json(name):
 
 @app.route("/_matrix/client/r0/sync")
 def sync():
-    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")
+
+    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")
@@ -72,18 +65,6 @@ 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)

appiumtests/openuserdetailstest.py

@@ -39,10 +39,6 @@ class OpenUserDetailsTest(unittest.TestCase):
 
     def test_open_sheet(self):
         self.driver.find_element(by=AppiumBy.NAME, value="@user:localhost:1234").click()
-        try:
-            self.driver.find_element(by=AppiumBy.NAME, value="Expand Normal").click()
-        except:
-            pass
         self.driver.find_element(by=AppiumBy.NAME, value="Empty room (!room_id_1234:localhost:1234)").click()
         self.driver.find_element(by=AppiumBy.NAME, value="A Display Name").click()
         self.driver.find_element(by=AppiumBy.NAME, value="Account Details")

autotests/chatbarcachetest.cpp

@@ -50,7 +50,7 @@ void ChatBarCacheTest::empty()
     QCOMPARE(chatBarCache->replyId(), QString());
     QCOMPARE(chatBarCache->isEditing(), false);
     QCOMPARE(chatBarCache->editId(), QString());
-    QCOMPARE(chatBarCache->relationUser(), room->getUser(QString()));
+    QCOMPARE(chatBarCache->relationUser(), room->getUser(nullptr));
     QCOMPARE(chatBarCache->relationMessage(), QString());
     QCOMPARE(chatBarCache->attachmentPath(), QString());
 }
@@ -98,7 +98,7 @@ void ChatBarCacheTest::reply()
     QCOMPARE(chatBarCache->replyId(), QLatin1String("$153456789:example.org"));
     QCOMPARE(chatBarCache->isEditing(), false);
     QCOMPARE(chatBarCache->editId(), QString());
-    QCOMPARE(chatBarCache->relationUser(), room->getUser(QLatin1String("@example:example.org")));
+    QCOMPARE(chatBarCache->relationUser(), room->getUser(room->user(QLatin1String("@example:example.org"))));
     QCOMPARE(chatBarCache->relationMessage(), QLatin1String("This is an example\ntext message"));
     QCOMPARE(chatBarCache->attachmentPath(), QString());
 }
@@ -115,7 +115,7 @@ void ChatBarCacheTest::edit()
     QCOMPARE(chatBarCache->replyId(), QString());
     QCOMPARE(chatBarCache->isEditing(), true);
     QCOMPARE(chatBarCache->editId(), QLatin1String("$153456789:example.org"));
-    QCOMPARE(chatBarCache->relationUser(), room->getUser(QLatin1String("@example:example.org")));
+    QCOMPARE(chatBarCache->relationUser(), room->getUser(room->user(QLatin1String("@example:example.org"))));
     QCOMPARE(chatBarCache->relationMessage(), QLatin1String("This is an example\ntext message"));
     QCOMPARE(chatBarCache->attachmentPath(), QString());
 }
@@ -132,7 +132,7 @@ void ChatBarCacheTest::attachment()
     QCOMPARE(chatBarCache->replyId(), QString());
     QCOMPARE(chatBarCache->isEditing(), false);
     QCOMPARE(chatBarCache->editId(), QString());
-    QCOMPARE(chatBarCache->relationUser(), room->getUser(QString()));
+    QCOMPARE(chatBarCache->relationUser(), room->getUser(nullptr));
     QCOMPARE(chatBarCache->relationMessage(), QString());
     QCOMPARE(chatBarCache->attachmentPath(), QLatin1String("some/path"));
 }

autotests/data/test-invalidmatrixtolink-event.json

@@ -0,0 +1,14 @@
+{
+    "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

@@ -0,0 +1,14 @@
+{
+    "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

@@ -0,0 +1,14 @@
+{
+    "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

@@ -0,0 +1,14 @@
+{
+    "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

@@ -0,0 +1,14 @@
+{
+    "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

@@ -0,0 +1,16 @@
+{
+    "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/delegatesizehelpertest.cpp

@@ -130,7 +130,7 @@ void DelegateSizeHelperTest::equalBreakpoint_data()
 }
 
 /**
- * We expect a default return except in the case where the two percentages are
+ * We expect a default return except in the case where the the two percentages are
  * equal as that case can be calculated without dividing by zero.
  */
 void DelegateSizeHelperTest::equalBreakpoint()

autotests/eventhandlertest.cpp

@@ -56,7 +56,6 @@ private Q_SLOTS:
     void genericBody();
     void nullGenericBody();
     void markdownBody();
-    void markdownBodyReply();
     void subtitle();
     void nullSubtitle();
     void mediaInfo();
@@ -101,17 +100,17 @@ void EventHandlerTest::nullEventId()
 void EventHandlerTest::author()
 {
     auto event = room->messageEvents().at(0).get();
-    auto author = room->member(event->senderId());
+    auto author = room->user(event->senderId());
     EventHandler eventHandler(room, event);
 
     auto eventHandlerAuthor = eventHandler.getAuthor();
 
-    QCOMPARE(eventHandlerAuthor["isLocalUser"_ls], author.id() == room->localMember().id());
-    QCOMPARE(eventHandlerAuthor["id"_ls], author.id());
-    QCOMPARE(eventHandlerAuthor["displayName"_ls], author.displayName());
+    QCOMPARE(eventHandlerAuthor["isLocalUser"_ls], author->id() == room->localUser()->id());
+    QCOMPARE(eventHandlerAuthor["id"_ls], author->id());
+    QCOMPARE(eventHandlerAuthor["displayName"_ls], author->displayname(room));
     QCOMPARE(eventHandlerAuthor["avatarSource"_ls], room->avatarForMember(author));
-    QCOMPARE(eventHandlerAuthor["avatarMediaId"_ls], author.avatarMediaId());
-    QCOMPARE(eventHandlerAuthor["color"_ls], Utils::getUserColor(author.hueF()));
+    QCOMPARE(eventHandlerAuthor["avatarMediaId"_ls], author->avatarMediaId(room));
+    QCOMPARE(eventHandlerAuthor["color"_ls], Utils::getUserColor(author->hueF()));
     QCOMPARE(eventHandlerAuthor["object"_ls], QVariant::fromValue(author));
 }
 
@@ -122,7 +121,7 @@ void EventHandlerTest::nullAuthor()
 
     EventHandler noEventHandler(room, nullptr);
     QTest::ignoreMessage(QtWarningMsg, "getAuthor called with m_event set to nullptr. Returning empty user.");
-    QCOMPARE(noEventHandler.getAuthor(), room->getUser(QString()));
+    QCOMPARE(noEventHandler.getAuthor(), room->getUser(nullptr));
 }
 
 void EventHandlerTest::authorDisplayName()
@@ -302,13 +301,6 @@ 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());
@@ -393,21 +385,21 @@ void EventHandlerTest::nullReplyId()
 void EventHandlerTest::replyAuthor()
 {
     auto replyEvent = room->messageEvents().at(0).get();
-    auto replyAuthor = room->member(replyEvent->senderId());
+    auto replyAuthor = room->user(replyEvent->senderId());
     EventHandler eventHandler(room, room->messageEvents().at(5).get());
 
     auto eventHandlerReplyAuthor = eventHandler.getReplyAuthor();
 
-    QCOMPARE(eventHandlerReplyAuthor["isLocalUser"_ls], replyAuthor.id() == room->localMember().id());
-    QCOMPARE(eventHandlerReplyAuthor["id"_ls], replyAuthor.id());
-    QCOMPARE(eventHandlerReplyAuthor["displayName"_ls], replyAuthor.displayName());
+    QCOMPARE(eventHandlerReplyAuthor["isLocalUser"_ls], replyAuthor->id() == room->localUser()->id());
+    QCOMPARE(eventHandlerReplyAuthor["id"_ls], replyAuthor->id());
+    QCOMPARE(eventHandlerReplyAuthor["displayName"_ls], replyAuthor->displayname(room));
     QCOMPARE(eventHandlerReplyAuthor["avatarSource"_ls], room->avatarForMember(replyAuthor));
-    QCOMPARE(eventHandlerReplyAuthor["avatarMediaId"_ls], replyAuthor.avatarMediaId());
-    QCOMPARE(eventHandlerReplyAuthor["color"_ls], Utils::getUserColor(replyAuthor.hueF()));
+    QCOMPARE(eventHandlerReplyAuthor["avatarMediaId"_ls], replyAuthor->avatarMediaId(room));
+    QCOMPARE(eventHandlerReplyAuthor["color"_ls], Utils::getUserColor(replyAuthor->hueF()));
     QCOMPARE(eventHandlerReplyAuthor["object"_ls], QVariant::fromValue(replyAuthor));
 
     EventHandler eventHandlerNoAuthor(room, room->messageEvents().at(0).get());
-    QCOMPARE(eventHandlerNoAuthor.getReplyAuthor(), room->getUser(QString()));
+    QCOMPARE(eventHandlerNoAuthor.getReplyAuthor(), room->getUser(nullptr));
 }
 
 void EventHandlerTest::nullReplyAuthor()
@@ -417,7 +409,7 @@ void EventHandlerTest::nullReplyAuthor()
 
     EventHandler noEventHandler(room, nullptr);
     QTest::ignoreMessage(QtWarningMsg, "getReplyAuthor called with m_event set to nullptr. Returning empty user.");
-    QCOMPARE(noEventHandler.getReplyAuthor(), room->getUser(QString()));
+    QCOMPARE(noEventHandler.getReplyAuthor(), room->getUser(nullptr));
 }
 
 void EventHandlerTest::replyBody()

autotests/linkpreviewertest.cpp

@@ -6,11 +6,12 @@
 
 #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;
@@ -29,11 +30,10 @@ private Q_SLOTS:
     void linkPreviewsMatch_data();
     void linkPreviewsMatch();
 
-    void multipleLinkPreviewsMatch_data();
-    void multipleLinkPreviewsMatch();
-
     void linkPreviewsReject_data();
     void linkPreviewsReject();
+
+    void editedLink();
 };
 
 void LinkPreviewerTest::initTestCase()
@@ -44,59 +44,60 @@ void LinkPreviewerTest::initTestCase()
 
 void LinkPreviewerTest::linkPreviewsMatch_data()
 {
-    QTest::addColumn<QString>("inputString");
+    QTest::addColumn<QString>("eventSource");
     QTest::addColumn<QUrl>("testOutputLink");
 
-    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);
+    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);
 }
 
 void LinkPreviewerTest::linkPreviewsMatch()
 {
-    QFETCH(QString, inputString);
+    QFETCH(QString, eventSource);
     QFETCH(QUrl, testOutputLink);
 
-    auto link = LinkPreviewer::linkPreviews(inputString)[0];
+    auto event = TestUtils::loadEventFromFile<RoomMessageEvent>(eventSource);
+    auto linkPreviewer = LinkPreviewer(room, event.get());
 
-    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);
+    QCOMPARE(linkPreviewer.empty(), false);
+    QCOMPARE(linkPreviewer.url(), testOutputLink);
 }
 
 void LinkPreviewerTest::linkPreviewsReject_data()
 {
-    QTest::addColumn<QString>("inputString");
+    QTest::addColumn<QString>("eventSource");
 
-    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");
+    QTest::newRow("mxc") << QStringLiteral("test-invalidmxclink-event.json");
+    QTest::newRow("matrixTo") << QStringLiteral("test-invalidmatrixtolink-event.json");
+    QTest::newRow("noSpace") << QStringLiteral("test-invalidnospacelink-event.json");
 }
 
 void LinkPreviewerTest::linkPreviewsReject()
 {
-    QFETCH(QString, inputString);
+    QFETCH(QString, eventSource);
 
-    auto links = LinkPreviewer::linkPreviews(inputString);
+    auto event = TestUtils::loadEventFromFile<RoomMessageEvent>(eventSource);
+    auto linkPreviewer = LinkPreviewer(room, event.get());
 
-    QCOMPARE(links.empty(), true);
+    QCOMPARE(linkPreviewer.empty(), true);
+    QCOMPARE(linkPreviewer.url(), QUrl());
+}
+
+void LinkPreviewerTest::editedLink()
+{
+    room->syncNewEvents(QStringLiteral("test-linkpreviewerintial-sync.json"));
+    auto event = eventCast<const RoomMessageEvent>(room->messageEvents().at(0).get());
+    auto linkPreviewer = LinkPreviewer(room, event);
+
+    QCOMPARE(linkPreviewer.empty(), false);
+    QCOMPARE(linkPreviewer.url(), QUrl("https://kde.org"_ls));
+
+    room->syncNewEvents(QStringLiteral("test-linkpreviewerreplace-sync.json"));
+
+    QCOMPARE(linkPreviewer.empty(), true);
+    QCOMPARE(linkPreviewer.url(), QUrl());
 }
 
 QTEST_MAIN(LinkPreviewerTest)

autotests/reactionmodeltest.cpp

@@ -53,7 +53,7 @@ void ReactionModelTest::basicReaction()
     QCOMPARE(model.data(model.index(0), ReactionModel::ReactionRole), QStringLiteral("👍"));
     QCOMPARE(model.data(model.index(0), ReactionModel::ToolTipRole),
              QStringLiteral("@alice:matrix.org reacted with <span style=\"font-family: 'emoji';\">👍</span>"));
-    auto authorList = QVariantList{room->getUser(QStringLiteral("@alice:matrix.org"))};
+    auto authorList = QVariantList{room->getUser(room->user(QStringLiteral("@alice:matrix.org")))};
     QCOMPARE(model.data(model.index(0), ReactionModel::AuthorsRole), authorList);
     QCOMPARE(model.data(model.index(0), ReactionModel::HasLocalUser), false);
 }

org.kde.neochat.appdata.xml

@@ -54,7 +54,6 @@
   <summary xml:lang="ca">Xategeu amb els vostres amics a Matrix</summary>
   <summary xml:lang="ca-valencia">Xategeu amb els vostres amics a Matrix</summary>
   <summary xml:lang="cs">Mluvte se svými přáteli na Matrixu</summary>
-  <summary xml:lang="en-GB">Chat with your friends on matrix</summary>
   <summary xml:lang="eo">Babilu kun viaj amikoj sur matrix</summary>
   <summary xml:lang="es">Charle con sus amigos en matrix</summary>
   <summary xml:lang="eu">Berriketan jardun zure lagunekin «Matrix»en</summary>
@@ -80,15 +79,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="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>
@@ -97,7 +93,6 @@
     <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="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>
@@ -114,7 +109,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>
@@ -123,7 +118,6 @@
     <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>
@@ -151,7 +145,6 @@
     <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>
@@ -209,11 +202,10 @@
       <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>
-      <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>
@@ -238,7 +230,6 @@
       <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>
@@ -284,7 +275,6 @@
       <caption xml:lang="ar">العرض الرئيسة مع قائمة الغرف والدردشات و معلومات الغرفة</caption>
       <caption xml:lang="ca">Vista principal amb la llista de sales, xats i informació de les sales</caption>
       <caption xml:lang="ca-valencia">Vista principal amb la llista de sales, xats i informació de les sales</caption>
-      <caption xml:lang="en-GB">Main view with room list, chat, and room information</caption>
       <caption xml:lang="eo">Ĉefa vido kun ĉambra listo, babilejo kaj ĉambra informo</caption>
       <caption xml:lang="es">Vista principal con la lista de salas, chat e información de la sala</caption>
       <caption xml:lang="eu">Ikuspegi nagusia gela-zerrenda, berriketa, eta gelako informazioarekin</caption>
@@ -301,7 +291,6 @@
       <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>
@@ -313,14 +302,11 @@
     <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>
@@ -330,7 +316,6 @@
       <caption xml:lang="nl">Ontdek nieuwe gemeenschappen met Matrix-ruimten</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>
@@ -349,7 +334,6 @@
       <caption xml:lang="ar">العرض الرئيسة مع قائمة الغرف والدردشات و معلومات الغرفة</caption>
       <caption xml:lang="ca">Vista principal amb la llista de sales, xats i informació de les sales</caption>
       <caption xml:lang="ca-valencia">Vista principal amb la llista de sales, xats i informació de les sales</caption>
-      <caption xml:lang="en-GB">Main view with room list, chat, and room information</caption>
       <caption xml:lang="eo">Ĉefa vido kun ĉambra listo, babilejo kaj ĉambra informo</caption>
       <caption xml:lang="es">Vista principal con la lista de salas, chat e información de la sala</caption>
       <caption xml:lang="eu">Ikuspegi nagusia gela-zerrenda, berriketa, eta gelako informazioarekin</caption>
@@ -366,7 +350,6 @@
       <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>
@@ -382,7 +365,6 @@
       <caption xml:lang="ca">Pantalla d'inici de sessió</caption>
       <caption xml:lang="ca-valencia">Pantalla d'inici de sessió</caption>
       <caption xml:lang="cs">Přihlašovací obrazovka</caption>
-      <caption xml:lang="en-GB">Login screen</caption>
       <caption xml:lang="eo">Ensaluta ekrano</caption>
       <caption xml:lang="es">Pantalla de inicio de sesión</caption>
       <caption xml:lang="eu">Saio-hasteko pantaila</caption>
@@ -399,7 +381,6 @@
       <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>
@@ -413,9 +394,6 @@
     <content_attribute id="social-chat">intense</content_attribute>
   </content_rating>
   <releases>
-    <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"/>
     <release version="24.02.0" date="2024-02-28">
       <url>https://kde.org/announcements/megarelease/6/#neochat</url>

src/CMakeLists.txt

@@ -20,6 +20,8 @@ add_library(neochat STATIC
     models/customemojimodel.h
     clipboard.cpp
     clipboard.h
+    matriximageprovider.cpp
+    matriximageprovider.h
     models/messageeventmodel.cpp
     models/messageeventmodel.h
     models/messagefiltermodel.cpp
@@ -172,21 +174,6 @@ add_library(neochat STATIC
     sharehandler.h
     models/roomtreeitem.cpp
     models/roomtreeitem.h
-    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
-    threepidbindhelper.cpp
-    threepidbindhelper.h
 )
 
 set_source_files_properties(qml/OsmLocationPlugin.qml PROPERTIES
@@ -196,7 +183,7 @@ set_source_files_properties(qml/OsmLocationPlugin.qml PROPERTIES
 qt_add_qml_module(neochat URI org.kde.neochat NO_PLUGIN
     OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/src/org/kde/neochat
     QML_FILES
-        qml/Main.qml
+        qml/main.qml
         qml/AccountMenu.qml
         qml/ExploreComponent.qml
         qml/ExploreComponentMobile.qml
@@ -213,14 +200,35 @@ qt_add_qml_module(neochat URI org.kde.neochat NO_PLUGIN
         qml/ExplorerDelegate.qml
         qml/InviteUserPage.qml
         qml/ImageEditorPage.qml
+        qml/WelcomePage.qml
         qml/NeochatMaximizeComponent.qml
+        qml/FancyEffectsContainer.qml
         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/LoginStep.qml
+        qml/Login.qml
+        qml/Homeserver.qml
+        qml/Username.qml
+        qml/RegisterPassword.qml
+        qml/Captcha.qml
+        qml/Terms.qml
+        qml/Email.qml
+        qml/Password.qml
+        qml/LoginRegister.qml
+        qml/Loading.qml
+        qml/LoginMethod.qml
+        qml/Sso.qml
         qml/UserDetailDialog.qml
         qml/CreateRoomDialog.qml
+        qml/EmojiDialog.qml
         qml/OpenFileDialog.qml
         qml/KeyVerificationDialog.qml
         qml/ConfirmLogoutDialog.qml
@@ -240,6 +248,9 @@ 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
@@ -263,6 +274,7 @@ 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
@@ -279,26 +291,14 @@ qt_add_qml_module(neochat URI org.kde.neochat NO_PLUGIN
         qml/AccountSwitchDialog.qml
         qml/ConfirmLeaveDialog.qml
         qml/CodeMaximizeComponent.qml
-        qml/EditStateDialog.qml
-        qml/ConsentDialog.qml
-        qml/AskDirectChatConfirmation.qml
-        qml/HoverLinkIndicator.qml
-    DEPENDENCIES
-        QtCore
-        QtQuick
-    IMPORTS
-        org.kde.neochat.timeline
-        org.kde.neochat.settings
-        org.kde.neochat.devtools
-        org.kde.neochat.login
-        org.kde.neochat.chatbar
+    RESOURCES
+        qml/confetti.png
+        qml/glowdot.png
 )
 
 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)
@@ -381,18 +381,16 @@ endif()
 
 if (NOT ANDROID AND NOT WIN32 AND NOT APPLE)
     target_compile_definitions(neochat PUBLIC -DHAVE_RUNNER)
-    target_compile_definitions(neochat PUBLIC -DHAVE_X11=1)
+    target_compile_definitions(neochat PUBLIC -DHAVE_X11)
     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 chatbarplugin)
+target_link_libraries(neochat PRIVATE settingsplugin timelineplugin devtoolsplugin)
 target_link_libraries(neochat PUBLIC
     Qt::Core
     Qt::Quick
@@ -416,10 +414,6 @@ target_link_libraries(neochat PUBLIC
     QCoro::Network
 )
 
-if (TARGET KF6::Crash)
-    target_link_libraries(neochat PUBLIC KF6::Crash)
-endif()
-
 kconfig_add_kcfg_files(neochat GENERATE_MOC neochatconfig.kcfgc)
 
 if(NEOCHAT_FLATPAK)

src/actionshandler.cpp

@@ -91,7 +91,7 @@ void ActionsHandler::handleMessage(const QString &text, QString handledText, Cha
 
             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->localMember().id() && event->hasTextContent()) {
+                    if (event->senderId() == m_room->localUser()->id() && event->hasTextContent()) {
                         QString originalString;
                         if (event->content()) {
                             originalString = static_cast<const Quotient::EventContent::TextContent *>(event->content())->body;

src/chatbar/CMakeLists.txt

@@ -1,19 +0,0 @@
-# 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/chatbarcache.cpp

@@ -96,9 +96,9 @@ QVariantMap ChatBarCache::relationUser() const
         return {};
     }
     if (m_relationId.isEmpty()) {
-        return room->getUser(QString());
+        return room->getUser(nullptr);
     }
-    return room->getUser((*room->findInTimeline(m_relationId))->senderId());
+    return room->getUser(room->user((*room->findInTimeline(m_relationId))->senderId()));
 }
 
 QString ChatBarCache::relationMessage() const

src/chatdocumenthandler.h

@@ -91,7 +91,7 @@ class ChatDocumentHandler : public QObject
     Q_PROPERTY(CompletionModel *completionModel READ completionModel CONSTANT)
 
     /**
-     * @brief The current room that the text document is being handled for.
+     * @brief The current room that the the text document is being handled for.
      */
     Q_PROPERTY(NeoChatRoom *room READ room WRITE setRoom NOTIFY roomChanged)
 

src/controller.cpp

@@ -9,20 +9,28 @@
 #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/connection.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"
@@ -38,10 +46,6 @@
 #endif
 #endif
 
-#ifdef HAVE_KUNIFIEDPUSH
-#include <kunifiedpush/connector.h>
-#endif
-
 bool testMode = false;
 
 using namespace Quotient;
@@ -103,16 +107,14 @@ Controller::Controller(QObject *parent)
     connect(&m_accountRegistry, &AccountRegistry::accountCountChanged, this, [this]() {
         if (m_accountRegistry.size() > oldAccountCount) {
             auto connection = dynamic_cast<NeoChatConnection *>(m_accountRegistry.accounts()[m_accountRegistry.size() - 1]);
-            connect(
-                connection,
-                &NeoChatConnection::syncDone,
-                this,
-                [this, connection] {
-                    if (!m_endpoint.isEmpty()) {
-                        connection->setupPushNotifications(m_endpoint);
-                    }
-                },
-                Qt::SingleShotConnection);
+            connect(connection, &NeoChatConnection::syncDone, this, [connection]() {
+                NotificationsManager::instance().handleNotifications(connection);
+            });
+            connectSingleShot(connection, &NeoChatConnection::syncDone, this, [this, connection] {
+                if (!m_endpoint.isEmpty()) {
+                    connection->setupPushNotifications(m_endpoint);
+                }
+            });
         }
         oldAccountCount = m_accountRegistry.size();
     });
@@ -155,7 +157,7 @@ void Controller::addConnection(NeoChatConnection *c)
     });
     connect(c, &NeoChatConnection::loggedOut, this, [this, c] {
         if (accounts().count() > 1) {
-            // Only set the connection if the account being logged out is currently active
+            // Only set the connection if the the account being logged out is currently active
             if (c == activeConnection()) {
                 setActiveConnection(dynamic_cast<NeoChatConnection *>(accounts().accounts()[0]));
             }
@@ -188,7 +190,7 @@ void Controller::invokeLogin()
         m_accountsLoading += accountId;
         Q_EMIT accountsLoadingChanged();
         if (!account.homeserver().isEmpty()) {
-            auto accessTokenLoadingJob = loadAccessTokenFromKeyChain(account.userId());
+            auto accessTokenLoadingJob = loadAccessTokenFromKeyChain(account);
             connect(accessTokenLoadingJob, &QKeychain::Job::finished, this, [accountId, this, accessTokenLoadingJob](QKeychain::Job *) {
                 AccountSettings account{accountId};
                 QString accessToken;
@@ -216,11 +218,11 @@ void Controller::invokeLogin()
     }
 }
 
-QKeychain::ReadPasswordJob *Controller::loadAccessTokenFromKeyChain(const QString &userId)
+QKeychain::ReadPasswordJob *Controller::loadAccessTokenFromKeyChain(const AccountSettings &account)
 {
-    qDebug() << "Reading access token from the keychain for" << userId;
+    qDebug() << "Reading access token from the keychain for" << account.userId();
     auto job = new QKeychain::ReadPasswordJob(qAppName(), this);
-    job->setKey(userId);
+    job->setKey(account.userId());
 
     // Handling of errors
     connect(job, &QKeychain::Job::finished, this, [this, job]() {
@@ -251,12 +253,12 @@ QKeychain::ReadPasswordJob *Controller::loadAccessTokenFromKeyChain(const QStrin
     return job;
 }
 
-bool Controller::saveAccessTokenToKeyChain(const QString &userId, const QByteArray &accessToken)
+bool Controller::saveAccessTokenToKeyChain(const AccountSettings &account, const QByteArray &accessToken)
 {
-    qDebug() << "Save the access token to the keychain for " << userId;
+    qDebug() << "Save the access token to the keychain for " << account.userId();
     QKeychain::WritePasswordJob job(qAppName());
     job.setAutoDelete(false);
-    job.setKey(userId);
+    job.setKey(account.userId());
     job.setBinaryData(accessToken);
     QEventLoop loop;
     QKeychain::WritePasswordJob::connect(&job, &QKeychain::Job::finished, &loop, &QEventLoop::quit);
@@ -411,16 +413,7 @@ void Controller::removeConnection(const QString &userId)
 
 bool Controller::ssssSupported() const
 {
-#if Quotient_VERSION_MINOR > 8 || Quotient_VERSION_PATCH > 1
-    return true;
-#else
-    return false;
-#endif
-}
-
-bool Controller::csSupported() const
-{
-#if Quotient_VERSION_MINOR > 9
+#if __has_include("Quotient/e2ee/sssshandler.h")
     return true;
 #else
     return false;

src/controller.h

@@ -5,9 +5,15 @@
 
 #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;
@@ -51,7 +57,6 @@ class Controller : public QObject
     Q_PROPERTY(QStringList accountsLoading MEMBER m_accountsLoading NOTIFY accountsLoadingChanged)
 
     Q_PROPERTY(bool ssssSupported READ ssssSupported CONSTANT)
-    Q_PROPERTY(bool csSupported READ csSupported CONSTANT)
 
 public:
     static Controller &instance();
@@ -77,7 +82,7 @@ public:
     /**
      * @brief Save an access token to the keychain for the given account.
      */
-    bool saveAccessTokenToKeyChain(const QString &userId, const QByteArray &accessToken);
+    bool saveAccessTokenToKeyChain(const Quotient::AccountSettings &account, const QByteArray &accessToken);
 
     [[nodiscard]] bool supportSystemTray() const;
 
@@ -98,7 +103,6 @@ public:
     Q_INVOKABLE void removeConnection(const QString &userId);
 
     bool ssssSupported() const;
-    bool csSupported() const;
 
 private:
     explicit Controller(QObject *parent = nullptr);
@@ -106,14 +110,14 @@ private:
     QPointer<NeoChatConnection> m_connection;
     TrayIcon *m_trayIcon = nullptr;
 
-    QKeychain::ReadPasswordJob *loadAccessTokenFromKeyChain(const QString &account);
+    QKeychain::ReadPasswordJob *loadAccessTokenFromKeyChain(const Quotient::AccountSettings &account);
 
     void loadSettings();
     void saveSettings() const;
 
     Quotient::AccountRegistry m_accountRegistry;
     QStringList m_accountsLoading;
-    QMap<QString, QPointer<NeoChatConnection>> m_connectionsLoading;
+    QMap<QString, QPointer<Quotient::Connection>> m_connectionsLoading;
     QString m_endpoint;
 
 private Q_SLOTS:

src/definitions.h

@@ -1,11 +0,0 @@
-// SPDX-FileCopyrightText: 2024 Tobias Fella <tobias.fella@kde.org>
-// SPDX-License-Identifier: LGPL-2.0-or-later
-
-#if Quotient_VERSION_MINOR > 8
-#define Omittable std::optional
-#define quotientNone std::nullopt
-#else
-#include <Quotient/omittable.h>
-#define Omittable Quotient::Omittable
-#define quotientNone Quotient::none
-#endif

src/devtools/AccountData.qml

@@ -23,7 +23,7 @@ ColumnLayout {
             model: root.connection.accountDataEventTypes
             delegate: FormCard.FormButtonDelegate {
                 text: modelData
-                onClicked: applicationWindow().pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'MessageSourceSheet'), {
+                onClicked: applicationWindow().pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'MessageSourceSheet.qml'), {
                     sourceText: root.connection.accountDataJsonString(modelData)
                 }, {
                     title: i18nc("@title:window", "Event Source"),

src/devtools/CMakeLists.txt

@@ -8,7 +8,6 @@ qt_add_qml_module(devtools
     QML_FILES
         DevtoolsPage.qml
         AccountData.qml
-        DebugOptions.qml
         FeatureFlagPage.qml
         RoomData.qml
         ServerData.qml

src/devtools/DebugOptions.qml

@@ -1,42 +0,0 @@
-// 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
-
-import QtQuick
-import QtQuick.Layouts
-
-import org.kde.kirigami as Kirigami
-import org.kde.kirigamiaddons.formcard as FormCard
-
-import org.kde.neochat
-
-FormCard.FormCardPage {
-    id: root
-
-    FormCard.FormCard {
-        Layout.topMargin: Kirigami.Units.largeSpacing
-
-        FormCard.FormCheckDelegate {
-            text: i18nc("@option:check", "Show hidden events in the timeline")
-            checked: Config.showAllEvents
-
-            onToggled: Config.showAllEvents = checked
-        }
-        FormCard.FormCheckDelegate {
-            id: roomAccountDataVisibleCheck
-            text: i18nc("@option:check Enable the matrix 'threads' feature", "Always allow device verification")
-            description: i18n("Allow the user to start a verification session with devices that were already verified")
-            checked: Config.alwaysVerifyDevice
-
-            onToggled: Config.alwaysVerifyDevice = checked
-        }
-        FormCard.FormCheckDelegate {
-            text: i18nc("@option:check", "Show focus in window header")
-            checked: Config.windowTitleFocus
-
-            onToggled: {
-                Config.windowTitleFocus = checked;
-                Config.save();
-            }
-        }
-    }
-}

src/devtools/DevtoolsPage.qml

@@ -26,17 +26,12 @@ FormCard.FormCardPage {
         readonly property real tabWidth: tabBar.width / tabBar.count
 
         QQC2.TabButton {
-            text: i18nc("@title:tab", "Debug Options")
+            text: qsTr("Room Data")
 
             implicitWidth: tabBar.tabWidth
         }
         QQC2.TabButton {
-            text: i18nc("@title:tab", "Room Data")
-
-            implicitWidth: tabBar.tabWidth
-        }
-        QQC2.TabButton {
-            text: i18nc("@title:tab", "Server Info")
+            text: qsTr("Server Info")
 
             implicitWidth: tabBar.tabWidth
         }
@@ -57,7 +52,6 @@ FormCard.FormCardPage {
 
         currentIndex: tabBar.currentIndex
 
-        DebugOptions {}
         RoomData {
             room: root.room
             connection: root.connection

src/devtools/FeatureFlagPage.qml

@@ -7,7 +7,7 @@ import QtQuick.Layouts
 import org.kde.kirigami as Kirigami
 import org.kde.kirigamiaddons.formcard as FormCard
 
-import org.kde.neochat
+import org.kde.neochat.config
 
 FormCard.FormCardPage {
     id: root
@@ -28,14 +28,5 @@ 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/devtools/RoomData.qml

@@ -25,10 +25,9 @@ ColumnLayout {
             text: i18n("Room")
             textRole: "escapedDisplayName"
             valueRole: "roomId"
-            displayText: RoomManager.roomListModel.data(RoomManager.roomListModel.index(currentIndex, 0), RoomListModel.EscapedDisplayNameRole)
+            displayText: RoomManager.roomListModel.data(RoomManager.roomListModel.index(currentIndex, 0), RoomListModel.DisplayNameRole)
             model: RoomManager.roomListModel
             currentIndex: 0
-            displayMode: FormCard.FormComboBoxDelegate.Page
             Component.onCompleted: currentIndex = RoomManager.roomListModel.rowForRoom(root.room)
             onCurrentValueChanged: root.room = RoomManager.roomListModel.roomByAliasOrId(roomComboBox.currentValue)
         }
@@ -47,7 +46,7 @@ ColumnLayout {
             model: root.room.accountDataEventTypes
             delegate: FormCard.FormButtonDelegate {
                 text: modelData
-                onClicked: applicationWindow().pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'MessageSourceSheet'), {
+                onClicked: applicationWindow().pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'MessageSourceSheet.qml'), {
                     sourceText: root.room.roomAcountDataJson(text)
                 }, {
                     title: i18n("Event Source"),
@@ -75,9 +74,14 @@ ColumnLayout {
                 description: i18ncp("'Event' being some JSON data, not something physically happening.", "%1 event of this type", "%1 events of this type", model.eventCount)
                 onClicked: {
                     if (model.eventCount === 1) {
-                        openEventSource(model.type, model.stateKey);
+                        onClicked: applicationWindow().pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'MessageSourceSheet.qml'), {
+                            sourceText: stateModel.stateEventJson(stateModel.index(model.index, 0))
+                        }, {
+                            title: i18n("Event Source"),
+                            width: Kirigami.Units.gridUnit * 25
+                        })
                     } else {
-                        pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat.devtools', 'StateKeys'), {
+                        pageStack.pushDialogLayer(stateKeysComponent, {
                             room: root.room,
                             eventType: model.type
                         }, {
@@ -87,17 +91,9 @@ ColumnLayout {
                 }
             }
         }
-    }
-    function openEventSource(type: string, stateKey: string): void {
-        onClicked: applicationWindow().pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'MessageSourceSheet'), {
-            model: stateModel,
-            allowEdit: true,
-            room: root.room,
-            type: type,
-            stateKey: stateKey,
-        }, {
-            title: i18n("Event Source"),
-            width: Kirigami.Units.gridUnit * 25
-        });
+        Component {
+            id: stateKeysComponent
+            StateKeys {}
+        }
     }
 }

src/devtools/StateKeys.qml

@@ -31,21 +31,13 @@ FormCard.FormCardPage {
 
             delegate: FormCard.FormButtonDelegate {
                 text: model.stateKey
-                onClicked: openEventSource(model.stateKey)
+                onClicked: applicationWindow().pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'MessageSourceSheet.qml'), {
+                    sourceText: stateKeysModel.stateEventJson(stateKeysModel.index(model.index, 0))
+                }, {
+                    title: i18nc("@title:window", "Event Source"),
+                    width: Kirigami.Units.gridUnit * 25
+                })
             }
         }
     }
-
-    function openEventSource(stateKey: string): void {
-        applicationWindow().pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'MessageSourceSheet'), {
-            model: stateKeysModel,
-            allowEdit: true,
-            room: root.room,
-            type: root.eventType,
-            stateKey: stateKey
-        }, {
-            title: i18nc("@title:window", "Event Source"),
-            width: Kirigami.Units.gridUnit * 25
-        });
-    }
 }

src/enums/messagecomponenttype.h

@@ -47,11 +47,11 @@ public:
         LiveLocation, /**< The initial event of a shared live location (i.e., the place where this is supposed to be shown in the timeline). */
         Encrypted, /**< An encrypted message that cannot be decrypted. */
         Reply, /**< A component to show a replied-to message. */
+        ReplyLoad, /**< A loading dialog for a reply. */
         LinkPreview, /**< A preview of a URL in the message. */
         LinkPreviewLoad, /**< A loading dialog for a link preview. */
         Edit, /**< A text edit for editing a message. */
         Verification, /**< A user verification session start message. */
-        Loading, /**< The component is loading. */
         Other, /**< Anything that cannot be classified as another type. */
     };
     Q_ENUM(Type);

src/enums/neochatroomtype.h

@@ -21,6 +21,7 @@ public:
      * @brief Defines the room list categories a room can be assigned.
      */
     enum Types {
+        Search = 0, /**< So we can show a search delegate if needed, e.g. collapsed mode. */
         Invited, /**< The user has been invited to the room. */
         Favorite, /**< The room is set as a favourite. */
         Direct, /**< The room is a direct chat. */
@@ -67,6 +68,8 @@ public:
             return i18n("Low priority");
         case NeoChatRoomType::Space:
             return i18n("Spaces");
+        case NeoChatRoomType::Search:
+            return i18n("Search");
         default:
             return {};
         }
@@ -86,6 +89,8 @@ public:
             return QStringLiteral("object-order-lower");
         case NeoChatRoomType::Space:
             return QStringLiteral("group");
+        case NeoChatRoomType::Search:
+            return QStringLiteral("search");
         default:
             return QStringLiteral("tools-report-bug");
         }

src/enums/powerlevel.cpp

@@ -1,109 +0,0 @@
-// 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

@@ -1,110 +0,0 @@
-// 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

@@ -70,10 +70,10 @@ QVariantMap EventHandler::getAuthor(bool isPending) const
     // If we have a room we can return an empty user by handing nullptr to m_room->getUser.
     if (m_event == nullptr) {
         qCWarning(EventHandling) << "getAuthor called with m_event set to nullptr. Returning empty user.";
-        return m_room->getUser(QString());
+        return m_room->getUser(nullptr);
     }
 
-    const auto author = isPending ? m_room->localMember() : m_room->member(m_event->senderId());
+    const auto author = isPending ? m_room->localUser() : m_room->user(m_event->senderId());
     return m_room->getUser(author);
 }
 
@@ -96,8 +96,8 @@ QString EventHandler::getAuthorDisplayName(bool isPending) const
         }
         return previousDisplayName;
     } else {
-        const auto author = isPending ? m_room->localMember() : m_room->member(m_event->senderId());
-        return author.htmlSafeDisplayName();
+        const auto author = isPending ? m_room->localUser() : m_room->user(m_event->senderId());
+        return m_room->htmlSafeMemberName(author->id());
     }
 }
 
@@ -112,8 +112,8 @@ QString EventHandler::singleLineAuthorDisplayname(bool isPending) const
         return {};
     }
 
-    const auto author = isPending ? m_room->localMember() : m_room->member(m_event->senderId());
-    auto displayName = author.displayName();
+    const auto author = isPending ? m_room->localUser() : m_room->user(m_event->senderId());
+    auto displayName = m_room->safeMemberName(author->id());
     displayName.replace(QStringLiteral("<br>\n"), QStringLiteral(" "));
     displayName.replace(QStringLiteral("<br>"), QStringLiteral(" "));
     displayName.replace(QStringLiteral("<br />\n"), QStringLiteral(" "));
@@ -220,7 +220,7 @@ bool EventHandler::isHidden()
         }
     }
 
-    if (m_room->connection()->isIgnored(m_event->senderId())) {
+    if (m_room->connection()->isIgnored(m_room->user(m_event->senderId()))) {
         return true;
     }
 
@@ -255,7 +255,7 @@ QString EventHandler::rawMessageBody(const Quotient::RoomMessageEvent &event)
 
     QString body;
     if (event.hasTextContent() && event.content()) {
-        body = static_cast<const EventContent::TextContent *>(event.content())->body;
+        body = static_cast<const MessageEventContent::TextContent *>(event.content())->body;
     } else {
         body = event.plainBody();
     }
@@ -293,10 +293,7 @@ QString EventHandler::getMarkdownBody() const
     }
 
     const auto roomMessageEvent = eventCast<const RoomMessageEvent>(m_event);
-
-    QString plainBody = roomMessageEvent->plainBody();
-    plainBody.remove(TextRegex::removeReply);
-    return plainBody;
+    return roomMessageEvent->plainBody();
 }
 
 QString EventHandler::getBody(const Quotient::RoomEvent *event, Qt::TextFormat format, bool stripNewlines) const
@@ -318,7 +315,7 @@ QString EventHandler::getBody(const Quotient::RoomEvent *event, Qt::TextFormat f
         },
         [this, prettyPrint](const RoomMemberEvent &e) {
             // FIXME: Rewind to the name that was at the time of this event
-            auto subjectName = m_room->member(e.userId()).htmlSafeDisplayName();
+            auto subjectName = m_room->htmlSafeMemberName(e.userId());
             if (e.membership() == Membership::Leave) {
                 if (e.prevContent() && e.prevContent()->displayName) {
                     subjectName = sanitized(*e.prevContent()->displayName).toHtmlEscaped();
@@ -479,7 +476,7 @@ QString EventHandler::getMessageBody(const RoomMessageEvent &event, Qt::TextForm
 
     QString body;
     if (event.hasTextContent() && event.content()) {
-        body = static_cast<const EventContent::TextContent *>(event.content())->body;
+        body = static_cast<const MessageEventContent::TextContent *>(event.content())->body;
     } else {
         body = event.plainBody();
     }
@@ -809,15 +806,16 @@ QVariantMap EventHandler::getReplyAuthor() const
     // If we have a room we can return an empty user by handing nullptr to m_room->getUser.
     if (m_event == nullptr) {
         qCWarning(EventHandling) << "getReplyAuthor called with m_event set to nullptr. Returning empty user.";
-        return m_room->getUser(QString());
+        return m_room->getUser(nullptr);
     }
 
     auto replyPtr = m_room->getReplyForEvent(*m_event);
 
     if (replyPtr) {
-        return m_room->getUser(replyPtr->senderId());
+        auto replyUser = m_room->user(replyPtr->senderId());
+        return m_room->getUser(replyUser);
     } else {
-        return m_room->getUser(QString());
+        return m_room->getUser(nullptr);
     }
 }
 
@@ -965,7 +963,7 @@ bool EventHandler::hasReadMarkers() const
     }
 
     auto userIds = m_room->userIdsAtEvent(m_event->id());
-    userIds.remove(m_room->localMember().id());
+    userIds.remove(m_room->localUser()->id());
     return userIds.size() > 0;
 }
 
@@ -981,7 +979,7 @@ QVariantList EventHandler::getReadMarkers(int maxMarkers) const
     }
 
     auto userIds_temp = m_room->userIdsAtEvent(m_event->id());
-    userIds_temp.remove(m_room->localMember().id());
+    userIds_temp.remove(m_room->localUser()->id());
 
     auto userIds = userIds_temp.values();
     if (userIds.count() > maxMarkers) {
@@ -991,7 +989,7 @@ QVariantList EventHandler::getReadMarkers(int maxMarkers) const
     QVariantList users;
     users.reserve(userIds.size());
     for (const auto &userId : userIds) {
-        auto user = m_room->member(userId);
+        auto user = m_room->user(userId);
         users += m_room->getUser(user);
     }
 
@@ -1010,7 +1008,7 @@ QString EventHandler::getNumberExcessReadMarkers(int maxMarkers) const
     }
 
     auto userIds = m_room->userIdsAtEvent(m_event->id());
-    userIds.remove(m_room->localMember().id());
+    userIds.remove(m_room->localUser()->id());
 
     if (userIds.count() > maxMarkers) {
         return QStringLiteral("+ ") + QString::number(userIds.count() - maxMarkers);
@@ -1031,7 +1029,7 @@ QString EventHandler::getReadMarkersString() const
     }
 
     auto userIds = m_room->userIdsAtEvent(m_event->id());
-    userIds.remove(m_room->localMember().id());
+    userIds.remove(m_room->localUser()->id());
 
     /**
      * The string ends up in the form
@@ -1039,12 +1037,8 @@ QString EventHandler::getReadMarkersString() const
      */
     QString readMarkersString = i18np("1 user: ", "%1 users: ", userIds.size());
     for (const auto &userId : userIds) {
-        auto user = m_room->member(userId);
-        auto displayName = user.displayName();
-        if (displayName.isEmpty()) {
-            displayName = userId;
-        }
-        readMarkersString += displayName + i18nc("list separator", ", ");
+        auto user = m_room->user(userId);
+        readMarkersString += user->displayname(m_room) + i18nc("list separator", ", ");
     }
     readMarkersString.chop(2);
     return readMarkersString;

src/events/imagepackevent.cpp

@@ -16,7 +16,7 @@ ImagePackEventContent::ImagePackEventContent(const QJsonObject &json)
             fromJson<Omittable<QString>>(json["pack"_ls].toObject()["attribution"_ls]),
         };
     } else {
-        pack = quotientNone;
+        pack = none;
     }
 
     const auto &keys = json["images"_ls].toObject().keys();
@@ -25,7 +25,7 @@ ImagePackEventContent::ImagePackEventContent(const QJsonObject &json)
         if (json["images"_ls][k].toObject().contains(QStringLiteral("info"))) {
             info = EventContent::ImageInfo(QUrl(json["images"_ls][k]["url"_ls].toString()), json["images"_ls][k]["info"_ls].toObject(), k);
         } else {
-            info = quotientNone;
+            info = none;
         }
         images += ImagePackImage{
             k,
@@ -74,9 +74,6 @@ void ImagePackEventContent::fillJson(QJsonObject *o) const
             }
             imageJson["usage"_ls] = usageJson;
         }
-        if (image.info.has_value()) {
-            imageJson["info"_ls] = Quotient::EventContent::toInfoJson(*image.info);
-        }
         imagesJson[image.shortcode] = imageJson;
     }
     (*o)["images"_ls] = imagesJson;

src/events/imagepackevent.h

@@ -7,8 +7,6 @@
 #include <Quotient/events/eventcontent.h>
 #include <Quotient/events/stateevent.h>
 
-#include "definitions.h"
-
 namespace Quotient
 {
 /**
@@ -28,10 +26,10 @@ public:
      * @brief Defines the properties of an image pack.
      */
     struct Pack {
-        Omittable<QString> displayName; /**< The display name of the pack. */
-        Omittable<QUrl> avatarUrl; /**< The source mxc URL for the pack avatar. */
-        Omittable<QStringList> usage; /**< An array of the usages for this pack. Possible usages are "emoticon" and "sticker". */
-        Omittable<QString> attribution; /**< The attribution for the pack author(s). */
+        Quotient::Omittable<QString> displayName; /**< The display name of the pack. */
+        Quotient::Omittable<QUrl> avatarUrl; /**< The source mxc URL for the pack avatar. */
+        Quotient::Omittable<QStringList> usage; /**< An array of the usages for this pack. Possible usages are "emoticon" and "sticker". */
+        Quotient::Omittable<QString> attribution; /**< The attribution for the pack author(s). */
     };
 
     /**
@@ -40,14 +38,14 @@ public:
     struct ImagePackImage {
         QString shortcode; /**< The shortcode for the image. */
         QUrl url; /**< The mxc URL for this image. */
-        Omittable<QString> body; /**< An optional text body for this image. */
-        Omittable<Quotient::EventContent::ImageInfo> info; /**< The ImageInfo object used for the info block of m.sticker events. */
+        Quotient::Omittable<QString> body; /**< An optional text body for this image. */
+        Quotient::Omittable<Quotient::EventContent::ImageInfo> info; /**< The ImageInfo object used for the info block of m.sticker events. */
         /**
          * @brief An array of the usages for this image.
          *
          * The possible values match those of the usage key of a pack object.
          */
-        Omittable<QStringList> usage;
+        Quotient::Omittable<QStringList> usage;
     };
 
     /**
@@ -55,7 +53,7 @@ public:
      *
      * @sa Pack
      */
-    Omittable<Pack> pack;
+    Quotient::Omittable<Pack> pack;
 
     /**
      * @brief Return a vector of images in the pack.
@@ -91,4 +89,6 @@ public:
     QUO_EVENT(ImagePackEvent, "im.ponies.room_emotes")
     using KeyedStateEventBase::KeyedStateEventBase;
 };
+
+REGISTER_EVENT_TYPE(ImagePackEvent)
 }

src/events/joinrulesevent.h

@@ -40,4 +40,5 @@ public:
      */
     QJsonArray allow() const;
 };
+REGISTER_EVENT_TYPE(JoinRulesEvent)
 }

src/fakerunner.cpp

@@ -14,15 +14,12 @@ Q_SCRIPTABLE RemoteActions FakeRunner::Actions()
 
 Q_SCRIPTABLE RemoteMatches FakeRunner::Match(const QString &searchTerm)
 {
-    Q_UNUSED(searchTerm);
     QCoreApplication::quit();
     return {};
 }
 
 Q_SCRIPTABLE void FakeRunner::Run(const QString &id, const QString &actionId)
 {
-    Q_UNUSED(id);
-    Q_UNUSED(actionId);
     QCoreApplication::quit();
 }
 
@@ -36,4 +33,4 @@ FakeRunner::FakeRunner()
     qDBusRegisterMetaType<RemoteImage>();
 }
 
-#include "moc_fakerunner.cpp"
+#include "moc_fakerunner.cpp"

src/foreigntypes.h

@@ -1,56 +0,0 @@
-// SPDX-FileCopyrightText: 2024 Tobias Fella <tobias.fella@kde.org>
-// SPDX-License-Identifier: LGPL-2.0-or-later
-
-#pragma once
-
-#include <QQmlEngine>
-
-#include <Quotient/accountregistry.h>
-#include <Quotient/keyverificationsession.h>
-#if Quotient_VERSION_MINOR > 8 || Quotient_VERSION_PATCH > 1
-#include <Quotient/e2ee/sssshandler.h>
-#endif
-
-#include "controller.h"
-#include "neochatconfig.h"
-
-struct ForeignConfig {
-    Q_GADGET
-    QML_FOREIGN(NeoChatConfig)
-    QML_NAMED_ELEMENT(Config)
-    QML_SINGLETON
-public:
-    static NeoChatConfig *create(QQmlEngine *, QJSEngine *)
-    {
-        QQmlEngine::setObjectOwnership(NeoChatConfig::self(), QQmlEngine::CppOwnership);
-        return NeoChatConfig::self();
-    }
-};
-
-struct ForeignAccountRegistry {
-    Q_GADGET
-    QML_FOREIGN(Quotient::AccountRegistry)
-    QML_NAMED_ELEMENT(AccountRegistry)
-    QML_SINGLETON
-public:
-    static Quotient::AccountRegistry *create(QQmlEngine *, QJSEngine *)
-    {
-        QQmlEngine::setObjectOwnership(&Controller::instance().accounts(), QQmlEngine::CppOwnership);
-        return &Controller::instance().accounts();
-    }
-};
-
-struct ForeignKeyVerificationSession {
-    Q_GADGET
-    QML_FOREIGN(Quotient::KeyVerificationSession)
-    QML_NAMED_ELEMENT(KeyVerificationSession)
-    QML_UNCREATABLE("")
-};
-
-#if Quotient_VERSION_MINOR > 8 || Quotient_VERSION_PATCH > 1
-struct ForeignSSSSHandler {
-    Q_GADGET
-    QML_FOREIGN(Quotient::SSSSHandler)
-    QML_NAMED_ELEMENT(SSSSHandler)
-};
-#endif

src/identityserverhelper.cpp

@@ -1,119 +0,0 @@
-// 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();
-}
-
-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 == m_connection->identityServer().toString()) {
-        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 == m_connection->identityServer().toString()) {
-        return;
-    }
-
-    m_connection->setAccountData(QLatin1String("m.identity_server"), {{QLatin1String("base_url"), m_url}});
-    m_status = Ready;
-    Q_EMIT statusChanged();
-}
-
-void IdentityServerHelper::clearIdentityServer()
-{
-    if (m_connection->identityServer().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

@@ -1,88 +0,0 @@
-// 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 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 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 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

@@ -1,16 +0,0 @@
-// 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

@@ -1,15 +0,0 @@
-// 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>
-
-#include "definitions.h"
-
-class NeochatAdd3PIdJob : public Quotient::BaseJob
-{
-public:
-    explicit NeochatAdd3PIdJob(const QString &clientSecret, const QString &sid, const Omittable<QJsonObject> &auth = {});
-};

src/jobs/neochatchangepasswordjob.h

@@ -6,10 +6,8 @@
 #include <Quotient/jobs/basejob.h>
 #include <Quotient/omittable.h>
 
-#include "definitions.h"
-
 class NeochatChangePasswordJob : public Quotient::BaseJob
 {
 public:
-    explicit NeochatChangePasswordJob(const QString &newPassword, bool logoutDevices, const Omittable<QJsonObject> &auth = {});
+    explicit NeochatChangePasswordJob(const QString &newPassword, bool logoutDevices, const Quotient::Omittable<QJsonObject> &auth = Quotient::none);
 };

src/jobs/neochatdeactivateaccountjob.h

@@ -6,10 +6,8 @@
 #include <Quotient/jobs/basejob.h>
 #include <Quotient/omittable.h>
 
-#include "definitions.h"
-
 class NeoChatDeactivateAccountJob : public Quotient::BaseJob
 {
 public:
-    explicit NeoChatDeactivateAccountJob(const Omittable<QJsonObject> &auth = {});
+    explicit NeoChatDeactivateAccountJob(const Quotient::Omittable<QJsonObject> &auth = Quotient::none);
 };

src/jobs/neochatdeletedevicejob.h

@@ -6,10 +6,8 @@
 #include <Quotient/jobs/basejob.h>
 #include <Quotient/omittable.h>
 
-#include "definitions.h"
-
 class NeochatDeleteDeviceJob : public Quotient::BaseJob
 {
 public:
-    explicit NeochatDeleteDeviceJob(const QString &deviceId, const Omittable<QJsonObject> &auth = {});
+    explicit NeochatDeleteDeviceJob(const QString &deviceId, const Quotient::Omittable<QJsonObject> &auth = Quotient::none);
 };

src/linkpreviewer.cpp

@@ -8,22 +8,34 @@
 #include <Quotient/events/roommessageevent.h>
 
 #include "neochatconfig.h"
-#include "neochatconnection.h"
+#include "neochatroom.h"
 #include "utils.h"
 
 using namespace Quotient;
 
-LinkPreviewer::LinkPreviewer(const QUrl &url, QObject *parent)
+LinkPreviewer::LinkPreviewer(const NeoChatRoom *room, const Quotient::RoomMessageEvent *event, QObject *parent)
     : QObject(parent)
+    , m_currentRoom(room)
+    , m_event(event)
     , m_loaded(false)
-    , m_url(url)
+    , m_url(linkPreview(event))
 {
-    Q_ASSERT(dynamic_cast<Connection *>(this->parent()));
-
     connect(this, &LinkPreviewer::urlChanged, this, &LinkPreviewer::emptyChanged);
-    connect(NeoChatConfig::self(), &NeoChatConfig::ShowLinkPreviewChanged, this, &LinkPreviewer::loadUrlPreview);
 
-    loadUrlPreview();
+    if (m_event != nullptr && m_currentRoom != nullptr) {
+        loadUrlPreview();
+        connect(m_currentRoom, &NeoChatRoom::urlPreviewEnabledChanged, this, &LinkPreviewer::loadUrlPreview);
+        // Make sure that we react to edits
+        connect(m_currentRoom, &NeoChatRoom::replacedEvent, this, [this](const Quotient::RoomEvent *newEvent) {
+            if (m_event->id() == newEvent->id()) {
+                m_event = eventCast<const Quotient::RoomMessageEvent>(newEvent);
+                m_url = linkPreview(m_event);
+                Q_EMIT urlChanged();
+                loadUrlPreview();
+            }
+        });
+    }
+    connect(NeoChatConfig::self(), &NeoChatConfig::ShowLinkPreviewChanged, this, &LinkPreviewer::loadUrlPreview);
 }
 
 bool LinkPreviewer::loaded() const
@@ -53,14 +65,14 @@ QUrl LinkPreviewer::url() const
 
 void LinkPreviewer::loadUrlPreview()
 {
+    if (!m_currentRoom || !NeoChatConfig::showLinkPreview() || !m_currentRoom->urlPreviewEnabled()) {
+        return;
+    }
     if (m_url.scheme() == QStringLiteral("https")) {
         m_loaded = false;
         Q_EMIT loadedChanged();
 
-        auto conn = dynamic_cast<Connection *>(this->parent());
-        if (conn == nullptr) {
-            return;
-        }
+        auto conn = m_currentRoom->connection();
         GetUrlPreviewJob *job = conn->callApi<GetUrlPreviewJob>(m_url);
 
         connect(job, &BaseJob::success, this, [this, job, conn]() {
@@ -89,23 +101,38 @@ bool LinkPreviewer::empty() const
     return m_url.isEmpty();
 }
 
-QList<QUrl> LinkPreviewer::linkPreviews(QString string)
+QUrl LinkPreviewer::linkPreview(const Quotient::RoomMessageEvent *event)
 {
-    auto data = string.remove(TextRegex::removeRichReply);
+    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 linksMatch = TextRegex::url.globalMatch(data);
-    QList<QUrl> links;
     while (linksMatch.hasNext()) {
         auto link = linksMatch.next().captured();
-        if (!link.contains(QStringLiteral("matrix.to")) && !links.contains(QUrl(link))) {
-            links += QUrl(link);
+        if (!link.contains(QStringLiteral("matrix.to"))) {
+            return QUrl(link);
         }
     }
-    return links;
+    return {};
 }
 
-bool LinkPreviewer::hasPreviewableLinks(const QString &string)
+bool LinkPreviewer::hasPreviewableLinks(const Quotient::RoomMessageEvent *event)
 {
-    return !linkPreviews(string).isEmpty();
+    return !linkPreview(event).isEmpty();
 }
 
 #include "moc_linkpreviewer.cpp"

src/linkpreviewer.h

@@ -7,6 +7,11 @@
 #include <QQmlEngine>
 #include <QUrl>
 
+namespace Quotient
+{
+class RoomMessageEvent;
+}
+
 class NeoChatRoom;
 
 /**
@@ -48,15 +53,14 @@ class LinkPreviewer : public QObject
     Q_PROPERTY(QUrl imageSource READ imageSource NOTIFY imageSourceChanged)
 
     /**
-     * @brief Whether there is a link to preview.
+     * @brief Whether the there is a link to preview.
      *
      * A linkPreviwer is empty if the URL is empty.
      */
     Q_PROPERTY(bool empty READ empty NOTIFY emptyChanged)
 
 public:
-    LinkPreviewer() = default;
-    explicit LinkPreviewer(const QUrl &url, QObject *parent = nullptr);
+    explicit LinkPreviewer(const NeoChatRoom *room = nullptr, const Quotient::RoomMessageEvent *event = nullptr, QObject *parent = nullptr);
 
     [[nodiscard]] QUrl url() const;
     [[nodiscard]] bool loaded() const;
@@ -66,21 +70,16 @@ public:
     [[nodiscard]] bool empty() const;
 
     /**
-     * @brief Whether the given string has at least 1 pre-viewable link.
+     * @brief Whether the given event 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 QString &string);
-
-    /**
-     * @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 QList<QUrl> linkPreviews(QString string);
+    static bool hasPreviewableLinks(const Quotient::RoomMessageEvent *event);
 
 private:
+    const NeoChatRoom *m_currentRoom;
+    const Quotient::RoomMessageEvent *m_event;
+
     bool m_loaded;
     QString m_title = QString();
     QString m_description = QString();
@@ -89,6 +88,14 @@ private:
 
     void loadUrlPreview();
 
+    /**
+     * @brief Return the link to be previewed from the given event.
+     *
+     * 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);
+
 Q_SIGNALS:
     void loadedChanged();
     void titleChanged();

src/login.cpp

@@ -4,8 +4,8 @@
 #include "login.h"
 
 #include <Quotient/accountregistry.h>
+#include <Quotient/connection.h>
 #include <Quotient/qt_connection_util.h>
-#include <Quotient/settings.h>
 
 #include "controller.h"
 
@@ -54,19 +54,14 @@ void LoginHelper::init()
             m_connection = new NeoChatConnection();
         }
         m_connection->resolveServer(m_matrixId);
-        connect(
-            m_connection.get(),
-            &Connection::loginFlowsChanged,
-            this,
-            [this]() {
-                setHomeserverReachable(true);
-                m_testing = false;
-                Q_EMIT testingChanged();
-                m_supportsSso = m_connection->supportsSso();
-                m_supportsPassword = m_connection->supportsPasswordAuth();
-                Q_EMIT loginFlowsChanged();
-            },
-            Qt::SingleShotConnection);
+        connectSingleShot(m_connection, &Connection::loginFlowsChanged, this, [this]() {
+            setHomeserverReachable(true);
+            m_testing = false;
+            Q_EMIT testingChanged();
+            m_supportsSso = m_connection->supportsSso();
+            m_supportsPassword = m_connection->supportsPasswordAuth();
+            Q_EMIT loginFlowsChanged();
+        });
     });
     connect(m_connection, &Connection::connected, this, [this] {
         Q_EMIT connected();
@@ -78,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.userId(), m_connection->accessToken())) {
+        if (!Controller::instance().saveAccessTokenToKeyChain(account, m_connection->accessToken())) {
             qWarning() << "Couldn't save access token";
         }
         account.sync();
@@ -105,14 +100,9 @@ void LoginHelper::init()
         Q_EMIT Controller::instance().errorOccured(i18n("Network Error"), std::move(error));
     });
 
-    connect(
-        m_connection.get(),
-        &Connection::syncDone,
-        this,
-        [this]() {
-            Q_EMIT loaded();
-        },
-        Qt::SingleShotConnection);
+    connectSingleShot(m_connection, &Connection::syncDone, this, [this]() {
+        Q_EMIT loaded();
+    });
 }
 
 void LoginHelper::setHomeserverReachable(bool reachable)
@@ -192,16 +182,11 @@ QUrl LoginHelper::ssoUrl() const
 void LoginHelper::loginWithSso()
 {
     m_connection->resolveServer(m_matrixId);
-    connect(
-        m_connection.get(),
-        &Connection::loginFlowsChanged,
-        this,
-        [this]() {
-            SsoSession *session = m_connection->prepareForSso(m_deviceName);
-            m_ssoUrl = session->ssoUrl();
-            Q_EMIT ssoUrlChanged();
-        },
-        Qt::SingleShotConnection);
+    connectSingleShot(m_connection, &Connection::loginFlowsChanged, this, [this]() {
+        SsoSession *session = m_connection->prepareForSso(m_deviceName);
+        m_ssoUrl = session->ssoUrl();
+        Q_EMIT ssoUrlChanged();
+    });
 }
 
 bool LoginHelper::testing() const

src/login.h

@@ -146,7 +146,7 @@ private:
     QString m_deviceName;
     bool m_supportsSso = false;
     bool m_supportsPassword = false;
-    QPointer<NeoChatConnection> m_connection;
+    NeoChatConnection *m_connection = nullptr;
     QUrl m_ssoUrl;
     bool m_testing = false;
     bool m_isLoggingIn = false;

src/login/CMakeLists.txt

@@ -1,23 +0,0 @@
-# SPDX-FileCopyrightText: 2024 James Graham <james.h.graham@protonmail.com>
-# SPDX-License-Identifier: BSD-2-Clause
-
-qt_add_library(login STATIC)
-qt_add_qml_module(login
-    URI org.kde.neochat.login
-    OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/src/org/kde/neochat/login
-    QML_FILES
-        WelcomePage.qml
-        LoginStep.qml
-        Captcha.qml
-        Email.qml
-        Homeserver.qml
-        Loading.qml
-        Login.qml
-        LoginMethod.qml
-        LoginRegister.qml
-        Password.qml
-        RegisterPassword.qml
-        Sso.qml
-        Terms.qml
-        Username.qml
-)