From ff87bef0300c5bf7488ca6f9a1303a340cfece49 Mon Sep 17 00:00:00 2001
From: Nicolas Werner <nicolas.werner@hotmail.de>
Date: Thu, 18 Aug 2022 22:05:47 +0200
Subject: [PATCH] Fix inline image escape order

---
 src/timeline/TimelineModel.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/timeline/TimelineModel.cpp b/src/timeline/TimelineModel.cpp
index b2798e26..4820513f 100644
--- a/src/timeline/TimelineModel.cpp
+++ b/src/timeline/TimelineModel.cpp
@@ -600,6 +600,7 @@ TimelineModel::data(const mtx::events::collections::TimelineEvents &event, int r
             if (isReply)
                 formattedBody_ = formattedBody_.remove(replyFallback);
         }
+        formattedBody_ = utils::escapeBlacklistedHtml(formattedBody_);
 
         // TODO(Nico): Don't parse html with a regex
         const static QRegularExpression matchIsImg(QStringLiteral("<img [^>]+>"));
@@ -637,8 +638,7 @@ TimelineModel::data(const mtx::events::collections::TimelineEvents &event, int r
             formattedBody_.replace(curImg, imgReplacement);
         }
 
-        return QVariant(
-          utils::replaceEmoji(utils::linkifyMessage(utils::escapeBlacklistedHtml(formattedBody_))));
+        return QVariant(utils::replaceEmoji(utils::linkifyMessage(formattedBody_)));
     }
     case Url:
         return QVariant(QString::fromStdString(url(event)));