diff options
| author | Erik Johnston <erik@matrix.org> | 2016-02-01 15:04:57 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-02-01 15:04:57 +0000 |
| commit | 498c2e60fdb05ca5314f22c0dcbce241db5d7307 (patch) | |
| tree | f35ba82eaa51d0b9c13ca043c3502a648e7ff555 /synapse/storage | |
| parent | Don't use before_token. Its wrong. Use actual limit. (diff) | |
| parent | Only use room_ids if in get_room_events_stream if is_guest (diff) | |
| download | synapse-498c2e60fdb05ca5314f22c0dcbce241db5d7307.tar.xz | |
Merge pull request #544 from matrix-org/erikj/stream_rooms
Only use room_ids if in get_room_events_stream if is_guest
Diffstat (limited to 'synapse/storage')
| -rw-r--r-- | synapse/storage/stream.py | 5 |
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. |