GIT_SILENT Sync po/docbooks with svn

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

.flatpak-manifest.json

@@ -2,7 +2,7 @@
     "id": "org.kde.neochat",
     "branch": "master",
     "runtime": "org.kde.Platform",
-    "runtime-version": "6.7",
+    "runtime-version": "6.6",
     "sdk": "org.kde.Sdk",
     "command": "neochat",
     "tags": [

.gitlab-ci.yml

@@ -5,11 +5,11 @@ include:
   - project: sysadmin/ci-utilities
     file:
       - /gitlab-templates/reuse-lint.yml
-#      - /gitlab-templates/android-qt6.yml
+      - /gitlab-templates/android-qt6.yml
-#      - /gitlab-templates/linux-qt6.yml
+      - /gitlab-templates/linux-qt6.yml
-#      - /gitlab-templates/windows-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-android-qt6-apks.yml
-#      - /gitlab-templates/craft-appimage-qt6.yml
+      - /gitlab-templates/craft-appimage-qt6.yml
-#      - /gitlab-templates/craft-windows-x86-64-qt6.yml
+      - /gitlab-templates/craft-windows-x86-64-qt6.yml

.kde-ci.yml

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

CMakeLists.txt

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

appiumtests/createroomtest.py

@@ -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()
+    result = load_json("sync_response_no_rooms") if ("login" in request.headers.get("Authorization")) else load_json("sync_response_rooms")
-    if len(next_sync_payload) > 0:
-        result = load_json(next_sync_payload)
-        next_sync_payload = ""
-    else:
-        result = load_json("sync_response_no_rooms") if ("login" in request.headers.get("Authorization")) else load_json("sync_response_rooms")
     return result
 
 @app.route("/.well-known/matrix/client")
@@ -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)

autotests/chatbarcachetest.cpp

@@ -6,7 +6,6 @@
 #include <QObject>
 #include <QTest>
 
-#include <Quotient/roommember.h>
 #include <Quotient/syncdata.h>
 #include <qtestcase.h>
 
@@ -51,7 +50,7 @@ void ChatBarCacheTest::empty()
     QCOMPARE(chatBarCache->replyId(), QString());
     QCOMPARE(chatBarCache->isEditing(), false);
     QCOMPARE(chatBarCache->editId(), QString());
-    QCOMPARE(chatBarCache->relationUser(), room->member(QString()));
+    QCOMPARE(chatBarCache->relationUser(), room->getUser(nullptr));
     QCOMPARE(chatBarCache->relationMessage(), QString());
     QCOMPARE(chatBarCache->attachmentPath(), QString());
 }
@@ -65,7 +64,7 @@ void ChatBarCacheTest::noRoom()
     // ChatBarCache has no parent.
 
     QTest::ignoreMessage(QtWarningMsg, "ChatBarCache created with no parent, a NeoChatRoom must be set as the parent on creation.");
-    QCOMPARE(chatBarCache->relationUser(), Quotient::RoomMember());
+    QCOMPARE(chatBarCache->relationUser(), QVariantMap());
 
     QTest::ignoreMessage(QtWarningMsg, "ChatBarCache created with no parent, a NeoChatRoom must be set as the parent on creation.");
     QCOMPARE(chatBarCache->relationMessage(), QString());
@@ -81,7 +80,7 @@ void ChatBarCacheTest::badParent()
     // ChatBarCache has no parent.
 
     QTest::ignoreMessage(QtWarningMsg, "ChatBarCache created with incorrect parent, a NeoChatRoom must be set as the parent on creation.");
-    QCOMPARE(chatBarCache->relationUser(), Quotient::RoomMember());
+    QCOMPARE(chatBarCache->relationUser(), QVariantMap());
 
     QTest::ignoreMessage(QtWarningMsg, "ChatBarCache created with incorrect parent, a NeoChatRoom must be set as the parent on creation.");
     QCOMPARE(chatBarCache->relationMessage(), QString());
@@ -99,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->member(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());
 }
@@ -116,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->member(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());
 }
@@ -133,7 +132,7 @@ void ChatBarCacheTest::attachment()
     QCOMPARE(chatBarCache->replyId(), QString());
     QCOMPARE(chatBarCache->isEditing(), false);
     QCOMPARE(chatBarCache->editId(), QString());
-    QCOMPARE(chatBarCache->relationUser(), room->member(QString()));
+    QCOMPARE(chatBarCache->relationUser(), room->getUser(nullptr));
     QCOMPARE(chatBarCache->relationMessage(), QString());
     QCOMPARE(chatBarCache->attachmentPath(), QLatin1String("some/path"));
 }

autotests/data/test-eventhandler-sync.json

@@ -35,7 +35,7 @@
         "content": {
           "$153456789:example.org": {
             "m.read": {
-              "@alice:example.org": {
+              "@alice:matrix.org": {
                 "ts": 1436451550453
               }
             }

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-min-sync.json

@@ -37,14 +37,16 @@
     "events": [
       {
         "content": {
-          "displayname": "Example",
+          "avatar_url": "mxc://example.org/SEsfnsuifSDFSSEF",
-          "membership": "join"
+          "displayname": "Alice Margatroid",
+          "membership": "join",
+          "reason": "Looking for support"
         },
         "event_id": "$143273582443PhrSn:example.org",
         "origin_server_ts": 1432735824653,
         "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
         "sender": "@example:example.org",
-        "state_key": "@example:example.org",
+        "state_key": "@alice:example.org",
         "type": "m.room.member",
         "unsigned": {
           "age": 1234

autotests/data/test-texthandler-sync.json

@@ -51,21 +51,6 @@
         "unsigned": {
           "age": 1234
         }
-      },
-      {
-        "content": {
-          "displayname": "Example",
-          "membership": "join"
-        },
-        "event_id": "$143273582443PhrSn:example.org",
-        "origin_server_ts": 1432735824653,
-        "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
-        "sender": "@example:example.org",
-        "state_key": "@example:example.org",
-        "type": "m.room.member",
-        "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/eventhandlertest.cpp

@@ -56,7 +56,6 @@ private Q_SLOTS:
     void genericBody();
     void nullGenericBody();
     void markdownBody();
-    void markdownBodyReply();
     void subtitle();
     void nullSubtitle();
     void mediaInfo();
@@ -101,27 +100,28 @@ 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.isLocalMember(), author.id() == room->localMember().id());
+    QCOMPARE(eventHandlerAuthor["isLocalUser"_ls], author->id() == room->localUser()->id());
-    QCOMPARE(eventHandlerAuthor.id(), author.id());
+    QCOMPARE(eventHandlerAuthor["id"_ls], author->id());
-    QCOMPARE(eventHandlerAuthor.displayName(), author.displayName());
+    QCOMPARE(eventHandlerAuthor["displayName"_ls], author->displayname(room));
-    QCOMPARE(eventHandlerAuthor.avatarUrl(), author.avatarUrl());
+    QCOMPARE(eventHandlerAuthor["avatarSource"_ls], room->avatarForMember(author));
-    QCOMPARE(eventHandlerAuthor.avatarMediaId(), author.avatarMediaId());
+    QCOMPARE(eventHandlerAuthor["avatarMediaId"_ls], author->avatarMediaId(room));
-    QCOMPARE(eventHandlerAuthor.color(), author.color());
+    QCOMPARE(eventHandlerAuthor["color"_ls], Utils::getUserColor(author->hueF()));
+    QCOMPARE(eventHandlerAuthor["object"_ls], QVariant::fromValue(author));
 }
 
 void EventHandlerTest::nullAuthor()
 {
     QTest::ignoreMessage(QtWarningMsg, "getAuthor called with m_room set to nullptr.");
-    QCOMPARE(emptyHandler.getAuthor(), RoomMember());
+    QCOMPARE(emptyHandler.getAuthor(), QVariantMap());
 
     EventHandler noEventHandler(room, nullptr);
     QTest::ignoreMessage(QtWarningMsg, "getAuthor called with m_event set to nullptr. Returning empty user.");
-    QCOMPARE(noEventHandler.getAuthor(), RoomMember());
+    QCOMPARE(noEventHandler.getAuthor(), room->getUser(nullptr));
 }
 
 void EventHandlerTest::authorDisplayName()
@@ -301,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());
@@ -392,30 +385,31 @@ 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.isLocalMember(), replyAuthor.id() == room->localMember().id());
+    QCOMPARE(eventHandlerReplyAuthor["isLocalUser"_ls], replyAuthor->id() == room->localUser()->id());
-    QCOMPARE(eventHandlerReplyAuthor.id(), replyAuthor.id());
+    QCOMPARE(eventHandlerReplyAuthor["id"_ls], replyAuthor->id());
-    QCOMPARE(eventHandlerReplyAuthor.displayName(), replyAuthor.displayName());
+    QCOMPARE(eventHandlerReplyAuthor["displayName"_ls], replyAuthor->displayname(room));
-    QCOMPARE(eventHandlerReplyAuthor.avatarUrl(), replyAuthor.avatarUrl());
+    QCOMPARE(eventHandlerReplyAuthor["avatarSource"_ls], room->avatarForMember(replyAuthor));
-    QCOMPARE(eventHandlerReplyAuthor.avatarMediaId(), replyAuthor.avatarMediaId());
+    QCOMPARE(eventHandlerReplyAuthor["avatarMediaId"_ls], replyAuthor->avatarMediaId(room));
-    QCOMPARE(eventHandlerReplyAuthor.color(), replyAuthor.color());
+    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(), RoomMember());
+    QCOMPARE(eventHandlerNoAuthor.getReplyAuthor(), room->getUser(nullptr));
 }
 
 void EventHandlerTest::nullReplyAuthor()
 {
     QTest::ignoreMessage(QtWarningMsg, "getReplyAuthor called with m_room set to nullptr.");
-    QCOMPARE(emptyHandler.getReplyAuthor(), RoomMember());
+    QCOMPARE(emptyHandler.getReplyAuthor(), QVariantMap());
 
     EventHandler noEventHandler(room, nullptr);
     QTest::ignoreMessage(QtWarningMsg, "getReplyAuthor called with m_event set to nullptr. Returning empty user.");
-    QCOMPARE(noEventHandler.getReplyAuthor(), RoomMember());
+    QCOMPARE(noEventHandler.getReplyAuthor(), room->getUser(nullptr));
 }
 
 void EventHandlerTest::replyBody()
@@ -529,10 +523,10 @@ void EventHandlerTest::readMarkers()
     auto readMarkers = eventHandler.getReadMarkers();
 
     QCOMPARE(readMarkers.size(), 1);
-    QCOMPARE(readMarkers[0].id(), QStringLiteral("@alice:example.org"));
+    QCOMPARE(readMarkers[0].toMap()["id"_ls], QStringLiteral("@alice:matrix.org"));
 
     QCOMPARE(eventHandler.getNumberExcessReadMarkers(), QString());
-    QCOMPARE(eventHandler.getReadMarkersString(), QStringLiteral("1 user: Alice Margatroid"));
+    QCOMPARE(eventHandler.getReadMarkersString(), QStringLiteral("1 user: @alice:matrix.org"));
 
     EventHandler eventHandler2(room, room->messageEvents().at(2).get());
     QCOMPARE(eventHandler2.hasReadMarkers(), true);
@@ -552,7 +546,7 @@ void EventHandlerTest::nullReadMarkers()
     QCOMPARE(emptyHandler.hasReadMarkers(), false);
 
     QTest::ignoreMessage(QtWarningMsg, "getReadMarkers called with m_room set to nullptr.");
-    QCOMPARE(emptyHandler.getReadMarkers(), QList<Quotient::RoomMember>());
+    QCOMPARE(emptyHandler.getReadMarkers(), QVariantList());
 
     QTest::ignoreMessage(QtWarningMsg, "getNumberExcessReadMarkers called with m_room set to nullptr.");
     QCOMPARE(emptyHandler.getNumberExcessReadMarkers(), QString());
@@ -566,7 +560,7 @@ void EventHandlerTest::nullReadMarkers()
     QCOMPARE(noEventHandler.hasReadMarkers(), false);
 
     QTest::ignoreMessage(QtWarningMsg, "getReadMarkers called with m_event set to nullptr.");
-    QCOMPARE(noEventHandler.getReadMarkers(), QList<Quotient::RoomMember>());
+    QCOMPARE(noEventHandler.getReadMarkers(), QVariantList());
 
     QTest::ignoreMessage(QtWarningMsg, "getNumberExcessReadMarkers called with m_event set to nullptr.");
     QCOMPARE(noEventHandler.getNumberExcessReadMarkers(), QString());

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,9 +30,6 @@ private Q_SLOTS:
     void linkPreviewsMatch_data();
     void linkPreviewsMatch();
 
-    void multipleLinkPreviewsMatch_data();
-    void multipleLinkPreviewsMatch();
-
     void linkPreviewsReject_data();
     void linkPreviewsReject();
 };
@@ -44,59 +42,45 @@ 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("plainHttps") << QStringLiteral("test-validplainlink-event.json") << QUrl("https://kde.org"_ls);
-    QTest::newRow("richHttps") << QStringLiteral("<a href=\"https://kde.org\">Rich Link</a>") << QUrl("https://kde.org"_ls);
+    QTest::newRow("richHttps") << QStringLiteral("test-validrichlink-event.json") << 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("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(LinkPreviewer::linkPreview(event.get()), connection);
 
-    QCOMPARE(link, testOutputLink);
+    QCOMPARE(linkPreviewer.empty(), false);
-}
+    QCOMPARE(linkPreviewer.url(), testOutputLink);
-
-void LinkPreviewerTest::multipleLinkPreviewsMatch_data()
-{
-    QTest::addColumn<QString>("inputString");
-    QTest::addColumn<QList<QUrl>>("testOutputLinks");
-
-    QTest::newRow("multipleHttps") << QStringLiteral("www.example.org https://kde.org") << QList{QUrl("www.example.org"_ls), QUrl("https://kde.org"_ls)};
-    QTest::newRow("multipleHttps1Invalid") << QStringLiteral("www.example.org mxc://example.org/SEsfnsuifSDFSSEF") << QList{QUrl("www.example.org"_ls)};
-}
-
-void LinkPreviewerTest::multipleLinkPreviewsMatch()
-{
-    QFETCH(QString, inputString);
-    QFETCH(QList<QUrl>, testOutputLinks);
-
-    auto links = LinkPreviewer::linkPreviews(inputString);
-
-    QCOMPARE(links, testOutputLinks);
 }
 
 void LinkPreviewerTest::linkPreviewsReject_data()
 {
-    QTest::addColumn<QString>("inputString");
+    QTest::addColumn<QString>("eventSource");
 
-    QTest::newRow("mxc") << QStringLiteral("mxc://example.org/SEsfnsuifSDFSSEF");
+    QTest::newRow("mxc") << QStringLiteral("test-invalidmxclink-event.json");
-    QTest::newRow("matrixTo") << QStringLiteral("https://matrix.to/#/@alice:example.org");
+    QTest::newRow("matrixTo") << QStringLiteral("test-invalidmatrixtolink-event.json");
-    QTest::newRow("noSpace") << QStringLiteral("testhttps://kde.org");
+    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(LinkPreviewer::linkPreview(event.get()), connection);
 
-    QCOMPARE(links.empty(), true);
+    QCOMPARE(linkPreviewer.empty(), true);
+    QCOMPARE(linkPreviewer.url(), QUrl());
 }
 
 QTEST_MAIN(LinkPreviewerTest)

autotests/reactionmodeltest.cpp

@@ -53,7 +53,9 @@ 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>"));
-    QCOMPARE(model.data(model.index(0), ReactionModel::HasLocalMember), false);
+    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);
 }
 
 void ReactionModelTest::newReaction()

org.kde.neochat.appdata.xml

@@ -95,8 +95,10 @@
     <p xml:lang="ka">NeoChat ჩატის აპია, რომელიც საშუალება გაძლევთ, Matrix-ის ქსელის საშუალებები ბოლომდე გამოიყენოთ. ის გაძლევთ უსაფრთხო გზას, გააგზავნოთ ტექსტური შეტყობინებები, ვიდეოებ და აუდიოფაილები თქვენს ოჯახთან, კოლეგებთან და მეგობრებთან.</p>
     <p xml:lang="lv">„NeoChat“ ir tērzēšanas programma, kas ļauj pilnvērtīgi izmantot „Matrix“ tīklu. Tā sniedz drošu veidu teksta ziņu, video un audio sūtīšanai ģimenes locekļiem, kolēģiem un draugiem.</p>
     <p xml:lang="nl">NeoChat is een chat-toepassing die u het volledige voordeel van het Matrix-netwerk laat genieten. Het levert u op een veilige manier tekstberichten, video's en geluidsbestanden naar uw familie, collega's en vrienden te verzenden.</p>
+    <p xml:lang="nn">NeoChat er ein prateapp som lèt deg bruka all funksjonalitet i Matrix-nettverket. Du kan utveksla tekst, lyd og videoar med vennar, familie og kollegaar på ein trygg måte.</p>
     <p xml:lang="pl">NoeChat to aplikacja do rozmów, która umożliwia wykorzystanie wszystkich możliwości Matriksa. Umożliwia wysyłanie wiadomości tekstowych, filmów i dźwięków w bezpieczny sposób do twojej rodziny, kolegów i przyjaciół.</p>
     <p xml:lang="sl">NeoChat je aplikacija za klepet, ki vam omogoča, da v celoti izkoristite omrežje Matrix. Zagotavlja vam varen način za pošiljanje besedilnih sporočil, videoposnetkov in zvočnih datotek vaši družini, sodelavcem in prijateljem.</p>
+    <p xml:lang="sv">NeoChat är ett chattprogram som låter dig dra full nytta av Matrix-nätverket. Det ger dig ett säkert sätt att skicka textmeddelanden, videor och ljudfiler till din familj, kollegor och vänner.</p>
     <p xml:lang="tr">NeoChat, Matrix ağının tüm özelliklerini kullanan bir sohbet uygulamasıdır. Ailenize, arkadaşlarınıza ve iş arkadaşlarınıza metin iletileri, ses ve video dosyaları göndermenin kolay bir yolunu sunar.</p>
     <p xml:lang="uk">NeoChat є програмою для спілкування, за допомогою якої ви можете скористатися усіма перевагами мережі Matrix. За її допомогою ви можете безпечно надсилати текстові повідомлення, відео та звукові файли вашим родичам, колегам та друзям.</p>
     <p xml:lang="x-test">xxNeoChat is a chat app that lets you take full advantage of the Matrix network. It provides you with a secure way to send text messages, videos and audio files to your family, colleagues and friends.xx</p>
@@ -212,7 +214,7 @@
       <li xml:lang="sl">Sticker Packs - MSC2545</li>
       <li xml:lang="sv">Sticker Packs - MSC2545</li>
       <li xml:lang="ta">ஒட்டி தொகுப்புகள் - MSC2545</li>
-      <li xml:lang="tr">Yapışkan Paketleri — MSC2545</li>
+      <li xml:lang="tr">Çıkartma 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>
@@ -327,8 +329,10 @@
       <caption xml:lang="ka">აღმოაჩინეთ ახალი საზოგადოებები Matrix Spaces-თან ერთად</caption>
       <caption xml:lang="lv">Atklājiet jaunas kopienas ar „Matrix“ telpām</caption>
       <caption xml:lang="nl">Ontdek nieuwe gemeenschappen met Matrix-ruimten</caption>
+      <caption xml:lang="nn">Oppdag nye fellesskap med Matrix Spaces</caption>
       <caption xml:lang="pl">Odkrywaj nowe społeczności w Przestrzeniach Matriksa</caption>
       <caption xml:lang="sl">Odkrijte nove skupnosti z Matrix Spaces</caption>
+      <caption xml:lang="sv">Upptäck nya gemenskaper med Matrix Spaces</caption>
       <caption xml:lang="tr">Matrix Alanlar ile yeni topluluklar keşfedin</caption>
       <caption xml:lang="uk">Пошук нових спільнот за допомогою Matrix Spaces</caption>
       <caption xml:lang="x-test">xxDiscover new communities with Matrix Spacesxx</caption>
@@ -411,6 +415,8 @@
     <content_attribute id="social-chat">intense</content_attribute>
   </content_rating>
   <releases>
+    <release version="24.05.2" date="2024-07-04"/>
+    <release version="24.05.1" date="2024-06-13"/>
     <release version="24.05.0" date="2024-05-23"/>
     <release version="24.02.2" date="2024-04-11"/>
     <release version="24.02.1" date="2024-03-21"/>

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

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

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
@@ -156,6 +158,7 @@ add_library(neochat STATIC
     models/linemodel.cpp
     models/linemodel.h
     events/locationbeaconevent.h
+    events/serveraclevent.h
     events/widgetevent.h
     enums/messagecomponenttype.h
     models/messagecontentmodel.cpp
@@ -174,18 +177,6 @@ add_library(neochat STATIC
     foreigntypes.h
     models/threepidmodel.cpp
     models/threepidmodel.h
-    threepidaddhelper.cpp
-    threepidaddhelper.h
-    jobs/neochatadd3pidjob.cpp
-    jobs/neochatadd3pidjob.h
-    identityserverhelper.cpp
-    identityserverhelper.h
-    enums/powerlevel.cpp
-    enums/powerlevel.h
-    models/permissionsmodel.cpp
-    models/permissionsmodel.h
-    threepidbindhelper.cpp
-    threepidbindhelper.h
 )
 
 set_source_files_properties(qml/OsmLocationPlugin.qml PROPERTIES
@@ -216,10 +207,16 @@ qt_add_qml_module(neochat URI org.kde.neochat NO_PLUGIN
         qml/TypingPane.qml
         qml/QuickSwitcher.qml
         qml/HoverActions.qml
+        qml/ChatBar.qml
         qml/AttachmentPane.qml
+        qml/ReplyPane.qml
+        qml/CompletionMenu.qml
+        qml/PieProgressBar.qml
         qml/QuickFormatBar.qml
+        qml/EmojiPicker.qml
         qml/UserDetailDialog.qml
         qml/CreateRoomDialog.qml
+        qml/EmojiDialog.qml
         qml/OpenFileDialog.qml
         qml/KeyVerificationDialog.qml
         qml/ConfirmLogoutDialog.qml
@@ -239,6 +236,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
@@ -262,6 +262,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 +280,12 @@ qt_add_qml_module(neochat URI org.kde.neochat NO_PLUGIN
         qml/ConfirmLeaveDialog.qml
         qml/CodeMaximizeComponent.qml
         qml/EditStateDialog.qml
-        qml/ConsentDialog.qml
-        qml/AskDirectChatConfirmation.qml
-        qml/HoverLinkIndicator.qml
-        qml/CrossSigningSetupDialog.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
 )
 
 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)
@@ -392,7 +379,7 @@ else()
 endif()
 
 target_include_directories(neochat PRIVATE ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/models ${CMAKE_CURRENT_SOURCE_DIR}/enums)
-target_link_libraries(neochat PRIVATE settingsplugin timelineplugin devtoolsplugin loginplugin chatbarplugin)
+target_link_libraries(neochat PRIVATE settingsplugin timelineplugin devtoolsplugin loginplugin)
 target_link_libraries(neochat PUBLIC
     Qt::Core
     Qt::Quick

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

@@ -3,8 +3,6 @@
 
 #include "chatbarcache.h"
 
-#include <Quotient/roommember.h>
-
 #include "chatdocumenthandler.h"
 #include "eventhandler.h"
 #include "neochatroom.h"
@@ -86,7 +84,7 @@ void ChatBarCache::setEditId(const QString &editId)
     Q_EMIT attachmentPathChanged();
 }
 
-Quotient::RoomMember ChatBarCache::relationUser() const
+QVariantMap ChatBarCache::relationUser() const
 {
     if (parent() == nullptr) {
         qWarning() << "ChatBarCache created with no parent, a NeoChatRoom must be set as the parent on creation.";
@@ -98,9 +96,9 @@ Quotient::RoomMember ChatBarCache::relationUser() const
         return {};
     }
     if (m_relationId.isEmpty()) {
-        return room->member(QString());
+        return room->getUser(nullptr);
     }
-    return room->member((*room->findInTimeline(m_relationId))->senderId());
+    return room->getUser(room->user((*room->findInTimeline(m_relationId))->senderId()));
 }
 
 QString ChatBarCache::relationMessage() const

src/chatbarcache.h

@@ -10,12 +10,6 @@
 
 class ChatDocumentHandler;
 
-namespace Quotient
-{
-class RoomMember;
-}
-
-
 /**
  * @brief Defines a user mention in the current chat or edit text.
  */
@@ -94,13 +88,26 @@ class ChatBarCache : public QObject
     Q_PROPERTY(QString editId READ editId WRITE setEditId NOTIFY relationIdChanged)
 
     /**
-     * @brief Get the RoomMember object for the message being replied to.
+     * @brief Get the user for the message being replied to.
      *
-     * Returns an empty RoomMember if not replying to a message.
+     * This is different to getting a Quotient::User object
+     * as neither of those can provide details like the displayName or avatarMediaId
+     * without the room context as these can vary from room to room.
      *
-     * @sa Quotient::RoomMember
+     * Returns an empty user if not replying to a message.
+     *
+     * The user QVariantMap has the following properties:
+     *  - isLocalUser - Whether the user is the local user.
+     *  - id - The matrix ID of the user.
+     *  - displayName - Display name in the context of this room.
+     *  - avatarSource - The mxc URL for the user's avatar in the current room.
+     *  - avatarMediaId - Avatar id in the context of this room.
+     *  - color - Color for the user.
+     *  - object - The Quotient::User object for the user.
+     *
+     * @sa getUser, Quotient::User
      */
-    Q_PROPERTY(Quotient::RoomMember relationUser READ relationUser NOTIFY relationIdChanged)
+    Q_PROPERTY(QVariantMap relationUser READ relationUser NOTIFY relationIdChanged)
 
     /**
      * @brief The content of the related message.
@@ -154,7 +161,7 @@ public:
     QString editId() const;
     void setEditId(const QString &editId);
 
-    Quotient::RoomMember relationUser() const;
+    QVariantMap relationUser() const;
 
     QString relationMessage() const;
 

src/controller.cpp

@@ -9,20 +9,27 @@
 #include <KLocalizedString>
 
 #include <QGuiApplication>
+#include <QNetworkProxy>
+#include <QQuickTextDocument>
+#include <QQuickWindow>
+#include <QStandardPaths>
+#include <QStringBuilder>
 #include <QTimer>
 
 #include <signal.h>
 
 #include <Quotient/accountregistry.h>
+#include <Quotient/csapi/logout.h>
 #include <Quotient/csapi/notifications.h>
+#include <Quotient/eventstats.h>
 #include <Quotient/qt_connection_util.h>
-#include <Quotient/settings.h>
 
 #include "neochatconfig.h"
 #include "neochatconnection.h"
 #include "neochatroom.h"
 #include "notificationsmanager.h"
 #include "proxycontroller.h"
+#include "roommanager.h"
 
 #if defined(Q_OS_WIN) || defined(Q_OS_MAC)
 #include "trayicon.h"
@@ -38,10 +45,6 @@
 #endif
 #endif
 
-#ifdef HAVE_KUNIFIEDPUSH
-#include <kunifiedpush/connector.h>
-#endif
-
 bool testMode = false;
 
 using namespace Quotient;
@@ -186,7 +189,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;
@@ -214,11 +217,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]() {
@@ -249,12 +252,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);
@@ -406,3 +409,12 @@ void Controller::removeConnection(const QString &userId)
         SettingsGroup("Accounts"_ls).remove(userId);
     }
 }
+
+bool Controller::ssssSupported() const
+{
+#if __has_include("Quotient/e2ee/sssshandler.h")
+    return true;
+#else
+    return false;
+#endif
+}

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;
@@ -50,6 +56,8 @@ class Controller : public QObject
 
     Q_PROPERTY(QStringList accountsLoading MEMBER m_accountsLoading NOTIFY accountsLoadingChanged)
 
+    Q_PROPERTY(bool ssssSupported READ ssssSupported CONSTANT)
+
 public:
     static Controller &instance();
     static Controller *create(QQmlEngine *engine, QJSEngine *)
@@ -74,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;
 
@@ -94,13 +102,15 @@ public:
 
     Q_INVOKABLE void removeConnection(const QString &userId);
 
+    bool ssssSupported() const;
+
 private:
     explicit Controller(QObject *parent = nullptr);
 
     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;

src/devtools/DevtoolsPage.qml

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

src/devtools/FeatureFlagPage.qml

@@ -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/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/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

@@ -19,11 +19,11 @@
 #include <Quotient/events/simplestateevents.h>
 #include <Quotient/events/stickerevent.h>
 #include <Quotient/quotient_common.h>
-#include <Quotient/roommember.h>
 
 #include "eventhandler_logging.h"
 #include "events/locationbeaconevent.h"
 #include "events/pollevent.h"
+#include "events/serveraclevent.h"
 #include "events/widgetevent.h"
 #include "linkpreviewer.h"
 #include "messagecomponenttype.h"
@@ -61,18 +61,20 @@ MessageComponentType::Type EventHandler::messageComponentType() const
     return MessageComponentType::typeForEvent(*m_event);
 }
 
-Quotient::RoomMember EventHandler::getAuthor(bool isPending) const
+QVariantMap EventHandler::getAuthor(bool isPending) const
 {
     if (m_room == nullptr) {
         qCWarning(EventHandling) << "getAuthor called with m_room set to nullptr.";
         return {};
     }
+    // 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 {};
+        return m_room->getUser(nullptr);
     }
 
-    return 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);
 }
 
 QString EventHandler::getAuthorDisplayName(bool isPending) const
@@ -94,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());
+        const auto author = isPending ? m_room->localUser() : m_room->user(m_event->senderId());
-        return author.htmlSafeDisplayName();
+        return m_room->htmlSafeMemberName(author->id());
     }
 }
 
@@ -110,8 +112,8 @@ QString EventHandler::singleLineAuthorDisplayname(bool isPending) const
         return {};
     }
 
-    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());
-    auto displayName = author.displayName();
+    auto displayName = m_room->safeMemberName(author->id());
     displayName.replace(QStringLiteral("<br>\n"), QStringLiteral(" "));
     displayName.replace(QStringLiteral("<br>"), QStringLiteral(" "));
     displayName.replace(QStringLiteral("<br />\n"), QStringLiteral(" "));
@@ -218,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;
     }
 
@@ -253,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();
     }
@@ -291,10 +293,7 @@ QString EventHandler::getMarkdownBody() const
     }
 
     const auto roomMessageEvent = eventCast<const RoomMessageEvent>(m_event);
-
+    return roomMessageEvent->plainBody();
-    QString plainBody = roomMessageEvent->plainBody();
-    plainBody.remove(TextRegex::removeReply);
-    return plainBody;
 }
 
 QString EventHandler::getBody(const Quotient::RoomEvent *event, Qt::TextFormat format, bool stripNewlines) const
@@ -316,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();
@@ -324,8 +323,7 @@ QString EventHandler::getBody(const Quotient::RoomEvent *event, Qt::TextFormat f
             }
 
             if (prettyPrint) {
-                subjectName = QStringLiteral("<a href=\"https://matrix.to/#/%1\" style=\"color: %2\">%3</a>")
+                subjectName = QStringLiteral("<a href=\"https://matrix.to/#/%1\">%2</a>").arg(e.userId(), subjectName);
-                                  .arg(e.userId(), m_room->member(e.userId()).color().name(), subjectName);
             }
 
             // The below code assumes senderName output in AuthorRole
@@ -439,7 +437,7 @@ QString EventHandler::getBody(const Quotient::RoomEvent *event, Qt::TextFormat f
         [](const LocationBeaconEvent &e) {
             return e.contentJson()["description"_ls].toString();
         },
-        [](const RoomServerAclEvent &) {
+        [](const ServerAclEvent &) {
             return i18n("changed the server access control lists for this room");
         },
         [](const WidgetEvent &e) {
@@ -478,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();
     }
@@ -608,7 +606,7 @@ QString EventHandler::getGenericBody() const
         [](const LocationBeaconEvent &) {
             return i18n("sent a live location beacon");
         },
-        [](const RoomServerAclEvent &) {
+        [](const ServerAclEvent &) {
             return i18n("changed the server access control lists for this room");
         },
         [](const WidgetEvent &e) {
@@ -799,21 +797,25 @@ MessageComponentType::Type EventHandler::replyMessageComponentType() const
     return MessageComponentType::typeForEvent(*replyEvent);
 }
 
-Quotient::RoomMember EventHandler::getReplyAuthor() const
+QVariantMap EventHandler::getReplyAuthor() const
 {
     if (m_room == nullptr) {
         qCWarning(EventHandling) << "getReplyAuthor called with m_room set to nullptr.";
         return {};
     }
+    // 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 {};
+        return m_room->getUser(nullptr);
     }
 
-    if (auto replyPtr = m_room->getReplyForEvent(*m_event)) {
+    auto replyPtr = m_room->getReplyForEvent(*m_event);
-        return m_room->member(replyPtr->senderId());
+
+    if (replyPtr) {
+        auto replyUser = m_room->user(replyPtr->senderId());
+        return m_room->getUser(replyUser);
     } else {
-        return m_room->member(QString());
+        return m_room->getUser(nullptr);
     }
 }
 
@@ -961,11 +963,11 @@ 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;
 }
 
-QList<Quotient::RoomMember> EventHandler::getReadMarkers(int maxMarkers) const
+QVariantList EventHandler::getReadMarkers(int maxMarkers) const
 {
     if (m_room == nullptr) {
         qCWarning(EventHandling) << "getReadMarkers called with m_room set to nullptr.";
@@ -977,17 +979,18 @@ QList<Quotient::RoomMember> 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) {
         userIds = userIds.mid(0, maxMarkers);
     }
 
-    QList<Quotient::RoomMember> users;
+    QVariantList users;
     users.reserve(userIds.size());
     for (const auto &userId : userIds) {
-        users += m_room->member(userId);
+        auto user = m_room->user(userId);
+        users += m_room->getUser(user);
     }
 
     return users;
@@ -1005,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);
@@ -1026,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
@@ -1034,12 +1037,10 @@ QString EventHandler::getReadMarkersString() const
      */
     QString readMarkersString = i18np("1 user: ", "%1 users: ", userIds.size());
     for (const auto &userId : userIds) {
-        auto member = m_room->member(userId);
+        auto user = m_room->user(userId);
-        QString displayName;
+        auto displayName = user->displayname(m_room);
-        if (member.isEmpty()) {
+        if (displayName.isEmpty()) {
-            displayName = i18nc("A member who is not in the room has been requested.", "unknown member");
+            displayName = userId;
-        } else {
-            displayName = member.displayName();
         }
         readMarkersString += displayName + i18nc("list separator", ", ");
     }

src/eventhandler.h

@@ -13,11 +13,6 @@
 
 #include "enums/messagecomponenttype.h"
 
-namespace Quotient
-{
-class RoomMember;
-}
-
 class LinkPreviewer;
 class NeoChatRoom;
 class ReactionModel;
@@ -56,17 +51,30 @@ public:
     /**
      * @brief Get the author of the event in context of the room.
      *
-     * An empty Quotient::RoomMember will be returned if the EventHandler hasn't had
+     * This is different to getting a Quotient::User object
-     * the room or event initialised.
+     * as neither of those can provide details like the displayName or avatarMediaId
+     * without the room context as these can vary from room to room. This function
+     * uses the room context and outputs the result as QVariantMap.
+     *
+     * An empty QVariantMap will be returned if the EventHandler hasn't had the room
+     * intialised. An empty user (i.e. a QVariantMap with all the correct keys
+     * but empty values) will be returned if the room has been set but not an event.
      *
      * @param isPending if the event is pending, i.e. has not been confirmed by
      *                  the server.
      *
-     * @return a Quotient::RoomMember object for the user.
+     * @return a QVariantMap for the user with the following properties:
+     *  - isLocalUser - Whether the user is the local user.
+     *  - id - The matrix ID of the user.
+     *  - displayName - Display name in the context of this room.
+     *  - avatarSource - The mxc URL for the user's avatar in the current room.
+     *  - avatarMediaId - Avatar id in the context of this room.
+     *  - color - Color for the user.
+     *  - object - The Quotient::User object for the user.
      *
-     * @sa Quotient::RoomMember
+     * @sa Quotient::User
      */
-    Quotient::RoomMember getAuthor(bool isPending = false) const;
+    QVariantMap getAuthor(bool isPending = false) const;
 
     /**
      * @brief Get the display name of the event author.
@@ -243,17 +251,27 @@ public:
     /**
      * @brief Get the author of the event replied to in context of the room.
      *
-     * An empty Quotient::RoomMember will be returned if the EventHandler hasn't had
+     * This is different to getting a Quotient::User object
-     * the room or event initialised.
+     * as neither of those can provide details like the displayName or avatarMediaId
+     * without the room context as these can vary from room to room. This function
+     * uses the room context and outputs the result as QVariantMap.
      *
-     * @param isPending if the event is pending, i.e. has not been confirmed by
+     * An empty QVariantMap will be returned if the EventHandler hasn't had the room
-     *                  the server.
+     * intialised. An empty user (i.e. a QVariantMap with all the correct keys
+     * but empty values) will be returned if the room has been set but not an event.
      *
-     * @return a Quotient::RoomMember object for the user.
+     * @return a QVariantMap for the user with the following properties:
+     *  - isLocalUser - Whether the user is the local user.
+     *  - id - The matrix ID of the user.
+     *  - displayName - Display name in the context of this room.
+     *  - avatarSource - The mxc URL for the user's avatar in the current room.
+     *  - avatarMediaId - Avatar id in the context of this room.
+     *  - color - Color for the user.
+     *  - object - The Quotient::User object for the user.
      *
-     * @sa Quotient::RoomMember
+     * @sa Quotient::User
      */
-    Quotient::RoomMember getReplyAuthor() const;
+    QVariantMap getReplyAuthor() const;
 
     /**
      * @brief Output a string for the message content of the event replied to ready
@@ -357,7 +375,7 @@ public:
      *                   the number of users shown plus the excess number will be
      *                   the total number of other user read markers at an event.
      */
-    QList<Quotient::RoomMember> getReadMarkers(int maxMarkers = 5) const;
+    QVariantList getReadMarkers(int maxMarkers = 5) const;
 
     /**
      * @brief Returns the number of excess user read markers for the event.

src/events/imagepackevent.cpp

@@ -10,29 +10,29 @@ ImagePackEventContent::ImagePackEventContent(const QJsonObject &json)
 {
     if (json.contains(QStringLiteral("pack"))) {
         pack = ImagePackEventContent::Pack{
-            fromJson<std::optional<QString>>(json["pack"_ls].toObject()["display_name"_ls]),
+            fromJson<Omittable<QString>>(json["pack"_ls].toObject()["display_name"_ls]),
-            fromJson<std::optional<QUrl>>(json["pack"_ls].toObject()["avatar_url"_ls]),
+            fromJson<Omittable<QUrl>>(json["pack"_ls].toObject()["avatar_url"_ls]),
-            fromJson<std::optional<QStringList>>(json["pack"_ls].toObject()["usage"_ls]),
+            fromJson<Omittable<QStringList>>(json["pack"_ls].toObject()["usage"_ls]),
-            fromJson<std::optional<QString>>(json["pack"_ls].toObject()["attribution"_ls]),
+            fromJson<Omittable<QString>>(json["pack"_ls].toObject()["attribution"_ls]),
         };
     } else {
-        pack = std::nullopt;
+        pack = none;
     }
 
     const auto &keys = json["images"_ls].toObject().keys();
     for (const auto &k : keys) {
-        std::optional<EventContent::ImageInfo> info;
+        Omittable<EventContent::ImageInfo> info;
         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 = std::nullopt;
+            info = none;
         }
         images += ImagePackImage{
             k,
             fromJson<QUrl>(json["images"_ls][k]["url"_ls].toString()),
-            fromJson<std::optional<QString>>(json["images"_ls][k]["body"_ls]),
+            fromJson<Omittable<QString>>(json["images"_ls][k]["body"_ls]),
             info,
-            fromJson<std::optional<QStringList>>(json["images"_ls][k]["usage"_ls]),
+            fromJson<Omittable<QStringList>>(json["images"_ls][k]["usage"_ls]),
         };
     }
 }

src/events/imagepackevent.h

@@ -26,10 +26,10 @@ public:
      * @brief Defines the properties of an image pack.
      */
     struct Pack {
-        std::optional<QString> displayName; /**< The display name of the pack. */
+        Quotient::Omittable<QString> displayName; /**< The display name of the pack. */
-        std::optional<QUrl> avatarUrl; /**< The source mxc URL for the pack avatar. */
+        Quotient::Omittable<QUrl> avatarUrl; /**< The source mxc URL for the pack avatar. */
-        std::optional<QStringList> usage; /**< An array of the usages for this pack. Possible usages are "emoticon" and "sticker". */
+        Quotient::Omittable<QStringList> usage; /**< An array of the usages for this pack. Possible usages are "emoticon" and "sticker". */
-        std::optional<QString> attribution; /**< The attribution for the pack author(s). */
+        Quotient::Omittable<QString> attribution; /**< The attribution for the pack author(s). */
     };
 
     /**
@@ -38,14 +38,14 @@ public:
     struct ImagePackImage {
         QString shortcode; /**< The shortcode for the image. */
         QUrl url; /**< The mxc URL for this image. */
-        std::optional<QString> body; /**< An optional text body for this image. */
+        Quotient::Omittable<QString> body; /**< An optional text body for this image. */
-        std::optional<Quotient::EventContent::ImageInfo> info; /**< The ImageInfo object used for the info block of m.sticker events. */
+        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.
          */
-        std::optional<QStringList> usage;
+        Quotient::Omittable<QStringList> usage;
     };
 
     /**
@@ -53,7 +53,7 @@ public:
      *
      * @sa Pack
      */
-    std::optional<Pack> pack;
+    Quotient::Omittable<Pack> pack;
 
     /**
      * @brief Return a vector of images in the pack.

src/events/serveraclevent.h

@@ -0,0 +1,14 @@
+// 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/events/simplestateevents.h>
+
+namespace Quotient
+{
+
+// Defined so we can directly switch on type.
+DEFINE_SIMPLE_STATE_EVENT(ServerAclEvent, "m.room.server_acl", bool, allow_ip_literals, "allow_ip_literals")
+
+} // namespace Quotient

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

@@ -6,8 +6,10 @@
 #include <QQmlEngine>
 
 #include <Quotient/accountregistry.h>
-#include <Quotient/e2ee/sssshandler.h>
 #include <Quotient/keyverificationsession.h>
+#if __has_include("Quotient/e2ee/sssshandler.h")
+#include <Quotient/e2ee/sssshandler.h>
+#endif
 
 #include "controller.h"
 #include "neochatconfig.h"
@@ -45,8 +47,10 @@ struct ForeignKeyVerificationSession {
     QML_UNCREATABLE("")
 };
 
+#if __has_include("Quotient/e2ee/sssshandler.h")
 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,13 +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>
-
-class NeochatAdd3PIdJob : public Quotient::BaseJob
-{
-public:
-    explicit NeochatAdd3PIdJob(const QString &clientSecret, const QString &sid, const Quotient::Omittable<QJsonObject> &auth = Quotient::none);
-};

src/jobs/neochatchangepasswordjob.cpp

@@ -5,7 +5,7 @@
 
 using namespace Quotient;
 
-NeochatChangePasswordJob::NeochatChangePasswordJob(const QString &newPassword, bool logoutDevices, const std::optional<QJsonObject> &auth)
+NeochatChangePasswordJob::NeochatChangePasswordJob(const QString &newPassword, bool logoutDevices, const Omittable<QJsonObject> &auth)
     : BaseJob(HttpVerb::Post, QStringLiteral("ChangePasswordJob"), "/_matrix/client/r0/account/password")
 {
     QJsonObject _data;

src/jobs/neochatchangepasswordjob.h

@@ -4,9 +4,10 @@
 #pragma once
 
 #include <Quotient/jobs/basejob.h>
+#include <Quotient/omittable.h>
 
 class NeochatChangePasswordJob : public Quotient::BaseJob
 {
 public:
-    explicit NeochatChangePasswordJob(const QString &newPassword, bool logoutDevices, const std::optional<QJsonObject> &auth = std::nullopt);
+    explicit NeochatChangePasswordJob(const QString &newPassword, bool logoutDevices, const Quotient::Omittable<QJsonObject> &auth = Quotient::none);
 };

src/jobs/neochatdeactivateaccountjob.cpp

@@ -5,7 +5,7 @@
 
 using namespace Quotient;
 
-NeoChatDeactivateAccountJob::NeoChatDeactivateAccountJob(const std::optional<QJsonObject> &auth)
+NeoChatDeactivateAccountJob::NeoChatDeactivateAccountJob(const Omittable<QJsonObject> &auth)
     : BaseJob(HttpVerb::Post, QStringLiteral("DisableDeviceJob"), "_matrix/client/v3/account/deactivate")
 {
     QJsonObject data;

src/jobs/neochatdeactivateaccountjob.h

@@ -4,9 +4,10 @@
 #pragma once
 
 #include <Quotient/jobs/basejob.h>
+#include <Quotient/omittable.h>
 
 class NeoChatDeactivateAccountJob : public Quotient::BaseJob
 {
 public:
-    explicit NeoChatDeactivateAccountJob(const std::optional<QJsonObject> &auth = std::nullopt);
+    explicit NeoChatDeactivateAccountJob(const Quotient::Omittable<QJsonObject> &auth = Quotient::none);
 };

src/jobs/neochatdeletedevicejob.cpp

@@ -5,7 +5,7 @@
 
 using namespace Quotient;
 
-NeochatDeleteDeviceJob::NeochatDeleteDeviceJob(const QString &deviceId, const std::optional<QJsonObject> &auth)
+NeochatDeleteDeviceJob::NeochatDeleteDeviceJob(const QString &deviceId, const Omittable<QJsonObject> &auth)
     : BaseJob(HttpVerb::Delete, QStringLiteral("DeleteDeviceJob"), QStringLiteral("/_matrix/client/r0/devices/%1").arg(deviceId).toLatin1())
 {
     QJsonObject _data;

src/jobs/neochatdeletedevicejob.h

@@ -4,9 +4,10 @@
 #pragma once
 
 #include <Quotient/jobs/basejob.h>
+#include <Quotient/omittable.h>
 
 class NeochatDeleteDeviceJob : public Quotient::BaseJob
 {
 public:
-    explicit NeochatDeleteDeviceJob(const QString &deviceId, const std::optional<QJsonObject> &auth = std::nullopt);
+    explicit NeochatDeleteDeviceJob(const QString &deviceId, const Quotient::Omittable<QJsonObject> &auth = Quotient::none);
 };

src/linkpreviewer.cpp

@@ -89,23 +89,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))) {
+        if (!link.contains(QStringLiteral("matrix.to"))) {
-            links += QUrl(link);
+            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;
 
 /**
@@ -66,19 +71,19 @@ 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);
+    static bool hasPreviewableLinks(const Quotient::RoomMessageEvent *event);
 
     /**
-     * @brief Return previewable links from the given string.
+     * @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 QList<QUrl> linkPreviews(QString string);
+    static QUrl linkPreview(const Quotient::RoomMessageEvent *event);
 
 private:
     bool m_loaded;

src/login.cpp

@@ -5,7 +5,6 @@
 
 #include <Quotient/accountregistry.h>
 #include <Quotient/qt_connection_util.h>
-#include <Quotient/settings.h>
 
 #include "controller.h"
 
@@ -73,7 +72,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();

src/main.cpp

@@ -5,7 +5,6 @@
 #include <QIcon>
 #include <QNetworkDiskCache>
 #include <QNetworkProxyFactory>
-#include <QNetworkReply>
 #include <QObject>
 #include <QQmlApplicationEngine>
 #include <QQmlContext>
@@ -13,7 +12,6 @@
 #include <QQuickStyle>
 #include <QQuickWindow>
 #include <QtQml/QQmlExtensionPlugin>
-#include <Quotient/connection.h>
 
 #ifdef Q_OS_ANDROID
 #include <QGuiApplication>
@@ -48,10 +46,11 @@
 #include "colorschemer.h"
 #include "controller.h"
 #include "logger.h"
+#include "matriximageprovider.h"
 #include "neochatconfig.h"
 #include "roommanager.h"
-#include "sharehandler.h"
 #include "windowcontroller.h"
+#include "sharehandler.h"
 
 #ifdef HAVE_RUNNER
 #include "runner.h"
@@ -175,7 +174,6 @@ int main(int argc, char *argv[])
     initLogging();
 
     Connection::setEncryptionDefault(true);
-    Connection::setDirectChatEncryptionDefault(true);
 
 #ifdef NEOCHAT_FLATPAK
     // Copy over the included FontConfig configuration to the
@@ -238,7 +236,6 @@ int main(int argc, char *argv[])
     Q_IMPORT_QML_PLUGIN(org_kde_neochat_timelinePlugin)
     Q_IMPORT_QML_PLUGIN(org_kde_neochat_devtoolsPlugin)
     Q_IMPORT_QML_PLUGIN(org_kde_neochat_loginPlugin)
-    Q_IMPORT_QML_PLUGIN(org_kde_neochat_chatbarPlugin)
 
     qml_register_types_org_kde_neochat();
 
@@ -288,6 +285,7 @@ int main(int argc, char *argv[])
         ShareHandler::instance().setText(parser.value(shareOption));
     }
 
+    engine.addImageProvider(QLatin1String("mxc"), MatrixImageProvider::create(&engine, &engine));
     engine.addImageProvider(QLatin1String("blurhash"), new BlurhashImageProvider);
 
     engine.loadFromModule("org.kde.neochat", "Main");

src/models/accountemoticonmodel.cpp

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

src/models/actionsmodel.cpp

@@ -9,7 +9,6 @@
 #include "roommanager.h"
 #include <Quotient/events/roommemberevent.h>
 #include <Quotient/events/roompowerlevelsevent.h>
-#include <Quotient/user.h>
 
 #include <KLocalizedString>
 
@@ -203,11 +202,11 @@ QList<ActionsModel::Action> actions{
                 Q_EMIT room->showMessage(NeoChatRoom::Info, i18nc("<user> is banned from this room.", "%1 is banned from this room.", text));
                 return QString();
             }
-            if (room->localMember().id() == text) {
+            if (room->localUser()->id() == text) {
                 Q_EMIT room->showMessage(NeoChatRoom::Positive, i18n("You are already in this room."));
                 return QString();
             }
-            if (room->members().contains(room->member(text))) {
+            if (room->users().contains(room->user(text))) {
                 Q_EMIT room->showMessage(NeoChatRoom::Info, i18nc("<user> is already in this room.", "%1 is already in this room.", text));
                 return QString();
             }
@@ -360,7 +359,7 @@ QList<ActionsModel::Action> actions{
                 Q_EMIT room->showMessage(NeoChatRoom::Info, i18nc("<username> is already ignored.", "%1 is already ignored.", text));
                 return QString();
             }
-            room->connection()->addToIgnoredUsers(text);
+            room->connection()->addToIgnoredUsers(room->connection()->user(text));
             Q_EMIT room->showMessage(NeoChatRoom::Positive, i18nc("<username> is now ignored", "%1 is now ignored.", text));
             return QString();
         },
@@ -383,7 +382,7 @@ QList<ActionsModel::Action> actions{
                 Q_EMIT room->showMessage(NeoChatRoom::Info, i18nc("<username> is not ignored.", "%1 is not ignored.", text));
                 return QString();
             }
-            room->connection()->removeFromIgnoredUsers(text);
+            room->connection()->removeFromIgnoredUsers(room->connection()->user(text));
             Q_EMIT room->showMessage(NeoChatRoom::Positive, i18nc("<username> is no longer ignored.", "%1 is no longer ignored.", text));
             return QString();
         },
@@ -432,11 +431,11 @@ QList<ActionsModel::Action> actions{
             if (!plEvent) {
                 return QString();
             }
-            if (plEvent->ban() > plEvent->powerLevelForUser(room->localMember().id())) {
+            if (plEvent->ban() > plEvent->powerLevelForUser(room->localUser()->id())) {
                 Q_EMIT room->showMessage(NeoChatRoom::Error, i18n("You are not allowed to ban users from this room."));
                 return QString();
             }
-            if (plEvent->powerLevelForUser(room->localMember().id()) <= plEvent->powerLevelForUser(parts[0])) {
+            if (plEvent->powerLevelForUser(room->localUser()->id()) <= plEvent->powerLevelForUser(parts[0])) {
                 Q_EMIT room->showMessage(
                     NeoChatRoom::Error,
                     i18nc("You are not allowed to ban <username> from this room.", "You are not allowed to ban %1 from this room.", parts[0]));
@@ -465,7 +464,7 @@ QList<ActionsModel::Action> actions{
             if (!plEvent) {
                 return QString();
             }
-            if (plEvent->ban() > plEvent->powerLevelForUser(room->localMember().id())) {
+            if (plEvent->ban() > plEvent->powerLevelForUser(room->localUser()->id())) {
                 Q_EMIT room->showMessage(NeoChatRoom::Error, i18n("You are not allowed to unban users from this room."));
                 return QString();
             }
@@ -496,7 +495,7 @@ QList<ActionsModel::Action> actions{
                                          i18nc("'<text>' does not look like a matrix id.", "'%1' does not look like a matrix id.", parts[0]));
                 return QString();
             }
-            if (parts[0] == room->localMember().id()) {
+            if (parts[0] == room->localUser()->id()) {
                 Q_EMIT room->showMessage(NeoChatRoom::Error, i18n("You cannot kick yourself from the room."));
                 return QString();
             }
@@ -509,11 +508,11 @@ QList<ActionsModel::Action> actions{
                 return QString();
             }
             auto kick = plEvent->kick();
-            if (plEvent->powerLevelForUser(room->localMember().id()) < kick) {
+            if (plEvent->powerLevelForUser(room->localUser()->id()) < kick) {
                 Q_EMIT room->showMessage(NeoChatRoom::Error, i18n("You are not allowed to kick users from this room."));
                 return QString();
             }
-            if (plEvent->powerLevelForUser(room->localMember().id()) <= plEvent->powerLevelForUser(parts[0])) {
+            if (plEvent->powerLevelForUser(room->localUser()->id()) <= plEvent->powerLevelForUser(parts[0])) {
                 Q_EMIT room->showMessage(
                     NeoChatRoom::Error,
                     i18nc("You are not allowed to kick <username> from this room", "You are not allowed to kick %1 from this room.", parts[0]));

src/models/customemojimodel.cpp

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

src/models/devicesmodel.cpp

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