mirror of
https://github.com/element-hq/synapse
synced 2024-09-05 22:20:06 +00:00
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/sync
This commit is contained in:
commit
1ef7cae41b
1 changed files with 0 additions and 5 deletions
|
@ -323,11 +323,6 @@ class StreamStore(SQLBaseStore):
|
||||||
" WHERE m.user_id = ? AND m.membership = 'join'"
|
" WHERE m.user_id = ? AND m.membership = 'join'"
|
||||||
)
|
)
|
||||||
current_room_membership_args = [user_id]
|
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.
|
# We also want to get any membership events about that user, e.g.
|
||||||
# invites or leave notifications.
|
# invites or leave notifications.
|
||||||
|
|
Loading…
Reference in a new issue