summary refs log tree commit diff
path: root/synapse/rest
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2015-01-29 18:04:07 +0000
committerMark Haines <mark.haines@matrix.org>2015-01-29 18:04:07 +0000
commit7ceda8bf3d133ce85beed8aa432b87eee651744d (patch)
treef69694a4cb71fecb66236af646377a2a2a548ec6 /synapse/rest
parentFix indent (diff)
parentCreate a separate filter object to do the actual filtering, so that we can (diff)
downloadsynapse-7ceda8bf3d133ce85beed8aa432b87eee651744d.tar.xz
Merge branch 'client_v2_filter' into client_v2_sync
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")