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

1 files changed, 0 insertions, 5 deletions

diff --git a/synapse/storage/stream.py b/synapse/storage/stream.py

index cc9e623608..8dc8f5c640 100644
--- a/synapse/storage/stream.py
+++ b/synapse/storage/stream.py
@@ -323,11 +323,6 @@ class StreamStore(SQLBaseStore):
                 " WHERE m.user_id = ? AND m.membership = 'join'"
             )
             current_room_membership_args = [user_id]
-            if room_ids:
-                current_room_membership_sql += " AND m.room_id in (%s)" % (
-                    ",".join(map(lambda _: "?", room_ids))
-                )
-                current_room_membership_args = [user_id] + room_ids
 
         # We also want to get any membership events about that user, e.g.
         # invites or leave notifications.