summary refs log tree commit diff
path: root/synapse/api
diff options
context:
space:
mode:
authorMark Haines <mjark@negativecurvature.net>2015-11-19 15:21:35 +0000
committerMark Haines <mjark@negativecurvature.net>2015-11-19 15:21:35 +0000
commit7a802ec0ff394e763218122a6f90c07f8a9b7532 (patch)
treee0c699beeacdcc35ca77f8563d1611fd82811f0a /synapse/api
parentMerge pull request #382 from matrix-org/daniel/macarooncleanup (diff)
parentRename the database table (diff)
downloadsynapse-7a802ec0ff394e763218122a6f90c07f8a9b7532.tar.xz
Merge pull request #386 from matrix-org/markjh/rename_pud_to_account_data
s/private_user_data/account_data/
Diffstat (limited to 'synapse/api')
-rw-r--r--synapse/api/filtering.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/synapse/api/filtering.py b/synapse/api/filtering.py
index aaa2433cae..18f2ec3ae8 100644
--- a/synapse/api/filtering.py
+++ b/synapse/api/filtering.py
@@ -54,7 +54,7 @@ class Filtering(object):
         ]
 
         room_level_definitions = [
-            "state", "timeline", "ephemeral", "private_user_data"
+            "state", "timeline", "ephemeral", "account_data"
         ]
 
         for key in top_level_definitions:
@@ -131,8 +131,8 @@ 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.room_account_data = Filter(
+            self.filter_json.get("room", {}).get("account_data", {})
         )
 
         self.presence_filter = Filter(
@@ -160,8 +160,8 @@ 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)
+    def filter_room_account_data(self, events):
+        return self.room_account_data.filter(events)
 
 
 class Filter(object):