summary refs log tree commit diff
path: root/synapse/rest
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2015-01-29 17:41:48 +0000
committerMark Haines <mark.haines@matrix.org>2015-01-29 17:45:07 +0000
commit93ed31dda2e23742c3d7f3eee6ac6839682f0ce9 (patch)
tree185ebc6da02679b3bd3f7f9dd7c405624f925052 /synapse/rest
parentMerge branch 'develop' into client_v2_filter (diff)
downloadsynapse-93ed31dda2e23742c3d7f3eee6ac6839682f0ce9.tar.xz
Create a separate filter object to do the actual filtering, so that we can
split the storage and management of filters from the actual filter code
and don't have to load a filter from the db each time we filter an event
Diffstat (limited to 'synapse/rest')
-rw-r--r--synapse/rest/client/v2_alpha/filter.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/rest/client/v2_alpha/filter.py b/synapse/rest/client/v2_alpha/filter.py
index cee06ccaca..6ddc495d23 100644
--- a/synapse/rest/client/v2_alpha/filter.py
+++ b/synapse/rest/client/v2_alpha/filter.py
@@ -59,7 +59,7 @@ class GetFilterRestServlet(RestServlet):
                 filter_id=filter_id,
             )
 
-            defer.returnValue((200, filter))
+            defer.returnValue((200, filter.filter_json))
         except KeyError:
             raise SynapseError(400, "No such filter")