From 716ae11941468c0891cd844dc6baaf3a0948a186 Mon Sep 17 00:00:00 2001 From: James Graham Date: Sat, 8 Mar 2025 14:42:48 +0000 Subject: [PATCH] Fix Viewing Encrypted Events Turns out I forgot that an encrypted event is not a roommessage event so we need to handle this when grabbing the content model for the message. --- src/models/messagemodel.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/models/messagemodel.cpp b/src/models/messagemodel.cpp index d8fa615b9..48bd140a4 100644 --- a/src/models/messagemodel.cpp +++ b/src/models/messagemodel.cpp @@ -5,6 +5,7 @@ #include "neochatconfig.h" +#include #include #include #if Quotient_VERSION_MINOR > 9 || (Quotient_VERSION_MINOR == 9 && Quotient_VERSION_PATCH > 1) @@ -120,6 +121,10 @@ QVariant MessageModel::data(const QModelIndex &idx, int role) const } if (role == ContentModelRole) { + if (event->get().is()) { + return QVariant::fromValue(m_room->contentModelForEvent(event->get().id())); + } + auto roomMessageEvent = eventCast(&event.value().get()); if (NeoChatConfig::self()->threads() && roomMessageEvent && roomMessageEvent->isThreaded()) { return QVariant::fromValue(m_room->contentModelForEvent(roomMessageEvent->threadRootEventId()));