ESCA111/neochat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Separate out a base MessageContentModel.

Browse Source 
Separate out a base `MessageContentModel` that can be extended to get the component types from different places. This is used currently for `EventMessageContentModel` but will be used later as part of the rich chat bar.

All display text is now in the text component so it never needs special casing. This also cleans up some of the model parameters so more things come from attributes including location and file data (which was already a qvariantmap anyway).

Also cleaned up the itinerary and file enhancement views,
This commit is contained in:
James Graham
2025-08-01 12:15:51 +01:00
parent 501f14fead
commit b4e1740cad
24 changed files with 874 additions and 789 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/messagecontent/contentprovider.h
View File

@@ -7,8 +7,8 @@
#include <QObject>
#include <QQmlEngine>
#include "models/messagecontentmodel.h"
#include "models/threadmodel.h"
#include "models/eventmessagecontentmodel.h"
#include "neochatroom.h"
#include "pollhandler.h"
@@ -46,7 +46,7 @@ public:
*
* @warning Do NOT use for pending events as this function has no way to differentiate.
*/
Q_INVOKABLE MessageContentModel *contentModelForEvent(NeoChatRoom *room, const QString &evtOrTxnId, bool isReply = false);
Q_INVOKABLE EventMessageContentModel *contentModelForEvent(NeoChatRoom *room, const QString &evtOrTxnId, bool isReply = false);
/**
* @brief Returns the content model for the given event.
@@ -61,7 +61,7 @@ public:
*
* @note This version must be used for pending events as it can differentiate.
*/
MessageContentModel *contentModelForEvent(NeoChatRoom *room, const Quotient::RoomEvent *event, bool isReply = false);
EventMessageContentModel *contentModelForEvent(NeoChatRoom *room, const Quotient::RoomEvent *event, bool isReply = false);
/**
* @brief Returns the thread model for the given thread root event ID.
@@ -86,7 +86,7 @@ public:
private:
explicit ContentProvider(QObject *parent = nullptr);
QCache<QString, MessageContentModel> m_eventContentModels;
QCache<QString, EventMessageContentModel> m_eventContentModels;
QCache<QString, ThreadModel> m_threadModels;
QCache<QString, PollHandler> m_pollHandlers;
};