summary refs log tree commit diff
path: root/synapse/api
diff options
context:
space:
mode:
authorMark Haines <mjark@negativecurvature.net>2015-12-07 13:16:03 +0000
committerMark Haines <mjark@negativecurvature.net>2015-12-07 13:16:03 +0000
commitf7a1cdbbc6f4403ea15ccb9a204630c658d96574 (patch)
tree47abca58487c517936dec82212a04d174feef73c /synapse/api
parentMerge remote-tracking branch 'origin/master' into develop (diff)
parentOnly include the archived rooms if a include_leave flag in set in the filter (diff)
downloadsynapse-f7a1cdbbc6f4403ea15ccb9a204630c658d96574.tar.xz
Merge pull request #423 from matrix-org/markjh/archived_flag
Only include the archived rooms if a include_leave flag in set in the…
Diffstat (limited to 'synapse/api')
-rw-r--r--synapse/api/filtering.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/synapse/api/filtering.py b/synapse/api/filtering.py

index 19f30c273c..bc03d6c287 100644 --- a/synapse/api/filtering.py +++ b/synapse/api/filtering.py
@@ -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()