ReactionModel doesn't need to be registered as a QML type

This isn't used or instiated by QML directly, and seems to be a leftover from long ago. This also stops Qt from complaining on startup.

.craft.ini

@@ -2,6 +2,9 @@
 ; SPDX-License-Identifier: CC0-1.0
 
 [BlueprintSettings]
-kde/frameworks/extra-cmake-modules.version=master
 kde/unreleased/kirigami-addons.version=master
+kde/frameworks.version=master
+kde/libs.version=master
+kde/plasma.version=master
+kde/unreleased.version=master
 libs/qt.qtMajorVersion=6

.gitlab-ci.yml

@@ -11,5 +11,3 @@ include:
       - /gitlab-templates/freebsd-qt6.yml
       - /gitlab-templates/flatpak.yml
       - /gitlab-templates/craft-android-qt6-apks.yml
-      - /gitlab-templates/craft-appimage-qt6.yml
-      - /gitlab-templates/craft-windows-x86-64-qt6.yml

CMakeLists.txt

@@ -9,7 +9,7 @@ cmake_minimum_required(VERSION 3.16)
 # KDE Applications version, managed by release script.
 set(RELEASE_SERVICE_VERSION_MAJOR "24")
 set(RELEASE_SERVICE_VERSION_MINOR "01")
-set(RELEASE_SERVICE_VERSION_MICRO "95")
+set(RELEASE_SERVICE_VERSION_MICRO "85")
 set(RELEASE_SERVICE_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE_VERSION_MINOR}.${RELEASE_SERVICE_VERSION_MICRO}")
 
 project(NeoChat VERSION ${RELEASE_SERVICE_VERSION})

autotests/CMakeLists.txt

@@ -76,9 +76,3 @@ ecm_add_test(
     LINK_LIBRARIES neochat Qt::Test
     TEST_NAME reactionmodeltest
 )
-
-ecm_add_test(
-    linkpreviewertest.cpp
-    LINK_LIBRARIES neochat Qt::Test
-    TEST_NAME linkpreviewertest
-)

autotests/data/test-invalidmatrixtolink-event.json

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

autotests/data/test-invalidmxclink-event.json

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

autotests/data/test-invalidnospacelink-event.json

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

autotests/data/test-linkpreviewerintial-sync.json

@@ -1,24 +0,0 @@
-{
-  "timeline": {
-    "events": [
-      {
-        "content": {
-            "body": "https://kde.org",
-            "format": "org.matrix.custom.html",
-            "formatted_body": "https://kde.org",
-            "msgtype": "m.text"
-        },
-        "origin_server_ts": 1704648567967,
-        "sender": "@example:example.org",
-        "type": "m.room.message",
-        "unsigned": {
-            "age": 112
-        },
-        "event_id": "$validlink:example.org",
-        "room_id": "!test:example.org"
-      }
-    ],
-    "limited": true,
-    "prev_batch": "t34-23535_0_0"
-  }
-}

autotests/data/test-linkpreviewerreplace-sync.json

@@ -1,35 +0,0 @@
-{
-  "timeline": {
-    "events": [
-      {
-        "content": {
-            "body": "* ",
-            "format": "org.matrix.custom.html",
-            "formatted_body": "no link",
-            "m.new_content": {
-                "body": "",
-                "format": "org.matrix.custom.html",
-                "formatted_body": "no link",
-                "msgtype": "m.text"
-            },
-            "m.relates_to": {
-                "event_id": "$validlink:example.org",
-                "rel_type": "m.replace"
-            },
-            "msgtype": "m.text",
-            "type": "m.room.message"
-        },
-        "origin_server_ts": 1704648614969,
-        "sender": "@example:example.org",
-        "type": "m.room.message",
-        "unsigned": {
-            "age": 65
-        },
-        "event_id": "$nolink:example.org",
-        "room_id": "!test:example.org"
-      }
-    ],
-    "limited": true,
-    "prev_batch": "t34-23535_0_0"
-  }
-}

autotests/data/test-multiplelink-event.json

@@ -1,14 +0,0 @@
-{
-    "content": {
-        "body": "www.example.org 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-validplainlink-event.json

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

autotests/data/test-validplainwwwlink-event.json

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

autotests/data/test-validrichlink-event.json

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

autotests/eventhandlertest.cpp

@@ -65,6 +65,8 @@ private Q_SLOTS:
     void nullSubtitle();
     void mediaInfo();
     void nullMediaInfo();
+    void linkPreviewer();
+    void nullLinkPreviewer();
     void hasReply();
     void nullHasReply();
     void replyId();
@@ -397,6 +399,28 @@ void EventHandlerTest::nullMediaInfo()
     QCOMPARE(noEventHandler.getMediaInfo(), QVariantMap());
 }
 
+void EventHandlerTest::linkPreviewer()
+{
+    auto event = room->messageEvents().at(2).get();
+    eventHandler.setEvent(event);
+
+    QCOMPARE(eventHandler.getLinkPreviewer()->url(), QUrl("https://kde.org"_ls));
+
+    event = room->messageEvents().at(0).get();
+    eventHandler.setEvent(event);
+
+    QCOMPARE(eventHandler.getLinkPreviewer(), nullptr);
+}
+
+void EventHandlerTest::nullLinkPreviewer()
+{
+    QTest::ignoreMessage(QtWarningMsg, "getLinkPreviewer called with m_room set to nullptr.");
+    QCOMPARE(emptyHandler.getLinkPreviewer(), nullptr);
+
+    QTest::ignoreMessage(QtWarningMsg, "getLinkPreviewer called with m_event set to nullptr.");
+    QCOMPARE(noEventHandler.getLinkPreviewer(), nullptr);
+}
+
 void EventHandlerTest::hasReply()
 {
     auto event = room->messageEvents().at(5).get();

autotests/linkpreviewertest.cpp

@@ -1,104 +0,0 @@
-// SPDX-FileCopyrightText: 2023 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 <QObject>
-#include <QTest>
-
-#include "linkpreviewer.h"
-
-#include <Quotient/events/roommessageevent.h>
-#include <Quotient/quotient_common.h>
-#include <Quotient/syncdata.h>
-
-#include "utils.h"
-
-#include "testutils.h"
-
-using namespace Quotient;
-
-class LinkPreviewerTest : public QObject
-{
-    Q_OBJECT
-
-private:
-    Connection *connection = nullptr;
-    TestUtils::TestRoom *room = nullptr;
-
-private Q_SLOTS:
-    void initTestCase();
-
-    void linkPreviewsMatch_data();
-    void linkPreviewsMatch();
-
-    void linkPreviewsReject_data();
-    void linkPreviewsReject();
-
-    void editedLink();
-};
-
-void LinkPreviewerTest::initTestCase()
-{
-    connection = Connection::makeMockConnection(QStringLiteral("@bob:example.org"));
-    room = new TestUtils::TestRoom(connection, QStringLiteral("!test:example.org"));
-}
-
-void LinkPreviewerTest::linkPreviewsMatch_data()
-{
-    QTest::addColumn<QString>("eventSource");
-    QTest::addColumn<QUrl>("testOutputLink");
-
-    QTest::newRow("plainHttps") << QStringLiteral("test-validplainlink-event.json") << QUrl("https://kde.org"_ls);
-    QTest::newRow("richHttps") << QStringLiteral("test-validrichlink-event.json") << QUrl("https://kde.org"_ls);
-    QTest::newRow("plainWww") << QStringLiteral("test-validplainwwwlink-event.json") << QUrl("www.example.org"_ls);
-    QTest::newRow("multipleHttps") << QStringLiteral("test-multiplelink-event.json") << QUrl("www.example.org"_ls);
-}
-
-void LinkPreviewerTest::linkPreviewsMatch()
-{
-    QFETCH(QString, eventSource);
-    QFETCH(QUrl, testOutputLink);
-
-    auto event = TestUtils::loadEventFromFile<RoomMessageEvent>(eventSource);
-    auto linkPreviewer = LinkPreviewer(room, event.get());
-
-    QCOMPARE(linkPreviewer.empty(), false);
-    QCOMPARE(linkPreviewer.url(), testOutputLink);
-}
-
-void LinkPreviewerTest::linkPreviewsReject_data()
-{
-    QTest::addColumn<QString>("eventSource");
-
-    QTest::newRow("mxc") << QStringLiteral("test-invalidmxclink-event.json");
-    QTest::newRow("matrixTo") << QStringLiteral("test-invalidmatrixtolink-event.json");
-    QTest::newRow("noSpace") << QStringLiteral("test-invalidnospacelink-event.json");
-}
-
-void LinkPreviewerTest::linkPreviewsReject()
-{
-    QFETCH(QString, eventSource);
-
-    auto event = TestUtils::loadEventFromFile<RoomMessageEvent>(eventSource);
-    auto linkPreviewer = LinkPreviewer(room, event.get());
-
-    QCOMPARE(linkPreviewer.empty(), true);
-    QCOMPARE(linkPreviewer.url(), QUrl());
-}
-
-void LinkPreviewerTest::editedLink()
-{
-    room->syncNewEvents(QStringLiteral("test-linkpreviewerintial-sync.json"));
-    auto event = eventCast<const RoomMessageEvent>(room->messageEvents().at(0).get());
-    auto linkPreviewer = LinkPreviewer(room, event);
-
-    QCOMPARE(linkPreviewer.empty(), false);
-    QCOMPARE(linkPreviewer.url(), QUrl("https://kde.org"_ls));
-
-    room->syncNewEvents(QStringLiteral("test-linkpreviewerreplace-sync.json"));
-
-    QCOMPARE(linkPreviewer.empty(), true);
-    QCOMPARE(linkPreviewer.url(), QUrl());
-}
-
-QTEST_MAIN(LinkPreviewerTest)
-#include "linkpreviewertest.moc"

autotests/testutils.h

@@ -1,7 +1,6 @@
 // SPDX-FileCopyrightText: 2023 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 <Quotient/events/event.h>
 #include <Quotient/syncdata.h>
 
 #include "neochatroom.h"
@@ -39,17 +38,4 @@ public:
         }
     }
 };
-
-template<Quotient::EventClass EventT>
-inline Quotient::event_ptr_tt<EventT> loadEventFromFile(const QString &eventFileName)
-{
-    if (!eventFileName.isEmpty()) {
-        QFile testEventFile;
-        testEventFile.setFileName(QLatin1String(DATA_DIR) + u'/' + eventFileName);
-        testEventFile.open(QIODevice::ReadOnly);
-        auto testSyncJson = QJsonDocument::fromJson(testEventFile.readAll()).object();
-        return Quotient::loadEvent<EventT>(testSyncJson);
-    }
-    return nullptr;
-}
 }

autotests/texthandlertest.cpp

@@ -64,6 +64,11 @@ private Q_SLOTS:
     void receiveRichEdited();
     void receiveLineSeparator();
     void receiveRichCodeUrl();
+
+    void linkPreviewsMatch_data();
+    void linkPreviewsMatch();
+    void linkPreviewsReject_data();
+    void linkPreviewsReject();
 };
 
 void TextHandlerTest::initTestCase()
@@ -518,6 +523,53 @@ void TextHandlerTest::receiveLineSeparator()
     QCOMPARE(textHandler.handleRecievePlainText(Qt::PlainText, true), QStringLiteral("foo bar"));
 }
 
+void TextHandlerTest::linkPreviewsMatch_data()
+{
+    QTest::addColumn<QString>("testInputString");
+    QTest::addColumn<QList<QUrl>>("testOutputLinks");
+
+    QTest::newRow("plainHttps") << QStringLiteral("https://kde.org") << QList<QUrl>({QUrl("https://kde.org"_ls)});
+    QTest::newRow("richHttps") << QStringLiteral("<a href=\"https://kde.org\">Rich Link</a>") << QList<QUrl>({QUrl("https://kde.org"_ls)});
+    QTest::newRow("plainWww") << QStringLiteral("www.example.org") << QList<QUrl>({QUrl("www.example.org"_ls)});
+    QTest::newRow("multipleHttps") << QStringLiteral("https://kde.org www.example.org")
+                                   << QList<QUrl>({
+                                          QUrl("https://kde.org"_ls),
+                                          QUrl("www.example.org"_ls),
+                                      });
+}
+
+void TextHandlerTest::linkPreviewsMatch()
+{
+    QFETCH(QString, testInputString);
+    QFETCH(QList<QUrl>, testOutputLinks);
+
+    TextHandler testTextHandler;
+    testTextHandler.setData(testInputString);
+
+    QCOMPARE(testTextHandler.getLinkPreviews(), testOutputLinks);
+}
+
+void TextHandlerTest::linkPreviewsReject_data()
+{
+    QTest::addColumn<QString>("testInputString");
+    QTest::addColumn<QList<QUrl>>("testOutputLinks");
+
+    QTest::newRow("mxc") << QStringLiteral("mxc://example.org/SEsfnsuifSDFSSEF") << QList<QUrl>();
+    QTest::newRow("matrixTo") << QStringLiteral("https://matrix.to/#/@alice:example.org") << QList<QUrl>();
+    QTest::newRow("noSpace") << QStringLiteral("testhttps://kde.org") << QList<QUrl>();
+}
+
+void TextHandlerTest::linkPreviewsReject()
+{
+    QFETCH(QString, testInputString);
+    QFETCH(QList<QUrl>, testOutputLinks);
+
+    TextHandler testTextHandler;
+    testTextHandler.setData(testInputString);
+
+    QCOMPARE(testTextHandler.getLinkPreviews(), testOutputLinks);
+}
+
 void TextHandlerTest::receiveRichCodeUrl()
 {
     auto input = QStringLiteral("<code>https://kde.org</code>");

src/controller.cpp

@@ -7,7 +7,10 @@
 #include <qt6keychain/keychain.h>
 
 #include <KLocalizedString>
+#include <KWindowConfig>
 
+#include <QFile>
+#include <QFileInfo>
 #include <QGuiApplication>
 #include <QNetworkProxy>
 #include <QQuickTextDocument>
@@ -25,11 +28,13 @@
 #include <Quotient/eventstats.h>
 #include <Quotient/jobs/downloadfilejob.h>
 #include <Quotient/qt_connection_util.h>
+#include <Quotient/user.h>
 
 #include "neochatconfig.h"
 #include "neochatroom.h"
 #include "notificationsmanager.h"
 #include "roommanager.h"
+#include "windowcontroller.h"
 
 #if defined(Q_OS_WIN) || defined(Q_OS_MAC)
 #include "trayicon.h"
@@ -72,7 +77,8 @@ Controller::Controller(QObject *parent)
     });
 
 #ifndef Q_OS_WINDOWS
-    const auto unixExitHandler = [](int) -> void {
+    // Setup Unix signal handlers
+    const auto unixExitHandler = [](int /*sig*/) -> void {
         QCoreApplication::quit();
     };
 
@@ -98,7 +104,7 @@ Controller::Controller(QObject *parent)
     connect(&m_accountRegistry, &AccountRegistry::accountCountChanged, this, [this]() {
         if (m_accountRegistry.size() > oldAccountCount) {
             auto connection = dynamic_cast<NeoChatConnection *>(m_accountRegistry.accounts()[m_accountRegistry.size() - 1]);
-            connect(connection, &NeoChatConnection::syncDone, this, [connection]() {
+            connect(connection, &NeoChatConnection::syncDone, this, [this, connection]() {
                 NotificationsManager::instance().handleNotifications(connection);
             });
             connectSingleShot(connection, &NeoChatConnection::syncDone, this, [this, connection] {
@@ -138,7 +144,7 @@ void Controller::addConnection(NeoChatConnection *c)
 
     c->setLazyLoading(true);
 
-    connect(c, &NeoChatConnection::syncDone, this, [c] {
+    connect(c, &NeoChatConnection::syncDone, this, [this, c] {
         c->sync(30000);
         c->saveState();
     });
@@ -146,6 +152,12 @@ void Controller::addConnection(NeoChatConnection *c)
         dropConnection(c);
     });
 
+    connect(c, &NeoChatConnection::requestFailed, this, [this](BaseJob *job) {
+        if (job->error() == BaseJob::UserConsentRequired) {
+            Q_EMIT userConsentRequired(job->errorUrl());
+        }
+    });
+
     c->sync();
 
     Q_EMIT connectionAdded(c);
@@ -162,13 +174,18 @@ void Controller::dropConnection(NeoChatConnection *c)
 void Controller::invokeLogin()
 {
     const auto accounts = SettingsGroup("Accounts"_ls).childGroups();
+    QString id = NeoChatConfig::self()->activeConnection();
     for (const auto &accountId : accounts) {
         AccountSettings account{accountId};
         m_accountsLoading += accountId;
         Q_EMIT accountsLoadingChanged();
+        if (id.isEmpty()) {
+            // handle case where the account config is empty
+            id = accountId;
+        }
         if (!account.homeserver().isEmpty()) {
             auto accessTokenLoadingJob = loadAccessTokenFromKeyChain(account);
-            connect(accessTokenLoadingJob, &QKeychain::Job::finished, this, [accountId, this, accessTokenLoadingJob](QKeychain::Job *) {
+            connect(accessTokenLoadingJob, &QKeychain::Job::finished, this, [accountId, id, this, accessTokenLoadingJob](QKeychain::Job *) {
                 AccountSettings account{accountId};
                 QString accessToken;
                 if (accessTokenLoadingJob->error() == QKeychain::Error::NoError) {
@@ -178,11 +195,28 @@ void Controller::invokeLogin()
                 }
 
                 auto connection = new NeoChatConnection(account.homeserver());
-                connect(connection, &NeoChatConnection::connected, this, [this, connection] {
+                connect(connection, &NeoChatConnection::connected, this, [this, connection, id] {
                     connection->loadState();
                     addConnection(connection);
                     m_accountsLoading.removeAll(connection->userId());
                     Q_EMIT accountsLoadingChanged();
+                    if (connection->userId() == id) {
+                        setActiveConnection(connection);
+                    }
+                });
+                connect(connection, &NeoChatConnection::loginError, this, [this, connection](const QString &error, const QString &) {
+                    if (error == "Unrecognised access token"_ls) {
+                        Q_EMIT errorOccured(i18n("Login Failed: Access Token invalid or revoked"), {});
+                        connection->logout(false);
+                    } else if (error == "Connection closed"_ls) {
+                        Q_EMIT errorOccured(i18n("Login Failed: %1", error), {});
+                        // Failed due to network connection issue. This might happen when the homeserver is
+                        // temporary down, or the user trying to re-launch NeoChat in a network that cannot
+                        // connect to the homeserver. In this case, we don't want to do logout().
+                    } else {
+                        Q_EMIT errorOccured(i18n("Login Failed: %1", error), {});
+                        connection->logout(true);
+                    }
                 });
                 connect(connection, &NeoChatConnection::networkError, this, [this](const QString &error, const QString &, int, int) {
                     Q_EMIT errorOccured(i18n("Network Error: %1", error), {});
@@ -291,16 +325,24 @@ void Controller::setActiveConnection(NeoChatConnection *connection)
     }
     m_connection = connection;
     if (connection != nullptr) {
+        NeoChatConfig::self()->setActiveConnection(connection->userId());
         connect(connection, &NeoChatConnection::requestFailed, this, [](BaseJob *job) {
             if (dynamic_cast<DownloadFileJob *>(job) && job->jsonData()["errcode"_ls].toString() == "M_TOO_LARGE"_ls) {
                 RoomManager::instance().warning(i18n("File too large to download."), i18n("Contact your matrix server administrator for support."));
             }
         });
+    } else {
+        NeoChatConfig::self()->setActiveConnection(QString());
     }
     NeoChatConfig::self()->save();
     Q_EMIT activeConnectionChanged();
 }
 
+void Controller::saveWindowGeometry()
+{
+    WindowController::instance().saveGeometry();
+}
+
 void Controller::forceRefreshTextDocument(QQuickTextDocument *textDocument, QQuickItem *item)
 {
     // HACK: Workaround bug QTBUG 93281

src/controller.h

@@ -134,5 +134,9 @@ Q_SIGNALS:
     void connectionAdded(NeoChatConnection *connection);
     void connectionDropped(NeoChatConnection *connection);
     void activeConnectionChanged();
+    void userConsentRequired(QUrl url);
     void accountsLoadingChanged();
+
+public Q_SLOTS:
+    void saveWindowGeometry();
 };

src/eventhandler.cpp

@@ -355,7 +355,7 @@ QString EventHandler::getBody(const Quotient::RoomEvent *event, Qt::TextFormat f
                 if (e.repeatsState()) {
                     auto text = i18n("reinvited %1 to the room", subjectName);
                     if (!e.reason().isEmpty()) {
-                        text += i18nc("Optional reason for an invitation", ": %1") + (prettyPrint ? e.reason().toHtmlEscaped() : e.reason());
+                        text += i18nc("Optional reason for an invitation", ": %1") + e.reason().toHtmlEscaped();
                     }
                     return text;
                 }
@@ -379,9 +379,7 @@ QString EventHandler::getBody(const Quotient::RoomEvent *event, Qt::TextFormat f
                     if (!e.newDisplayName()) {
                         text = i18nc("their refers to a singular user", "cleared their display name");
                     } else {
-                        text = i18nc("their refers to a singular user",
-                                     "changed their display name to %1",
-                                     prettyPrint ? e.newDisplayName()->toHtmlEscaped() : *e.newDisplayName());
+                        text = i18nc("their refers to a singular user", "changed their display name to %1", e.newDisplayName()->toHtmlEscaped());
                     }
                 }
                 if (e.isAvatarUpdate()) {
@@ -417,7 +415,7 @@ QString EventHandler::getBody(const Quotient::RoomEvent *event, Qt::TextFormat f
                     if (e.reason().isEmpty()) {
                         return i18n("banned %1 from the room", subjectName);
                     } else {
-                        return i18n("banned %1 from the room: %2", subjectName, prettyPrint ? e.reason().toHtmlEscaped() : e.reason());
+                        return i18n("banned %1 from the room: %2", subjectName, e.reason().toHtmlEscaped());
                     }
                 } else {
                     return i18n("self-banned from the room");
@@ -433,8 +431,8 @@ QString EventHandler::getBody(const Quotient::RoomEvent *event, Qt::TextFormat f
         [](const RoomCanonicalAliasEvent &e) {
             return (e.alias().isEmpty()) ? i18n("cleared the room main alias") : i18n("set the room main alias to: %1", e.alias());
         },
-        [prettyPrint](const RoomNameEvent &e) {
-            return (e.name().isEmpty()) ? i18n("cleared the room name") : i18n("set the room name to: %1", prettyPrint ? e.name().toHtmlEscaped() : e.name());
+        [](const RoomNameEvent &e) {
+            return (e.name().isEmpty()) ? i18n("cleared the room name") : i18n("set the room name to: %1", e.name().toHtmlEscaped());
         },
         [prettyPrint, stripNewlines](const RoomTopicEvent &e) {
             return (e.topic().isEmpty()) ? i18n("cleared the topic")
@@ -449,15 +447,14 @@ QString EventHandler::getBody(const Quotient::RoomEvent *event, Qt::TextFormat f
         [](const EncryptionEvent &) {
             return i18n("activated End-to-End Encryption");
         },
-        [prettyPrint](const RoomCreateEvent &e) {
-            return e.isUpgrade()
-                ? i18n("upgraded the room to version %1", e.version().isEmpty() ? "1"_ls : (prettyPrint ? e.version().toHtmlEscaped() : e.version()))
-                : i18n("created the room, version %1", e.version().isEmpty() ? "1"_ls : (prettyPrint ? e.version().toHtmlEscaped() : e.version()));
+        [](const RoomCreateEvent &e) {
+            return e.isUpgrade() ? i18n("upgraded the room to version %1", e.version().isEmpty() ? "1"_ls : e.version().toHtmlEscaped())
+                                 : i18n("created the room, version %1", e.version().isEmpty() ? "1"_ls : e.version().toHtmlEscaped());
         },
         [](const RoomPowerLevelsEvent &) {
             return i18nc("'power level' means permission level", "changed the power levels for this room");
         },
-        [prettyPrint](const StateEvent &e) {
+        [](const StateEvent &e) {
             if (e.matrixType() == QLatin1String("m.room.server_acl")) {
                 return i18n("changed the server access control lists for this room");
             }
@@ -474,7 +471,7 @@ QString EventHandler::getBody(const Quotient::RoomEvent *event, Qt::TextFormat f
                 return e.contentJson()["description"_ls].toString();
             }
             return e.stateKey().isEmpty() ? i18n("updated %1 state", e.matrixType())
-                                          : i18n("updated %1 state for %2", e.matrixType(), prettyPrint ? e.stateKey().toHtmlEscaped() : e.stateKey());
+                                          : i18n("updated %1 state for %2", e.matrixType(), e.stateKey().toHtmlEscaped());
         },
         [](const PollStartEvent &e) {
             return e.question();
@@ -777,6 +774,43 @@ QVariantMap EventHandler::getMediaInfoFromFileInfo(const EventContent::FileInfo
     return mediaInfo;
 }
 
+QSharedPointer<LinkPreviewer> EventHandler::getLinkPreviewer() const
+{
+    if (m_room == nullptr) {
+        qCWarning(EventHandling) << "getLinkPreviewer called with m_room set to nullptr.";
+        return nullptr;
+    }
+    if (m_event == nullptr) {
+        qCWarning(EventHandling) << "getLinkPreviewer called with m_event set to nullptr.";
+        return nullptr;
+    }
+    if (!m_event->is<RoomMessageEvent>()) {
+        return nullptr;
+    }
+
+    QString text;
+    auto event = eventCast<const RoomMessageEvent>(m_event);
+    if (event->hasTextContent()) {
+        auto textContent = static_cast<const EventContent::TextContent *>(event->content());
+        if (textContent) {
+            text = textContent->body;
+        } else {
+            text = event->plainBody();
+        }
+    } else {
+        text = event->plainBody();
+    }
+    TextHandler textHandler;
+    textHandler.setData(text);
+
+    QList<QUrl> links = textHandler.getLinkPreviews();
+    if (links.size() > 0) {
+        return QSharedPointer<LinkPreviewer>(new LinkPreviewer(nullptr, m_room, links.size() > 0 ? links[0] : QUrl()));
+    } else {
+        return nullptr;
+    }
+}
+
 bool EventHandler::hasReply() const
 {
     if (m_event == nullptr) {

src/eventhandler.h

@@ -231,6 +231,16 @@ public:
      */
     QVariantMap getMediaInfo() const;
 
+    /**
+     * @brief Return a LinkPreviewer object for the event.
+     *
+     * A nullptr will be returned for any event that doesn't have any links so the
+     * return should be null checked and an empty LinkPreviewer provided if null.
+     *
+     * @sa LinkPreviewer
+     */
+    QSharedPointer<LinkPreviewer> getLinkPreviewer() const;
+
     /**
      * @brief Whether the event is a reply to another in the timeline.
      */

src/linkpreviewer.cpp

@@ -3,37 +3,25 @@
 
 #include "linkpreviewer.h"
 
+#include "controller.h"
+
 #include <Quotient/connection.h>
 #include <Quotient/csapi/content-repo.h>
-#include <Quotient/events/roommessageevent.h>
 
 #include "neochatconfig.h"
 #include "neochatroom.h"
-#include "utils.h"
 
 using namespace Quotient;
 
-LinkPreviewer::LinkPreviewer(const NeoChatRoom *room, const Quotient::RoomMessageEvent *event)
-    : QObject(nullptr)
+LinkPreviewer::LinkPreviewer(QObject *parent, const NeoChatRoom *room, const QUrl &url)
+    : QObject(parent)
     , m_currentRoom(room)
-    , m_event(event)
     , m_loaded(false)
-    , m_url(linkPreview(event))
+    , m_url(url)
 {
-    connect(this, &LinkPreviewer::urlChanged, this, &LinkPreviewer::emptyChanged);
-
-    if (m_event != nullptr && m_currentRoom != nullptr) {
-        loadUrlPreview();
+    loadUrlPreview();
+    if (m_currentRoom) {
         connect(m_currentRoom, &NeoChatRoom::urlPreviewEnabledChanged, this, &LinkPreviewer::loadUrlPreview);
-        // Make sure that we react to edits
-        connect(m_currentRoom, &NeoChatRoom::replacedEvent, this, [this](const Quotient::RoomEvent *newEvent) {
-            if (m_event->id() == newEvent->id()) {
-                m_event = eventCast<const Quotient::RoomMessageEvent>(newEvent);
-                m_url = linkPreview(m_event);
-                Q_EMIT urlChanged();
-                loadUrlPreview();
-            }
-        });
     }
     connect(NeoChatConfig::self(), &NeoChatConfig::ShowLinkPreviewChanged, this, &LinkPreviewer::loadUrlPreview);
 }
@@ -63,6 +51,15 @@ QUrl LinkPreviewer::url() const
     return m_url;
 }
 
+void LinkPreviewer::setUrl(QUrl url)
+{
+    if (url != m_url) {
+        m_url = url;
+        urlChanged();
+        loadUrlPreview();
+    }
+}
+
 void LinkPreviewer::loadUrlPreview()
 {
     if (!m_currentRoom || !NeoChatConfig::showLinkPreview() || !m_currentRoom->urlPreviewEnabled()) {
@@ -101,38 +98,4 @@ bool LinkPreviewer::empty() const
     return m_url.isEmpty();
 }
 
-QUrl LinkPreviewer::linkPreview(const Quotient::RoomMessageEvent *event)
-{
-    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);
-    while (linksMatch.hasNext()) {
-        auto link = linksMatch.next().captured();
-        if (!link.contains(QStringLiteral("matrix.to"))) {
-            return QUrl(link);
-        }
-    }
-    return {};
-}
-
-bool LinkPreviewer::hasPreviewableLinks(const Quotient::RoomMessageEvent *event)
-{
-    return !linkPreview(event).isEmpty();
-}
-
 #include "moc_linkpreviewer.cpp"

src/linkpreviewer.h

@@ -7,11 +7,6 @@
 #include <QQmlEngine>
 #include <QUrl>
 
-namespace Quotient
-{
-class RoomMessageEvent;
-}
-
 class NeoChatRoom;
 
 /**
@@ -30,7 +25,7 @@ class LinkPreviewer : public QObject
     /**
      * @brief The URL to get the preview for.
      */
-    Q_PROPERTY(QUrl url READ url NOTIFY urlChanged)
+    Q_PROPERTY(QUrl url READ url WRITE setUrl NOTIFY urlChanged)
 
     /**
      * @brief Whether the preview information has been loaded.
@@ -60,25 +55,18 @@ class LinkPreviewer : public QObject
     Q_PROPERTY(bool empty READ empty NOTIFY emptyChanged)
 
 public:
-    explicit LinkPreviewer(const NeoChatRoom *room = nullptr, const Quotient::RoomMessageEvent *event = nullptr);
+    explicit LinkPreviewer(QObject *parent = nullptr, const NeoChatRoom *room = nullptr, const QUrl &url = {});
 
     [[nodiscard]] QUrl url() const;
+    void setUrl(QUrl);
     [[nodiscard]] bool loaded() const;
     [[nodiscard]] QString title() const;
     [[nodiscard]] QString description() const;
     [[nodiscard]] QUrl imageSource() const;
     [[nodiscard]] bool empty() const;
 
-    /**
-     * @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 Quotient::RoomMessageEvent *event);
-
 private:
-    const NeoChatRoom *m_currentRoom;
-    const Quotient::RoomMessageEvent *m_event;
+    const NeoChatRoom *m_currentRoom = nullptr;
 
     bool m_loaded;
     QString m_title = QString();
@@ -88,14 +76,6 @@ private:
 
     void loadUrlPreview();
 
-    /**
-     * @brief Return the link to be previewed from the given event.
-     *
-     * This function is designed to give only links that should be previewed so
-     * http, https or something starting with www. The first valid link is returned.
-     */
-    static QUrl linkPreview(const Quotient::RoomMessageEvent *event);
-
 Q_SIGNALS:
     void loadedChanged();
     void titleChanged();

src/main.cpp

@@ -130,7 +130,7 @@ int main(int argc, char *argv[])
                      QStringLiteral(NEOCHAT_VERSION_STRING),
                      i18n("Matrix client"),
                      KAboutLicense::GPL_V3,
-                     i18n("© 2018-2020 Black Hat, 2020-2024 KDE Community"));
+                     i18n("© 2018-2020 Black Hat, 2020-2023 KDE Community"));
     about.addAuthor(i18n("Carl Schwan"),
                     i18n("Maintainer"),
                     QStringLiteral("carl@carlschwan.eu"),

src/matriximageprovider.cpp

@@ -12,6 +12,7 @@
 
 #include <KLocalizedString>
 
+#include "controller.h"
 #include "neochatconnection.h"
 
 #include <Quotient/connection.h>

src/models/actionsmodel.cpp

@@ -4,6 +4,7 @@
 #include "actionsmodel.h"
 
 #include "chatbarcache.h"
+#include "controller.h"
 #include "neochatroom.h"
 #include "roommanager.h"
 #include <Quotient/events/roommemberevent.h>

src/models/customemojimodel.cpp

@@ -6,8 +6,10 @@
 #include <QImage>
 #include <QMimeDatabase>
 
+#include "controller.h"
 #include "emojimodel.h"
 
+#include <Quotient/connection.h>
 #include <Quotient/csapi/account-data.h>
 #include <Quotient/csapi/content-repo.h>
 

src/models/customemojimodel.h

@@ -6,8 +6,9 @@
 #include <QAbstractListModel>
 #include <QQmlEngine>
 #include <QRegularExpression>
+#include <memory>
 
-#include "neochatconnection.h"
+class NeoChatConnection;
 
 struct CustomEmoji {
     QString name; // with :semicolons:

src/models/devicesmodel.cpp

@@ -3,6 +3,7 @@
 
 #include "devicesmodel.h"
 
+#include "controller.h"
 #include "jobs/neochatdeletedevicejob.h"
 
 #include <QDateTime>

src/models/messageeventmodel.cpp

@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
 #include "messageeventmodel.h"
-#include "linkpreviewer.h"
 #include "messageeventmodel_logging.h"
 
 #include "neochatconfig.h"
@@ -23,7 +22,6 @@
 #include "eventhandler.h"
 #include "events/pollevent.h"
 #include "models/reactionmodel.h"
-#include "texthandler.h"
 
 using namespace Quotient;
 
@@ -239,10 +237,6 @@ void MessageEventModel::setRoom(NeoChatRoom *room)
         });
         connect(m_currentRoom, &Room::replacedEvent, this, [this](const RoomEvent *newEvent) {
             refreshLastUserEvents(refreshEvent(newEvent->id()) - timelineBaseIndex());
-            const RoomMessageEvent *message = eventCast<const RoomMessageEvent>(newEvent);
-            if (message != nullptr) {
-                createEventObjects(message);
-            }
         });
         connect(m_currentRoom, &Room::updatedEvent, this, [this](const QString &eventId) {
             if (eventId.isEmpty()) { // How did we get here?
@@ -726,14 +720,14 @@ void MessageEventModel::createEventObjects(const Quotient::RoomMessageEvent *eve
 {
     auto eventId = event->id();
 
-    if (m_linkPreviewers.contains(eventId)) {
-        if (!LinkPreviewer::hasPreviewableLinks(event)) {
-            m_linkPreviewers.remove(eventId);
-        }
+    EventHandler eventHandler;
+    eventHandler.setRoom(m_currentRoom);
+    eventHandler.setEvent(event);
+
+    if (auto linkPreviewer = eventHandler.getLinkPreviewer()) {
+        m_linkPreviewers[eventId] = linkPreviewer;
     } else {
-        if (LinkPreviewer::hasPreviewableLinks(event)) {
-            m_linkPreviewers[eventId] = QSharedPointer<LinkPreviewer>(new LinkPreviewer(m_currentRoom, event));
-        }
+        m_linkPreviewers.remove(eventId);
     }
 
     // ReactionModel handles updates to add and remove reactions, we only need to

src/models/pushrulemodel.cpp

@@ -11,6 +11,7 @@
 #include <Quotient/csapi/pushrules.h>
 #include <Quotient/jobs/basejob.h>
 
+#include "controller.h"
 #include "neochatconfig.h"
 
 #include <KLazyLocalizedString>

src/models/reactionmodel.h

@@ -21,8 +21,6 @@ class User;
 class ReactionModel : public QAbstractListModel
 {
     Q_OBJECT
-    QML_ELEMENT
-    QML_UNCREATABLE("")
 
 public:
     /**

src/models/roomlistmodel.cpp

@@ -3,12 +3,15 @@
 
 #include "roomlistmodel.h"
 
+#include "controller.h"
 #include "eventhandler.h"
 #include "neochatconfig.h"
 #include "neochatroom.h"
 #include "roommanager.h"
 #include "spacehierarchycache.h"
 
+#include <Quotient/user.h>
+
 #include <QDebug>
 #if QT_VERSION < QT_VERSION_CHECK(6, 6, 0)
 #ifndef Q_OS_ANDROID
@@ -20,6 +23,7 @@
 
 #include <KLocalizedString>
 #include <QGuiApplication>
+#include <utility>
 
 using namespace Quotient;
 
@@ -345,7 +349,7 @@ QVariant RoomListModel::data(const QModelIndex &index, int role) const
         return m_categoryVisibility.value(data(index, CategoryRole).toInt(), true);
     }
     if (role == SubtitleTextRole) {
-        if (room->lastEvent() == nullptr || room->lastEventIsSpoiler()) {
+        if (room->lastEventIsSpoiler()) {
             return QString();
         }
         EventHandler eventHandler;

src/models/roomlistmodel.h

@@ -3,6 +3,8 @@
 
 #pragma once
 
+#include <Quotient/events/roomevent.h>
+
 #include <QAbstractListModel>
 #include <QQmlEngine>
 

src/models/searchmodel.cpp

@@ -136,10 +136,6 @@ QVariant SearchModel::data(const QModelIndex &index, int role) const
         return eventHandler.isHighlighted();
     case EventIdRole:
         return eventHandler.getId();
-    case IsThreadedRole:
-        return eventHandler.isThreaded();
-    case ThreadRootRole:
-        return eventHandler.threadRoot();
     }
     return DelegateType::Message;
 }
@@ -185,8 +181,6 @@ QHash<int, QByteArray> SearchModel::roleNames() const
         {MimeTypeRole, "mimeType"},
         {ShowLinkPreviewRole, "showLinkPreview"},
         {LinkPreviewRole, "linkPreview"},
-        {IsThreadedRole, "isThreaded"},
-        {ThreadRootRole, "threadRoot"},
     };
 }
 

src/models/searchmodel.h

@@ -85,8 +85,6 @@ public:
         MimeTypeRole,
         ShowLinkPreviewRole,
         LinkPreviewRole,
-        IsThreadedRole,
-        ThreadRootRole,
     };
     Q_ENUM(Roles)
     explicit SearchModel(QObject *parent = nullptr);

src/models/serverlistmodel.cpp

@@ -3,6 +3,8 @@
 
 #include "serverlistmodel.h"
 
+#include "controller.h"
+
 #include <Quotient/connection.h>
 
 #include <QDebug>
@@ -11,8 +13,6 @@
 #include <KConfigGroup>
 #include <KSharedConfig>
 
-#include "neochatconnection.h"
-
 ServerListModel::ServerListModel(QObject *parent)
     : QAbstractListModel(parent)
 {

src/models/spacechildrenmodel.cpp

@@ -7,7 +7,7 @@
 #include <Quotient/jobs/basejob.h>
 #include <Quotient/room.h>
 
-#include "neochatconnection.h"
+#include "controller.h"
 
 SpaceChildrenModel::SpaceChildrenModel(QObject *parent)
     : QAbstractItemModel(parent)

src/models/spacetreeitem.cpp

@@ -3,7 +3,7 @@
 
 #include "spacetreeitem.h"
 
-#include "neochatconnection.h"
+#include "controller.h"
 
 SpaceTreeItem::SpaceTreeItem(NeoChatConnection *connection,
                              SpaceTreeItem *parent,

src/neochat.notifyrc

@@ -181,7 +181,6 @@ Name[eu]=Gonbidapen berria
 Name[fi]=Uusi kutsu
 Name[fr]=Nouvelle invitation
 Name[gl]=Novo convite
-Name[hu]=Új meghívó
 Name[ia]=Nove invitation
 Name[id]=Undangan Baru
 Name[ie]=Nov invitation
@@ -218,7 +217,6 @@ Comment[eu]=Gela baterako gonbidapen berri bat dago
 Comment[fi]=Uusi kutsu huoneeseen
 Comment[fr]=Il y a une nouvelle invitation dans un salon.
 Comment[gl]=Tes un novo convite para unha sala.
-Comment[hu]=Új meghívó érkezett egy szobába
 Comment[ia]=Il ha un nove invitation a un sala
 Comment[id]=Ada undangan baru ke sebuah ruangan
 Comment[ie]=Vu have un nov invitation a un chambre

src/neochatconfig.kcfg

@@ -11,6 +11,9 @@
     <entry name="OpenRoom" type="String">
       <label>Latest opened room</label>
     </entry>
+    <entry name="ActiveConnection" type="String">
+      <label>Latest active connection</label>
+    </entry>
     <entry name="ColorScheme" type="String">
       <label>Color scheme</label>
     </entry>

src/neochatconnection.cpp

@@ -44,11 +44,6 @@ NeoChatConnection::NeoChatConnection(QObject *parent)
     connect(this, &NeoChatConnection::networkError, this, [this]() {
         setIsOnline(false);
     });
-    connect(this, &NeoChatConnection::requestFailed, this, [this](BaseJob *job) {
-        if (job->error() == BaseJob::UserConsentRequired) {
-            Q_EMIT userConsentRequired(job->errorUrl());
-        }
-    });
 }
 
 NeoChatConnection::NeoChatConnection(const QUrl &server, QObject *parent)

src/neochatconnection.h

@@ -99,7 +99,6 @@ Q_SIGNALS:
     void labelChanged();
     void isOnlineChanged();
     void passwordStatus(NeoChatConnection::PasswordStatus status);
-    void userConsentRequired(QUrl url);
 
 private:
     bool m_isOnline = true;

src/neochatroom.cpp

@@ -4,10 +4,15 @@
 #include "neochatroom.h"
 
 #include <QFileInfo>
+#include <QGuiApplication>
+#include <QMetaObject>
+#include <QMimeDatabase>
+#include <QPalette>
+#include <QTemporaryFile>
+#include <QTextDocument>
+
 #include <QMediaMetaData>
 #include <QMediaPlayer>
-#include <QMimeDatabase>
-#include <QTemporaryFile>
 
 #include <Quotient/jobs/basejob.h>
 #include <Quotient/user.h>
@@ -30,11 +35,13 @@
 #include <Quotient/events/roommemberevent.h>
 #include <Quotient/events/roompowerlevelsevent.h>
 #include <Quotient/events/simplestateevents.h>
+#include <Quotient/events/stickerevent.h>
 #include <Quotient/jobs/downloadfilejob.h>
 #include <Quotient/qt_connection_util.h>
 
 #include "chatbarcache.h"
 #include "clipboard.h"
+#include "controller.h"
 #include "eventhandler.h"
 #include "events/joinrulesevent.h"
 #include "events/pollevent.h"
@@ -46,6 +53,8 @@
 #include "urlhelper.h"
 #include "utils.h"
 
+#include <KConfig>
+#include <KConfigGroup>
 #ifndef Q_OS_ANDROID
 #include <KIO/Job>
 #include <KIO/JobTracker>
@@ -114,7 +123,6 @@ NeoChatRoom::NeoChatRoom(Connection *connection, QString roomId, JoinState joinS
         Q_EMIT parentIdsChanged();
         Q_EMIT canonicalParentChanged();
         Q_EMIT joinRuleChanged();
-        Q_EMIT readOnlyChanged();
     });
     connect(connection, &Connection::capabilitiesLoaded, this, &NeoChatRoom::maxRoomVersionChanged);
     connect(this, &Room::changed, this, [this]() {
@@ -663,11 +671,6 @@ bool NeoChatRoom::isInvite() const
     return joinState() == JoinState::Invite;
 }
 
-bool NeoChatRoom::readOnly() const
-{
-    return !canSendEvent("m.room.message"_ls);
-}
-
 bool NeoChatRoom::isUserBanned(const QString &user) const
 {
     auto roomMemberEvent = currentState().get<RoomMemberEvent>(user);

src/neochatroom.h

@@ -133,11 +133,6 @@ class NeoChatRoom : public Quotient::Room
      */
     Q_PROPERTY(bool isInvite READ isInvite NOTIFY isInviteChanged)
 
-    /**
-     * @brief Whether the local user can send messages in the room.
-     */
-    Q_PROPERTY(bool readOnly READ readOnly NOTIFY readOnlyChanged)
-
     /**
      * @brief The current join rule for the room as a QString.
      *
@@ -557,8 +552,6 @@ public:
 
     bool isInvite() const;
 
-    bool readOnly() const;
-
     Q_INVOKABLE void clearInvitationNotification();
 
     [[nodiscard]] QString joinRule() const;
@@ -816,7 +809,6 @@ Q_SIGNALS:
     void canonicalParentChanged();
     void lastActiveTimeChanged();
     void isInviteChanged();
-    void readOnlyChanged();
     void displayNameChanged();
     void pushNotificationStateChanged(PushNotificationState::State state);
     void showMessage(MessageType messageType, const QString &message);

src/notificationsmanager.cpp

@@ -21,6 +21,7 @@
 #endif
 
 #include "controller.h"
+#include "neochatconfig.h"
 #include "neochatconnection.h"
 #include "neochatroom.h"
 #include "roommanager.h"

src/plasma-runner-neochat.desktop

@@ -56,7 +56,6 @@ Comment[eu]=Bilatu gelak NeoChat-en
 Comment[fi]=Etsi huoneita NeoChatissä
 Comment[fr]=Trouver des salons dans NeoChat
 Comment[gl]=Atopa salas en NeoChat.
-Comment[hu]=Szobák keresése a NeoChatben
 Comment[ia]=Trova salas in NeoChat
 Comment[id]=Cari ruangan di NeoChat
 Comment[ie]=Trovar chambres in NeoChat

src/qml/AccountEditorPage.qml

@@ -61,7 +61,7 @@ FormCard.FormCardPage {
             text: i18n("Upload new avatar")
             display: QQC2.AbstractButton.IconOnly
 
-            onClicked: parent.clicked()
+            onClicked: parent.onClicked()
 
             QQC2.ToolTip.text: text
             QQC2.ToolTip.visible: hovered

src/qml/HoverActions.qml

@@ -89,7 +89,7 @@ QQC2.Control {
                     onTriggered: emojiDialog.open()
                 },
                 Kirigami.Action {
-                    visible: root.delegate && root.delegate.author.isLocalUser && (root.delegate.delegateType === DelegateType.Emote || root.delegate.delegateType === DelegateType.Message) && !root.currentRoom.readOnly
+                    visible: root.delegate && root.delegate.author.isLocalUser && (root.delegate.delegateType === DelegateType.Emote || root.delegate.delegateType === DelegateType.Message)
                     text: i18n("Edit")
                     icon.name: "document-edit"
                     onTriggered: {
@@ -98,7 +98,6 @@ QQC2.Control {
                     }
                 },
                 Kirigami.Action {
-                    visible: !root.currentRoom.readOnly
                     text: i18n("Reply")
                     icon.name: "mail-replied-symbolic"
                     onTriggered: {
@@ -108,7 +107,6 @@ QQC2.Control {
                     }
                 },
                 Kirigami.Action {
-                    visible: !root.currentRoom.readOnly
                     text: i18n("Reply in Thread")
                     icon.name: "dialog-messages"
                     onTriggered: {

src/qml/MessageDelegateContextMenu.qml

@@ -135,7 +135,7 @@ Loader {
         Kirigami.Action {
             text: i18n("Copy")
             icon.name: "edit-copy"
-            onTriggered: Clipboard.saveText(root.selectedText.length > 0 ? root.selectedText : root.plainText)
+            onTriggered: Clipboard.saveText(root.selectedText.length > 0 ? root.plainText : root.selectedText)
         },
         Kirigami.Action {
             text: i18nc("@action:button 'Report' as in 'Report this event to the administrators'", "Report")

src/qml/QuickSwitcher.qml

@@ -21,7 +21,7 @@ QQC2.Dialog {
 
     leftPadding: 0
     rightPadding: 0
-    bottomPadding: 1
+    bottomPadding: 0
     topPadding: 0
 
     anchors.centerIn: applicationWindow().overlay
@@ -71,7 +71,6 @@ QQC2.Dialog {
 
     QQC2.ScrollView {
         anchors.fill: parent
-        clip: true
 
         Keys.forwardTo: searchField
 

src/qml/RoomPage.qml

@@ -158,7 +158,7 @@ Kirigami.Page {
 
     footer: Loader {
         id: chatBarLoader
-        active: timelineViewLoader.active && !root.currentRoom.readOnly
+        active: timelineViewLoader.active && root.currentRoom.canSendEvent("m.room.message") // TODO make this update in real time
         sourceComponent: ChatBar {
             id: chatBar
             width: parent.width

src/qml/SearchPage.qml

@@ -26,36 +26,22 @@ Kirigami.ScrollablePage {
         room: root.currentRoom
     }
 
-    header: QQC2.Control {
-        padding: Kirigami.Units.largeSpacing
-
-        background: Rectangle {
-            color: Kirigami.Theme.backgroundColor
-
-            Kirigami.Separator {
-                anchors {
-                    left: parent.left
-                    bottom: parent.bottom
-                    right: parent.right
-                }
-            }
+    header: RowLayout {
+        Kirigami.SearchField {
+            id: searchField
+            focus: true
+            Layout.topMargin: Kirigami.Units.smallSpacing
+            Layout.leftMargin: Kirigami.Units.smallSpacing
+            Layout.fillWidth: true
+            Keys.onEnterPressed: searchButton.clicked()
+            Keys.onReturnPressed: searchButton.clicked()
         }
-
-        contentItem: RowLayout {
-            spacing: Kirigami.Units.largeSpacing
-
-            Kirigami.SearchField {
-                id: searchField
-                focus: true
-                Layout.fillWidth: true
-                Keys.onEnterPressed: searchButton.clicked()
-                Keys.onReturnPressed: searchButton.clicked()
-            }
-            QQC2.Button {
-                id: searchButton
-                onClicked: searchModel.search()
-                icon.name: "search"
-            }
+        QQC2.Button {
+            id: searchButton
+            Layout.topMargin: Kirigami.Units.smallSpacing
+            Layout.rightMargin: Kirigami.Units.smallSpacing
+            onClicked: searchModel.search()
+            icon.name: "search"
         }
     }
 

src/qml/main.qml

@@ -86,7 +86,7 @@ Kirigami.ApplicationWindow {
     Timer {
         id: saveWindowGeometryTimer
         interval: 1000
-        onTriggered: WindowController.saveGeometry()
+        onTriggered: Controller.saveWindowGeometry()
     }
 
     Connections {
@@ -94,7 +94,7 @@ Kirigami.ApplicationWindow {
         enabled: false // Disable on startup to avoid writing wrong values if the window is hidden
         target: root
 
-        function onClosing() { WindowController.saveGeometry(); }
+        function onClosing() { Controller.saveWindowGeometry(); }
         function onWidthChanged() { saveWindowGeometryTimer.restart(); }
         function onHeightChanged() { saveWindowGeometryTimer.restart(); }
         function onXChanged() { saveWindowGeometryTimer.restart(); }
@@ -300,6 +300,12 @@ Kirigami.ApplicationWindow {
         function onErrorOccured(error, detail) {
             showPassiveNotification(detail.length > 0 ? i18n("%1: %2", error, detail) : error);
         }
+
+        function onUserConsentRequired(url) {
+            let consent = consentSheetComponent.createObject(QQC2.ApplicationWindow.overlay)
+            consent.url = url
+            consent.open()
+        }
     }
 
     Connections {
@@ -335,11 +341,6 @@ Kirigami.ApplicationWindow {
                 title: i18nc("@title:window", "Session Verification")
             });
         }
-        function onUserConsentRequired(url) {
-            let consent = consentSheetComponent.createObject(QQC2.ApplicationWindow.overlay)
-            consent.url = url
-            consent.open()
-        }
     }
 
     Component {

src/roommanager.cpp

@@ -5,10 +5,11 @@
 #include "roommanager.h"
 
 #include "chatbarcache.h"
+#include "controller.h"
 #include "enums/delegatetype.h"
+#include "models/messageeventmodel.h"
 #include "models/timelinemodel.h"
 #include "neochatconfig.h"
-#include "neochatconnection.h"
 #include "neochatroom.h"
 
 #include <KLocalizedString>

src/roommanager.h

@@ -13,6 +13,7 @@
 #include "chatdocumenthandler.h"
 #include "enums/delegatetype.h"
 #include "models/mediamessagefiltermodel.h"
+#include "models/messageeventmodel.h"
 #include "models/messagefiltermodel.h"
 #include "models/timelinemodel.h"
 

src/runner.cpp

@@ -5,6 +5,7 @@
 
 #include <QDBusMetaType>
 
+#include "controller.h"
 #include "neochatroom.h"
 #include "roommanager.h"
 #include "windowcontroller.h"

src/spacehierarchycache.cpp

@@ -6,6 +6,7 @@
 #include <Quotient/csapi/space_hierarchy.h>
 #include <Quotient/qt_connection_util.h>
 
+#include "controller.h"
 #include "neochatroom.h"
 
 using namespace Quotient;

src/texthandler.cpp

@@ -493,4 +493,18 @@ QString TextHandler::linkifyUrls(QString stringIn)
     return stringIn;
 }
 
+QList<QUrl> TextHandler::getLinkPreviews()
+{
+    auto data = m_data.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 += QUrl(link);
+        }
+    }
+    return links;
+}
+
 #include "moc_texthandler.cpp"

src/texthandler.h

@@ -11,9 +11,29 @@
 
 #include "neochatroom.h"
 
-namespace Quotient
+namespace TextRegex
 {
-class RoomMessageEvent;
+static const QRegularExpression endTagType{QStringLiteral("(>| )")};
+static const QRegularExpression attributeData{QStringLiteral("['\"](.*?)['\"]")};
+static const QRegularExpression removeReply{QStringLiteral("> <.*?>.*?\\n\\n"), QRegularExpression::DotMatchesEverythingOption};
+static const QRegularExpression removeRichReply{QStringLiteral("<mx-reply>.*?</mx-reply>"), QRegularExpression::DotMatchesEverythingOption};
+static const QRegularExpression codePill{QStringLiteral("<pre><code[^>]*>(.*?)</code></pre>"), QRegularExpression::DotMatchesEverythingOption};
+static const QRegularExpression userPill{QStringLiteral("(<a href=\"https://matrix.to/#/@.*?:.*?\">.*?</a>)"), QRegularExpression::DotMatchesEverythingOption};
+static const QRegularExpression blockQuote{QStringLiteral("<blockquote>\n?(?:<p>)?(.*?)(?:</p>)?\n?</blockquote>"),
+                                           QRegularExpression::DotMatchesEverythingOption};
+static const QRegularExpression strikethrough{QStringLiteral("<del>(.*?)</del>"), QRegularExpression::DotMatchesEverythingOption};
+static const QRegularExpression mxcImage{QStringLiteral(R"AAA(<img(.*?)src="mxc:\/\/(.*?)\/(.*?)"(.*?)>)AAA")};
+static const QRegularExpression plainUrl(
+    QStringLiteral(
+        R"(<a.*?<\/a>(*SKIP)(*F)|\b((www\.(?!\.)(?!(\w|\.|-)+@)|(https?|ftp):(//)?\w|(magnet|matrix):)(&(?![lg]t;)|[^&\s<>'"])+(&(?![lg]t;)|[^&!,.\s<>'"\]):])))"),
+    QRegularExpression::CaseInsensitiveOption | QRegularExpression::UseUnicodePropertiesOption);
+static const QRegularExpression
+    url(QStringLiteral(R"(\b((www\.(?!\.)(?!(\w|\.|-)+@)|https?:(//)?\w)(&(?![lg]t;)|[^&\s<>'"])+(&(?![lg]t;)|[^&!,.\s<>'"\]):])))"),
+        QRegularExpression::CaseInsensitiveOption | QRegularExpression::UseUnicodePropertiesOption);
+static const QRegularExpression emailAddress(QStringLiteral(R"(<a.*?<\/a>(*SKIP)(*F)|\b(mailto:)?((\w|\.|-)+@(\w|\.|-)+\.\w+\b))"),
+                                             QRegularExpression::CaseInsensitiveOption | QRegularExpression::UseUnicodePropertiesOption);
+static const QRegularExpression mxId(QStringLiteral(R"((^|[][[:space:](){}`'";])([!#@][-a-z0-9_=#/.]{1,252}:\w(?:\w|\.|-)*\.\w+(?::\d{1,5})?))"),
+                                     QRegularExpression::CaseInsensitiveOption | QRegularExpression::UseUnicodePropertiesOption);
 }
 
 /**
@@ -94,6 +114,14 @@ public:
      */
     QString handleRecievePlainText(Qt::TextFormat inputFormat = Qt::PlainText, const bool &stripNewlines = false);
 
+    /**
+     * @brief Return a list of links that can be previewed.
+     *
+     * This function is designed to give only links that should be previewed so
+     * http, https or something starting with www.
+     */
+    QList<QUrl> getLinkPreviews();
+
 private:
     QString m_data;