Itinerary Component

Move the itinerary model representation to it's own component and instantiate from MessageComponentModel. This starts to lay some groundwork for previewing other files.

src/models/itinerarymodel.cpp

@@ -3,6 +3,7 @@
 
 #include "itinerarymodel.h"
 
+#include <QJsonDocument>
 #include <QProcess>
 
 #include "config-neochat.h"
@@ -16,20 +17,6 @@ ItineraryModel::ItineraryModel(QObject *parent)
 {
 }
 
-void ItineraryModel::setConnection(NeoChatConnection *connection)
-{
-    if (m_connection == connection) {
-        return;
-    }
-    m_connection = connection;
-    Q_EMIT connectionChanged();
-}
-
-NeoChatConnection *ItineraryModel::connection() const
-{
-    return m_connection;
-}
-
 QVariant ItineraryModel::data(const QModelIndex &index, int role) const
 {
     if (!index.isValid()) {
@@ -133,11 +120,7 @@ QString ItineraryModel::path() const
 
 void ItineraryModel::setPath(const QString &path)
 {
-    if (path == m_path) {
-        return;
-    }
     m_path = path;
-    Q_EMIT pathChanged();
     loadData();
 }
 

src/models/itinerarymodel.h

@@ -4,19 +4,16 @@
 #pragma once
 
 #include <QAbstractListModel>
+#include <QJsonArray>
 #include <QPointer>
 #include <QQmlEngine>
 #include <QString>
 
-#include "neochatconnection.h"
-
 class ItineraryModel : public QAbstractListModel
 {
     Q_OBJECT
     QML_ELEMENT
-
-    Q_PROPERTY(NeoChatConnection *connection READ connection WRITE setConnection NOTIFY connectionChanged)
-    Q_PROPERTY(QString path READ path WRITE setPath NOTIFY pathChanged)
+    QML_UNCREATABLE("")
 
 public:
     enum Roles {
@@ -37,9 +34,6 @@ public:
     Q_ENUM(Roles)
     explicit ItineraryModel(QObject *parent = nullptr);
 
-    void setConnection(NeoChatConnection *connection);
-    NeoChatConnection *connection() const;
-
     QVariant data(const QModelIndex &index, int role) const override;
     int rowCount(const QModelIndex &parent = {}) const override;
 
@@ -50,12 +44,7 @@ public:
 
     Q_INVOKABLE void sendToItinerary();
 
-Q_SIGNALS:
-    void connectionChanged();
-    void pathChanged();
-
 private:
-    QPointer<NeoChatConnection> m_connection;
     QJsonArray m_data;
     QString m_path;
     void loadData();

src/models/messagecontentmodel.cpp

@@ -64,11 +64,13 @@ MessageContentModel::MessageContentModel(const Quotient::RoomEvent *event, NeoCh
         });
         connect(m_room, &NeoChatRoom::fileTransferCompleted, this, [this](const QString &eventId) {
             if (m_event != nullptr && eventId == m_event->id()) {
+                updateComponents();
                 Q_EMIT dataChanged(index(0), index(rowCount() - 1), {FileTransferInfoRole});
             }
         });
         connect(m_room, &NeoChatRoom::fileTransferFailed, this, [this](const QString &eventId) {
             if (m_event != nullptr && eventId == m_event->id()) {
+                updateComponents();
                 Q_EMIT dataChanged(index(0), index(rowCount() - 1), {FileTransferInfoRole});
             }
         });
@@ -152,6 +154,9 @@ QVariant MessageContentModel::data(const QModelIndex &index, int role) const
             return QVariant::fromValue(m_room->fileTransferInfo(event->id()));
         }
     }
+    if (role == ItineraryModelRole) {
+        return QVariant::fromValue<ItineraryModel *>(m_itineraryModel);
+    }
     if (role == LatitudeRole) {
         return eventHandler.getLatitude();
     }
@@ -209,6 +214,7 @@ QHash<int, QByteArray> MessageContentModel::roleNames() const
     roles[AuthorRole] = "author";
     roles[MediaInfoRole] = "mediaInfo";
     roles[FileTransferInfoRole] = "fileTransferInfo";
+    roles[ItineraryModelRole] = "itineraryModel";
     roles[LatitudeRole] = "latitude";
     roles[LongitudeRole] = "longitude";
     roles[AssetRole] = "asset";
@@ -247,6 +253,12 @@ void MessageContentModel::updateComponents(bool isEditing)
             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(), {}};
+            updateItineraryModel();
+            if (m_itineraryModel != nullptr) {
+                m_components += MessageComponent{MessageComponentType::Itinerary, QString(), {}};
+            }
         } else {
             m_components += MessageComponent{eventHandler.messageComponentType(), QString(), {}};
         }
@@ -262,3 +274,25 @@ void MessageContentModel::updateComponents(bool isEditing)
 
     endResetModel();
 }
+
+void MessageContentModel::updateItineraryModel()
+{
+    if (m_room == nullptr || m_event == nullptr) {
+        return;
+    }
+
+    if (auto event = eventCast<const Quotient::RoomMessageEvent>(m_event)) {
+        if (event->hasFileContent()) {
+            auto filePath = m_room->fileTransferInfo(event->id()).localPath;
+            if (filePath.isEmpty() && m_itineraryModel != nullptr) {
+                delete m_itineraryModel;
+                m_itineraryModel = nullptr;
+            } else if (!filePath.isEmpty()) {
+                if (m_itineraryModel == nullptr) {
+                    m_itineraryModel = new ItineraryModel(this);
+                }
+                m_itineraryModel->setPath(filePath.toString());
+            }
+        }
+    }
+}

src/models/messagecontentmodel.h

@@ -8,6 +8,7 @@
 
 #include "enums/messagecomponenttype.h"
 #include "eventhandler.h"
+#include "itinerarymodel.h"
 #include "linkpreviewer.h"
 #include "neochatroom.h"
 
@@ -45,6 +46,7 @@ public:
         AuthorRole, /**< The author of the event. */
         MediaInfoRole, /**< The media info for the event. */
         FileTransferInfoRole, /**< FileTransferInfo for any downloading files. */
+        ItineraryModelRole, /**< The itinerary model for a file. */
         LatitudeRole, /**< Latitude for a location event. */
         LongitudeRole, /**< Longitude for a location event. */
         AssetRole, /**< Type of location event, e.g. self pin of the user location. */
@@ -92,4 +94,7 @@ private:
     void updateComponents(bool isEditing = false);
 
     LinkPreviewer *m_linkPreviewer = nullptr;
+    ItineraryModel *m_itineraryModel = nullptr;
+
+    void updateItineraryModel();
 };