Merge branch 'develop' of github.com:matrix-org/synapse into erikj/faster_typing

1 files changed, 1 insertions, 0 deletions

diff --git a/synapse/api/filtering.py b/synapse/api/filtering.py

index 186831e118..a31a9a17e0 100644
--- a/synapse/api/filtering.py
+++ b/synapse/api/filtering.py
@@ -251,6 +251,7 @@ class FilterCollection(object):
             "include_leave", False
         )
         self.event_fields = filter_json.get("event_fields", [])
+        self.event_format = filter_json.get("event_format", "client")
 
     def __repr__(self):
         return "<FilterCollection %s>" % (json.dumps(self._filter_json),)