mirrors/synapse
1
0
Fork 0
mirror of https://github.com/element-hq/synapse.git synced 2024-11-27 12:08:32 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #423 from matrix-org/markjh/archived_flag

Browse source 
Only include the archived rooms if a include_leave flag in set in the…
This commit is contained in:
Mark Haines 2015-12-07 13:16:03 +00:00
commit f7a1cdbbc6
2 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
synapse/api/filtering.py
View file

@ -143,6 +143,10 @@ class FilterCollection(object):
self.filter_json.get("account_data", {}) self.filter_json.get("account_data", {})
) )
self.include_leave = self.filter_json.get("room", {}).get(
"include_leave", False
)
def timeline_limit(self): def timeline_limit(self):
return self.room_timeline_filter.limit() return self.room_timeline_filter.limit()

12
synapse/handlers/sync.py
View file

@ -186,14 +186,14 @@ class SyncHandler(BaseHandler):
pagination_config=pagination_config.get_source_config("presence"), pagination_config=pagination_config.get_source_config("presence"),
key=None 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( 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(),
membership_list=( membership_list=membership_list
Membership.INVITE,
Membership.JOIN,
Membership.LEAVE,
Membership.BAN
)
) )
account_data, account_data_by_room = ( account_data, account_data_by_room = (