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

Never refresh the author role except when a member updated signal is generated. This should remove a potential source of crashes where a RoomMember object tries to access an already deleted room member state event

Browse Source
This commit is contained in:
James Graham
2024-07-07 14:02:43 +01:00
parent ea1b577ec7
commit 8751f6fea7
2 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/models/messageeventmodel.cpp
View File

@@ -179,13 +179,13 @@ void MessageEventModel::setRoom(NeoChatRoom *room)
endMoveRows(); endMoveRows();
movingEvent = false; movingEvent = false;
} }
refreshRow(timelineBaseIndex()); // Refresh the looks fullEventRefresh(timelineBaseIndex());
refreshLastUserEvents(0); refreshLastUserEvents(0);
if (timelineBaseIndex() > 0) { // Refresh below, see #312 if (timelineBaseIndex() > 0) { // Refresh below, see #312
refreshEventRoles(timelineBaseIndex() - 1, {ContentModelRole}); refreshEventRoles(timelineBaseIndex() - 1, {ContentModelRole});
} }
}); });
connect(m_currentRoom, &Room::pendingEventChanged, this, &MessageEventModel::refreshRow); connect(m_currentRoom, &Room::pendingEventChanged, this, &MessageEventModel::fullEventRefresh);
connect(m_currentRoom, &Room::pendingEventAboutToDiscard, this, [this](int i) { connect(m_currentRoom, &Room::pendingEventAboutToDiscard, this, [this](int i) {
beginRemoveRows({}, i, i); beginRemoveRows({}, i, i);
}); });
@@ -255,14 +255,15 @@ void MessageEventModel::setRoom(NeoChatRoom *room)
} }
} }
int MessageEventModel::refreshEvent(const QString &eventId) void MessageEventModel::fullEventRefresh(int row)
{ {
return refreshEventRoles(eventId); auto roles = roleNames().keys();
} // The author of an event never changes so should only be updated when a member
// changed signal is emitted.
void MessageEventModel::refreshRow(int row) // This also avoids any race conditions where a member is updating and this refresh
{ // tries to access a member event that has already been deleted.
refreshEventRoles(row); roles.removeAll(AuthorRole);
refreshEventRoles(row, roles);
} }
int MessageEventModel::timelineBaseIndex() const int MessageEventModel::timelineBaseIndex() const
@@ -378,8 +379,7 @@ void MessageEventModel::refreshLastUserEvents(int baseTimelineRow)
const auto limit = timelineBottom + std::min(baseTimelineRow + 10, m_currentRoom->timelineSize()); const auto limit = timelineBottom + std::min(baseTimelineRow + 10, m_currentRoom->timelineSize());
for (auto it = timelineBottom + std::max(baseTimelineRow - 10, 0); it != limit; ++it) { for (auto it = timelineBottom + std::max(baseTimelineRow - 10, 0); it != limit; ++it) {
if ((*it)->senderId() == lastSender) { if ((*it)->senderId() == lastSender) {
auto idx = index(it - timelineBottom); fullEventRefresh(it - timelineBottom);
Q_EMIT dataChanged(idx, idx);
} }
} }
} }

5
src/models/messageeventmodel.h
View File

@@ -107,10 +107,6 @@ public:
protected: protected:
bool event(QEvent *event) override; bool event(QEvent *event) override;
private Q_SLOTS:
int refreshEvent(const QString &eventId);
void refreshRow(int row);
private: private:
QPointer<NeoChatRoom> m_currentRoom = nullptr; QPointer<NeoChatRoom> m_currentRoom = nullptr;
QString lastReadEventId; QString lastReadEventId;
@@ -128,6 +124,7 @@ private:
bool canFetchMore(const QModelIndex &parent) const override; bool canFetchMore(const QModelIndex &parent) const override;
void fetchMore(const QModelIndex &parent) override; void fetchMore(const QModelIndex &parent) override;
void fullEventRefresh(int row);
void refreshLastUserEvents(int baseTimelineRow); void refreshLastUserEvents(int baseTimelineRow);
void refreshEventRoles(int row, const QList<int> &roles = {}); void refreshEventRoles(int row, const QList<int> &roles = {});
int refreshEventRoles(const QString &eventId, const QList<int> &roles = {}); int refreshEventRoles(const QString &eventId, const QList<int> &roles = {});