Remove external room window feature

At its best, this worked ok-ish, though it was always missing basic features.

It's also a massive memory leak and significantly complicates the codebase.
(Which is not yet cleaned up by this commit)

Currently, it is entirely broken and noone noticed or cared enough to report or fix that.

BUG: 455984

src/CMakeLists.txt

@@ -188,7 +188,6 @@ qt_add_qml_module(neochat URI org.kde.neochat NO_PLUGIN
         qml/UserInfo.qml
         qml/UserInfoDesktop.qml
         qml/RoomPage.qml
-        qml/RoomWindow.qml
         qml/ExploreRoomsPage.qml
         qml/ManualRoomDialog.qml
         qml/ExplorerDelegate.qml

src/enums/messagecomponenttype.h

@@ -51,6 +51,7 @@ public:
         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. */
         Other, /**< Anything that cannot be classified as another type. */
     };
     Q_ENUM(Type);

src/models/messagecontentmodel.cpp

@@ -244,70 +244,75 @@ void MessageContentModel::updateComponents(bool isEditing)
     beginResetModel();
     m_components.clear();
 
-    EventHandler eventHandler(m_room, m_event);
-    if (eventHandler.hasReply()) {
-        if (m_room->findInTimeline(eventHandler.getReplyId()) == m_room->historyEdge()) {
-            m_components += MessageComponent{MessageComponentType::ReplyLoad, QString(), {}};
-            m_room->loadReply(m_event->id(), eventHandler.getReplyId());
-        } else {
-            m_components += MessageComponent{MessageComponentType::Reply, QString(), {}};
-        }
-    }
-
-    if (isEditing) {
-        m_components += MessageComponent{MessageComponentType::Edit, QString(), {}};
-    } else if (m_event->isRedacted()) {
-        m_components += MessageComponent{MessageComponentType::Text, QString(), {}};
+    if (eventCast<const Quotient::RoomMessageEvent>(m_event)
+        && eventCast<const Quotient::RoomMessageEvent>(m_event)->rawMsgtype() == QStringLiteral("m.key.verification.request")) {
+        m_components += MessageComponent{MessageComponentType::Verification, QString(), {}};
     } else {
-        if (eventHandler.messageComponentType() == MessageComponentType::Text) {
-            const auto event = eventCast<const Quotient::RoomMessageEvent>(m_event);
-            auto body = EventHandler::rawMessageBody(*event);
-            m_components.append(TextHandler().textComponents(body, EventHandler::messageBodyInputFormat(*event), m_room, event, event->isReplaced()));
-        } else if (eventHandler.messageComponentType() == MessageComponentType::File) {
-            m_components += MessageComponent{MessageComponentType::File, QString(), {}};
-            if (m_emptyItinerary) {
-                Quotient::FileTransferInfo fileTransferInfo;
-                if (auto event = eventCast<const Quotient::RoomMessageEvent>(m_event)) {
-                    if (event->hasFileContent()) {
+        EventHandler eventHandler(m_room, m_event);
+        if (eventHandler.hasReply()) {
+            if (m_room->findInTimeline(eventHandler.getReplyId()) == m_room->historyEdge()) {
+                m_components += MessageComponent{MessageComponentType::ReplyLoad, QString(), {}};
+                m_room->loadReply(m_event->id(), eventHandler.getReplyId());
+            } else {
+                m_components += MessageComponent{MessageComponentType::Reply, QString(), {}};
+            }
+        }
+
+        if (isEditing) {
+            m_components += MessageComponent{MessageComponentType::Edit, QString(), {}};
+        } else if (m_event->isRedacted()) {
+            m_components += MessageComponent{MessageComponentType::Text, QString(), {}};
+        } else {
+            if (eventHandler.messageComponentType() == MessageComponentType::Text) {
+                const auto event = eventCast<const Quotient::RoomMessageEvent>(m_event);
+                auto body = EventHandler::rawMessageBody(*event);
+                m_components.append(TextHandler().textComponents(body, EventHandler::messageBodyInputFormat(*event), m_room, event, event->isReplaced()));
+            } else if (eventHandler.messageComponentType() == MessageComponentType::File) {
+                m_components += MessageComponent{MessageComponentType::File, QString(), {}};
+                if (m_emptyItinerary) {
+                    Quotient::FileTransferInfo fileTransferInfo;
+                    if (auto event = eventCast<const Quotient::RoomMessageEvent>(m_event)) {
+                        if (event->hasFileContent()) {
+                            fileTransferInfo = m_room->fileTransferInfo(event->id());
+                        }
+                    }
+                    if (auto event = eventCast<const Quotient::StickerEvent>(m_event)) {
                         fileTransferInfo = m_room->fileTransferInfo(event->id());
                     }
-                }
-                if (auto event = eventCast<const Quotient::StickerEvent>(m_event)) {
-                    fileTransferInfo = m_room->fileTransferInfo(event->id());
-                }
 
 #ifndef Q_OS_ANDROID
-                KSyntaxHighlighting::Repository repository;
-                const auto definitionForFile = repository.definitionForFileName(fileTransferInfo.localPath.toString());
-                if (definitionForFile.isValid() || QFileInfo(fileTransferInfo.localPath.path()).suffix() == QStringLiteral("txt")) {
-                    QFile file(fileTransferInfo.localPath.path());
-                    file.open(QIODevice::ReadOnly);
-                    m_components += MessageComponent{MessageComponentType::Code,
-                                                     QString::fromStdString(file.readAll().toStdString()),
-                                                     {{QStringLiteral("class"), definitionForFile.name()}}};
-                }
+                    KSyntaxHighlighting::Repository repository;
+                    const auto definitionForFile = repository.definitionForFileName(fileTransferInfo.localPath.toString());
+                    if (definitionForFile.isValid() || QFileInfo(fileTransferInfo.localPath.path()).suffix() == QStringLiteral("txt")) {
+                        QFile file(fileTransferInfo.localPath.path());
+                        file.open(QIODevice::ReadOnly);
+                        m_components += MessageComponent{MessageComponentType::Code,
+                                                         QString::fromStdString(file.readAll().toStdString()),
+                                                         {{QStringLiteral("class"), definitionForFile.name()}}};
+                    }
 #endif
 
-                if (FileType::instance().fileHasImage(fileTransferInfo.localPath)) {
-                    QImageReader reader(fileTransferInfo.localPath.path());
-                    m_components += MessageComponent{MessageComponentType::Pdf, QString(), {{QStringLiteral("size"), reader.size()}}};
+                    if (FileType::instance().fileHasImage(fileTransferInfo.localPath)) {
+                        QImageReader reader(fileTransferInfo.localPath.path());
+                        m_components += MessageComponent{MessageComponentType::Pdf, QString(), {{QStringLiteral("size"), reader.size()}}};
+                    }
+                } else {
+                    updateItineraryModel();
+                    if (m_itineraryModel != nullptr) {
+                        m_components += MessageComponent{MessageComponentType::Itinerary, QString(), {}};
+                    }
                 }
             } else {
-                updateItineraryModel();
-                if (m_itineraryModel != nullptr) {
-                    m_components += MessageComponent{MessageComponentType::Itinerary, QString(), {}};
-                }
+                m_components += MessageComponent{eventHandler.messageComponentType(), QString(), {}};
             }
-        } else {
-            m_components += MessageComponent{eventHandler.messageComponentType(), QString(), {}};
         }
-    }
 
-    if (m_linkPreviewer != nullptr) {
-        if (m_linkPreviewer->loaded()) {
-            m_components += MessageComponent{MessageComponentType::LinkPreview, QString(), {}};
-        } else {
-            m_components += MessageComponent{MessageComponentType::LinkPreviewLoad, QString(), {}};
+        if (m_linkPreviewer != nullptr) {
+            if (m_linkPreviewer->loaded()) {
+                m_components += MessageComponent{MessageComponentType::LinkPreview, QString(), {}};
+            } else {
+                m_components += MessageComponent{MessageComponentType::LinkPreviewLoad, QString(), {}};
+            }
         }
     }
 

src/qml/ContextMenu.qml

@@ -27,18 +27,6 @@ Loader {
     Component {
         id: regularMenu
         QQC2.Menu {
-            QQC2.MenuItem {
-                id: newWindow
-                text: i18n("Open in New Window")
-                icon.name: "window-new"
-                onTriggered: RoomManager.openWindow(room)
-                visible: !Kirigami.Settings.isMobile
-            }
-
-            QQC2.MenuSeparator {
-                visible: newWindow.visible
-            }
-
             QQC2.MenuItem {
                 text: room.isFavourite ? i18n("Remove from Favorites") : i18n("Add to Favorites")
                 icon.name: room.isFavourite ? "bookmark-remove" : "bookmark-new"

src/qml/RoomWindow.qml

@@ -1,64 +0,0 @@
-// SPDX-FileCopyrightText: 2020 Carl Schwan <carl@carlschwan.eu>
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-import QtQuick
-import QtQuick.Controls as QQC2
-import QtQuick.Layouts
-
-import org.kde.kirigami as Kirigami
-
-import org.kde.neochat
-
-Kirigami.ApplicationWindow {
-    id: root
-
-    required property NeoChatRoom currentRoom
-    required property NeoChatConnection connection
-
-    minimumWidth: Kirigami.Units.gridUnit * 10
-    minimumHeight: Kirigami.Units.gridUnit * 15
-
-    Shortcut {
-        sequence: StandardKey.Cancel
-        onActivated: root.close()
-    }
-    pageStack.initialPage: RoomPage {
-        id: roomPage
-        visible: true
-        currentRoom: root.currentRoom
-        disableCancelShortcut: true
-        connection: root.connection
-
-        timelineModel: TimelineModel {
-            room: currentRoom
-        }
-        messageFilterModel: MessageFilterModel {
-            sourceModel: roomPage.messageEventModel
-        }
-        mediaMessageFilterModel: MediaMessageFilterModel {
-            sourceModel: roomPage.messageFilterModel
-        }
-    }
-
-    onCurrentRoomChanged: if (!currentRoom) {
-        root.close();
-    }
-
-    property Item hoverLinkIndicator: QQC2.Control {
-        parent: overlay.parent
-        property string text
-        opacity: linkText.text.length > 0 ? 1 : 0
-
-        z: 20
-        x: 0
-        y: parent.height - implicitHeight
-        contentItem: QQC2.Label {
-            id: linkText
-            text: parent.text.startsWith("https://matrix.to/") ? "" : parent.text
-        }
-        Kirigami.Theme.colorSet: Kirigami.Theme.View
-        background: Rectangle {
-            color: Kirigami.Theme.backgroundColor
-        }
-    }
-}

src/qml/main.qml

@@ -186,15 +186,6 @@ Kirigami.ApplicationWindow {
             roomItem.forceActiveFocus();
         }
 
-        function onOpenRoomInNewWindow(room) {
-            const secondaryWindow = roomWindow.createObject(undefined, {
-                currentRoom: room,
-                connection: root.connection
-            });
-            secondaryWindow.width = root.width - pageStack.get(0).width;
-            secondaryWindow.show();
-        }
-
         function onAskDirectChatConfirmation(user) {
             askDirectChatConfirmationComponent.createObject(QQC2.ApplicationWindow.overlay, {
                 user: user
@@ -415,11 +406,6 @@ Kirigami.ApplicationWindow {
         }
     }
 
-    Component {
-        id: roomWindow
-        RoomWindow {}
-    }
-
     Component {
         id: joinRoomDialog
         JoinRoomDialog {}

src/roommanager.cpp

@@ -250,12 +250,6 @@ void RoomManager::openRoomForActiveConnection()
     }
 }
 
-void RoomManager::openWindow(NeoChatRoom *room)
-{
-    // forward the call to QML
-    Q_EMIT openRoomInNewWindow(room);
-}
-
 UriResolveResult RoomManager::visitUser(User *user, const QString &action)
 {
     if (action == "mention"_ls || action.isEmpty()) {

src/roommanager.h

@@ -148,13 +148,6 @@ public:
      */
     Q_INVOKABLE void loadInitialRoom();
 
-    /**
-     * @brief Open a new window with the given room.
-     *
-     * The open window will have its own message list for the given room.
-     */
-    Q_INVOKABLE void openWindow(NeoChatRoom *room);
-
     /**
      * @brief Leave the room and close it if it is open.
      */

src/timeline/MessageComponentChooser.qml

@@ -213,6 +213,14 @@ DelegateChooser {
         }
     }
 
+    DelegateChoice {
+        roleValue: MessageComponentType.Verification
+        delegate: MimeComponent {
+            mimeIconSource: "security-high"
+            label: i18n("%1 started a user verification", model.author.escapedDisplayName)
+        }
+    }
+
     DelegateChoice {
         roleValue: MessageComponentType.Other
         delegate: Item {}