Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes

1 files changed, 4 insertions, 0 deletions

diff --git a/synapse/handlers/sync.py b/synapse/handlers/sync.py

index 456eaf86cb..5d96ee799d 100644
--- a/synapse/handlers/sync.py
+++ b/synapse/handlers/sync.py
@@ -717,6 +717,10 @@ class SyncHandler(object):
                     )
                 ]
 
+                # always make sure we LL ourselves so we know we're in the room
+                # (if we are), to fix https://github.com/vector-im/riot-web/issues/7209
+                types.append((EventTypes.Member, sync_config.user.to_string()))
+
                 # only apply the filtering to room members
                 filtered_types = [EventTypes.Member]