summary refs log tree commit diff
path: root/synapse/storage/stream.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-02-01 10:33:52 +0000
committerErik Johnston <erik@matrix.org>2016-02-01 10:33:52 +0000
commitceb6b8680a8e419c3c132dcdb675517c5e9f69fd (patch)
treef35ba82eaa51d0b9c13ca043c3502a648e7ff555 /synapse/storage/stream.py
parentDon't use before_token. Its wrong. Use actual limit. (diff)
downloadsynapse-ceb6b8680a8e419c3c132dcdb675517c5e9f69fd.tar.xz
Only use room_ids if in get_room_events_stream if is_guest
Diffstat (limited to 'synapse/storage/stream.py')
-rw-r--r--synapse/storage/stream.py5
1 files changed, 0 insertions, 5 deletions
diff --git a/synapse/storage/stream.py b/synapse/storage/stream.py
index e245d2f914..a60e662f7d 100644
--- a/synapse/storage/stream.py
+++ b/synapse/storage/stream.py
@@ -316,11 +316,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.