Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/spacesperf

Conflicts: src/components/views/dialogs/InviteDialog.tsx
2021-07-15 10:19:04 +01:00
parent 80f9793c73 f4788a6427
commit 50b6c5c557
45 changed files with 902 additions and 276 deletions
@@ -159,7 +159,7 @@ export class StopGapWidgetDriver extends WidgetDriver {
            if (results.length >= limit) break;

            const ev = events[i];
-            if (ev.getType() !== eventType) continue;
+            if (ev.getType() !== eventType || ev.isState()) continue;
            if (eventType === EventType.RoomMessage && msgtype && msgtype !== ev.getContent()['msgtype']) continue;
            results.push(ev);
        }