From 600dff62e83cb683f220ec50cb513f2abaeac64d Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Wed, 15 May 2019 13:56:00 +0100
Subject: [PATCH] detect relations on encrypted events properly

---
 src/models/event.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/models/event.js b/src/models/event.js
index e705d8cb4..84c209fcf 100644
--- a/src/models/event.js
+++ b/src/models/event.js
@@ -747,7 +747,9 @@ utils.extend(module.exports.MatrixEvent.prototype, {
      * @return {boolean}
      */
     isRelation(relType = undefined) {
-        const content = this.getContent();
+        // must use event.content as m.relates_to is not encrypted
+        // and _clearEvent doesn't have it.
+        const content = this.event.content;
         const relation = content && content["m.relates_to"];
         return relation && relation.rel_type && relation.event_id &&
             ((relType && relation.rel_type === relType) || !relType);