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

Minor fixes for MessageContentModel and ThreadModel

Browse Source
This commit is contained in:
James Graham
2024-08-27 15:58:27 +01:00
parent 6d77ed1e0e
commit 5b04ad6805
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/models/messagecontentmodel.cpp
View File

@@ -84,7 +84,7 @@ void MessageContentModel::initializeModel()
}); });
if (m_event == nullptr) { if (m_event == nullptr) {
m_room->getEvent(m_eventId); intiializeEvent(m_room->getEvent(m_eventId));
if (m_event == nullptr) { if (m_event == nullptr) {
m_room->downloadEventFromServer(m_eventId); m_room->downloadEventFromServer(m_eventId);
} }
@@ -189,6 +189,10 @@ void MessageContentModel::intiializeEvent(const QString &eventId)
void MessageContentModel::intiializeEvent(const Quotient::RoomEvent *event) void MessageContentModel::intiializeEvent(const Quotient::RoomEvent *event)
{ {
if (event == nullptr) {
return;
}
m_event = loadEvent<RoomEvent>(event->fullJson()); m_event = loadEvent<RoomEvent>(event->fullJson());
// a pending event may not previously have had an event ID so update. // a pending event may not previously have had an event ID so update.
m_eventId = EventHandler::id(m_event.get()); m_eventId = EventHandler::id(m_event.get());

3
src/models/threadmodel.cpp
View File

@@ -117,6 +117,9 @@ void ThreadModel::addModels()
addSourceModel(*it); addSourceModel(*it);
} }
addSourceModel(m_threadChatBarModel); addSourceModel(m_threadChatBarModel);
beginResetModel();
endResetModel();
} }
void ThreadModel::clearModels() void ThreadModel::clearModels()