Merge pull request #544 from matrix-org/erikj/stream_rooms

Only use room_ids if in get_room_events_stream if is_guest
matrix-org · Feb 1, 2016 · 498c2e6 · 498c2e6
2 parents d98a9f2 + ceb6b86
commit 498c2e6
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/synapse/storage/stream.py b/synapse/storage/stream.py
@@ -316,11 +316,6 @@ def get_room_events_stream(
                 " 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.