diff options
author | Mark Haines <mark.haines@matrix.org> | 2015-12-01 19:15:27 +0000 |
---|---|---|
committer | Mark Haines <mark.haines@matrix.org> | 2015-12-01 19:15:27 +0000 |
commit | f73ea0bda26a51794abedb65cbf4d0a717dee26c (patch) | |
tree | 64fd41675594a7c71a7f119fb68b5b476f9173fd /synapse/api | |
parent | Only fire user_joined_room on the distributor if the user has actually joined... (diff) | |
parent | Merge pull request #392 from matrix-org/markjh/client_config (diff) | |
download | synapse-f73ea0bda26a51794abedb65cbf4d0a717dee26c.tar.xz |
Merge branch 'develop' into markjh/edu_frequency
Diffstat (limited to 'synapse/api')
-rw-r--r-- | synapse/api/filtering.py | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/synapse/api/filtering.py b/synapse/api/filtering.py index 18f2ec3ae8..19f30c273c 100644 --- a/synapse/api/filtering.py +++ b/synapse/api/filtering.py @@ -50,7 +50,7 @@ class Filtering(object): # many definitions. top_level_definitions = [ - "presence" + "presence", "account_data" ] room_level_definitions = [ @@ -139,6 +139,10 @@ class FilterCollection(object): self.filter_json.get("presence", {}) ) + self.account_data = Filter( + self.filter_json.get("account_data", {}) + ) + def timeline_limit(self): return self.room_timeline_filter.limit() @@ -151,6 +155,9 @@ class FilterCollection(object): def filter_presence(self, events): return self.presence_filter.filter(events) + def filter_account_data(self, events): + return self.account_data.filter(events) + def filter_room_state(self, events): return self.room_state_filter.filter(events) |