Have the Filtering API return Deferreds, so we can do the Datastore implementation nicely

This commit is contained in:
Paul "LeoNerd" Evans 2015-01-27 16:17:56 +00:00
parent b1503112ce
commit 059651efa1
3 changed files with 22 additions and 7 deletions

View file

@ -54,10 +54,12 @@ class GetFilterRestServlet(RestServlet):
raise SynapseError(400, "Invalid filter_id")
try:
defer.returnValue((200, self.filtering.get_user_filter(
filter = yield self.filtering.get_user_filter(
user_localpart=target_user.localpart,
filter_id=filter_id,
)))
)
defer.returnValue((200, filter))
except KeyError:
raise SynapseError(400, "No such filter")
@ -89,7 +91,7 @@ class CreateFilterRestServlet(RestServlet):
except:
raise SynapseError(400, "Invalid filter definition")
filter_id = self.filtering.add_user_filter(
filter_id = yield self.filtering.add_user_filter(
user_localpart=target_user.localpart,
definition=content,
)