diff --git a/synapse/handlers/sync.py b/synapse/handlers/sync.py
index 5ca2606443..6cb756e476 100644
--- a/synapse/handlers/sync.py
+++ b/synapse/handlers/sync.py
@@ -175,9 +175,12 @@ class SyncHandler(BaseHandler):
)
room_list = yield self.store.get_rooms_for_user_where_membership_is(
user_id=sync_config.user.to_string(),
- membership_list=[
- Membership.INVITE, Membership.JOIN, Membership.LEAVE
- ]
+ membership_list=(
+ Membership.INVITE,
+ Membership.JOIN,
+ Membership.LEAVE,
+ Membership.BAN
+ )
)
joined = []
@@ -195,7 +198,7 @@ class SyncHandler(BaseHandler):
room_id=event.room_id,
invite=invite,
))
- elif event.membership == Membership.LEAVE:
+ elif event.membership in (Membership.LEAVE, Membership.BAN):
leave_token = now_token.copy_and_replace(
"room_key", "s%d" % (event.stream_ordering,)
)
@@ -327,7 +330,7 @@ class SyncHandler(BaseHandler):
and event.state_key == sync_config.user.to_string()):
if event.membership == Membership.INVITE:
invite_events.append(event)
- elif event.membership == Membership.LEAVE:
+ elif event.membership in (Membership.LEAVE, Membership.BAN):
leave_events.append(event)
for room_id in joined_room_ids:
@@ -362,7 +365,7 @@ class SyncHandler(BaseHandler):
sync_config.user.to_string()
)
- leave_events = yield self.store.get_leave_events_for_user(
+ leave_events = yield self.store.get_leave_and_ban_events_for_user(
sync_config.user.to_string()
)
diff --git a/synapse/storage/roommember.py b/synapse/storage/roommember.py
index 623400fd36..ae1ad56d9a 100644
--- a/synapse/storage/roommember.py
+++ b/synapse/storage/roommember.py
@@ -124,7 +124,7 @@ class RoomMemberStore(SQLBaseStore):
invites.event_id for invite in invites
]))
- def get_leave_events_for_user(self, user_id):
+ def get_leave_and_ban_events_for_user(self, user_id):
""" Get all the leave events for a user
Args:
user_id (str): The user ID.
@@ -132,7 +132,7 @@ class RoomMemberStore(SQLBaseStore):
A deferred list of event objects.
"""
return self.get_rooms_for_user_where_membership_is(
- user_id, [Membership.LEAVE]
+ user_id, (Membership.LEAVE, Membership.BAN)
).addCallback(lambda leaves: self._get_events([
leave.event_id for leave in leaves
]))
|
