summary refs log tree commit diff
path: root/synapse/api
diff options
context:
space:
mode:
authorMark Haines <mjark@negativecurvature.net>2015-11-03 16:45:53 +0000
committerMark Haines <mjark@negativecurvature.net>2015-11-03 16:45:53 +0000
commit6797fcd9aba8cb9d4f2bf36a5b26846cca684b31 (patch)
tree919e47f9b059936785ce21a04001ef1454b5faef /synapse/api
parentMerge pull request #338 from matrix-org/daniel/fixdb (diff)
parentThat TODO was done (diff)
downloadsynapse-6797fcd9aba8cb9d4f2bf36a5b26846cca684b31.tar.xz
Merge pull request #335 from matrix-org/markjh/room_tags
Add APIs for adding and removing tags from rooms
Diffstat (limited to 'synapse/api')
-rw-r--r--synapse/api/filtering.py7
1 files changed, 7 insertions, 0 deletions
diff --git a/synapse/api/filtering.py b/synapse/api/filtering.py
index eb15d8c54a..e4e3d1c59d 100644
--- a/synapse/api/filtering.py
+++ b/synapse/api/filtering.py
@@ -147,6 +147,10 @@ class FilterCollection(object):
             self.filter_json.get("room", {}).get("ephemeral", {})
         )
 
+        self.room_private_user_data = Filter(
+            self.filter_json.get("room", {}).get("private_user_data", {})
+        )
+
         self.presence_filter = Filter(
             self.filter_json.get("presence", {})
         )
@@ -172,6 +176,9 @@ class FilterCollection(object):
     def filter_room_ephemeral(self, events):
         return self.room_ephemeral_filter.filter(events)
 
+    def filter_room_private_user_data(self, events):
+        return self.room_private_user_data.filter(events)
+
 
 class Filter(object):
     def __init__(self, filter_json):