From b0b0291bc752a3a629433030a415154984e77c10 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Tue, 28 Aug 2018 01:27:20 +0100
Subject: [PATCH] hopefully fix invite_room_state as per
 https://github.com/vector-im/riot-web/issues/7229

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

diff --git a/src/models/room.js b/src/models/room.js
index 94115ef45..acac0ef4d 100644
--- a/src/models/room.js
+++ b/src/models/room.js
@@ -1141,7 +1141,10 @@ Room.prototype.recalculate = function() {
         "m.room.member", this.myUserId,
     );
     if (membershipEvent && membershipEvent.getContent().membership === "invite") {
-        const strippedStateEvents = membershipEvent.event.invite_room_state || [];
+        const strippedStateEvents = (
+            membershipEvent.event.unsigned ?
+            membershipEvent.event.unsigned.invite_room_state :
+            []) || [];
         utils.forEach(strippedStateEvents, function(strippedEvent) {
             const existingEvent = self.currentState.getStateEvents(
                 strippedEvent.type, strippedEvent.state_key,