mirror of
https://github.com/element-hq/synapse
synced 2024-08-20 07:20:20 +00:00
Merge pull request #625 from matrix-org/erikj/kick_ban_sync
Always include kicks and bans in full /sync
This commit is contained in:
commit
beebc0a40f
1 changed files with 9 additions and 3 deletions
|
@ -209,9 +209,9 @@ class SyncHandler(BaseHandler):
|
||||||
key=None
|
key=None
|
||||||
)
|
)
|
||||||
|
|
||||||
membership_list = (Membership.INVITE, Membership.JOIN)
|
membership_list = (
|
||||||
if sync_config.filter_collection.include_leave:
|
Membership.INVITE, Membership.JOIN, Membership.LEAVE, Membership.BAN
|
||||||
membership_list += (Membership.LEAVE, Membership.BAN)
|
)
|
||||||
|
|
||||||
room_list = yield self.store.get_rooms_for_user_where_membership_is(
|
room_list = yield self.store.get_rooms_for_user_where_membership_is(
|
||||||
user_id=sync_config.user.to_string(),
|
user_id=sync_config.user.to_string(),
|
||||||
|
@ -257,6 +257,12 @@ class SyncHandler(BaseHandler):
|
||||||
invite=invite,
|
invite=invite,
|
||||||
))
|
))
|
||||||
elif event.membership in (Membership.LEAVE, Membership.BAN):
|
elif event.membership in (Membership.LEAVE, Membership.BAN):
|
||||||
|
# Always send down rooms we were banned or kicked from.
|
||||||
|
if not sync_config.filter_collection.include_leave:
|
||||||
|
if event.membership == Membership.LEAVE:
|
||||||
|
if sync_config.user.to_string() == event.sender:
|
||||||
|
continue
|
||||||
|
|
||||||
leave_token = now_token.copy_and_replace(
|
leave_token = now_token.copy_and_replace(
|
||||||
"room_key", "s%d" % (event.stream_ordering,)
|
"room_key", "s%d" % (event.stream_ordering,)
|
||||||
)
|
)
|
||||||
|
|
Loading…
Reference in a new issue