diff options
| author | Erik Johnston <erik@matrix.org> | 2014-09-06 18:18:55 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-09-06 18:18:55 +0100 |
| commit | d12feed6235ec91e9797a47c98e9da162b6559c9 (patch) | |
| tree | 57f47c24ee7a402f210d7cb07f08521dfba6867c /synapse/rest/room.py | |
| parent | Minor spec tweaks. (diff) | |
| parent | Center recaptcha dialog. (diff) | |
| download | synapse-d12feed6235ec91e9797a47c98e9da162b6559c9.tar.xz | |
Merge branch 'release-v0.2.2' of github.com:matrix-org/synapse v0.2.2
Diffstat (limited to 'synapse/rest/room.py')
| -rw-r--r-- | synapse/rest/room.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/synapse/rest/room.py b/synapse/rest/room.py index 308b447090..cef700c81c 100644 --- a/synapse/rest/room.py +++ b/synapse/rest/room.py @@ -154,14 +154,14 @@ class RoomStateEventRestServlet(RestServlet): # membership events are special handler = self.handlers.room_member_handler yield handler.change_membership(event) - defer.returnValue((200, "")) + defer.returnValue((200, {})) else: # store random bits of state msg_handler = self.handlers.message_handler yield msg_handler.store_room_data( event=event ) - defer.returnValue((200, "")) + defer.returnValue((200, {})) # TODO: Needs unit testing for generic events + feedback @@ -249,7 +249,7 @@ class JoinRoomAliasServlet(RestServlet): ) handler = self.handlers.room_member_handler yield handler.change_membership(event) - defer.returnValue((200, "")) + defer.returnValue((200, {})) @defer.inlineCallbacks def on_PUT(self, request, room_identifier, txn_id): @@ -416,7 +416,7 @@ class RoomMembershipRestServlet(RestServlet): ) handler = self.handlers.room_member_handler yield handler.change_membership(event) - defer.returnValue((200, "")) + defer.returnValue((200, {})) @defer.inlineCallbacks def on_PUT(self, request, room_id, membership_action, txn_id): |