summary refs log tree commit diff
path: root/synapse/api
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2015-12-04 17:32:09 +0000
committerMark Haines <mark.haines@matrix.org>2015-12-04 17:32:09 +0000
commit660dee94afdcb1059cb7074f1428fbfaa8c57465 (patch)
tree54a003ae2494d9b27b5f8dfac2cc5f364adb9ff4 /synapse/api
parentMerge pull request #420 from matrix-org/markjh/resource_usage (diff)
downloadsynapse-660dee94afdcb1059cb7074f1428fbfaa8c57465.tar.xz
Only include the archived rooms if a include_leave flag in set in the filter
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()