Merge pull request #423 from matrix-org/markjh/archived_flag
Only include the archived rooms if a include_leave flag in set in the…
This commit is contained in:
commit
f7a1cdbbc6
|
@ -143,6 +143,10 @@ class FilterCollection(object):
|
|||
self.filter_json.get("account_data", {})
|
||||
)
|
||||
|
||||
self.include_leave = self.filter_json.get("room", {}).get(
|
||||
"include_leave", False
|
||||
)
|
||||
|
||||
def timeline_limit(self):
|
||||
return self.room_timeline_filter.limit()
|
||||
|
||||
|
|
|
@ -186,14 +186,14 @@ class SyncHandler(BaseHandler):
|
|||
pagination_config=pagination_config.get_source_config("presence"),
|
||||
key=None
|
||||
)
|
||||
|
||||
membership_list = (Membership.INVITE, Membership.JOIN)
|
||||
if sync_config.filter.include_leave:
|
||||
membership_list += (Membership.LEAVE, Membership.BAN)
|
||||
|
||||
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.BAN
|
||||
)
|
||||
membership_list=membership_list
|
||||
)
|
||||
|
||||
account_data, account_data_by_room = (
|
||||
|
|
Loading…
Reference in New Issue