summary refs log tree commit diff
path: root/synapse/rest/room.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2014-12-16 11:29:05 +0000
committerErik Johnston <erik@matrix.org>2014-12-16 11:29:05 +0000
commit3c77d13aa5375274e267a0ea898ce6267fb67cdc (patch)
tree28b958507d705a5a92fd167191e1d62d98fe644c /synapse/rest/room.py
parentAdd fixme to raising of AuthError in federation land (diff)
downloadsynapse-3c77d13aa5375274e267a0ea898ce6267fb67cdc.tar.xz
Kill off synapse.api.events.*
Diffstat (limited to 'synapse/rest/room.py')
-rw-r--r--synapse/rest/room.py9
1 files changed, 4 insertions, 5 deletions
diff --git a/synapse/rest/room.py b/synapse/rest/room.py
index 1a527d27c1..0e2d5fbaae 100644
--- a/synapse/rest/room.py
+++ b/synapse/rest/room.py
@@ -19,8 +19,7 @@ from twisted.internet import defer
 from base import RestServlet, client_path_pattern
 from synapse.api.errors import SynapseError, Codes
 from synapse.streams.config import PaginationConfig
-from synapse.api.events.room import RoomMemberEvent, RoomRedactionEvent
-from synapse.api.constants import Membership
+from synapse.api.constants import EventTypes, Membership
 
 import json
 import logging
@@ -239,7 +238,7 @@ class JoinRoomAliasServlet(RestServlet):
             msg_handler = self.handlers.message_handler
             yield msg_handler.create_and_send_event(
                 {
-                    "type": RoomMemberEvent.TYPE,
+                    "type": EventTypes.Member,
                     "content": {"membership": Membership.JOIN},
                     "room_id": identifier.to_string(),
                     "sender": user.to_string(),
@@ -403,7 +402,7 @@ class RoomMembershipRestServlet(RestServlet):
         msg_handler = self.handlers.message_handler
         yield msg_handler.create_and_send_event(
             {
-                "type": RoomMemberEvent.TYPE,
+                "type": EventTypes.Member,
                 "content": {"membership": unicode(membership_action)},
                 "room_id": room_id,
                 "sender": user.to_string(),
@@ -441,7 +440,7 @@ class RoomRedactEventRestServlet(RestServlet):
         msg_handler = self.handlers.message_handler
         event = yield msg_handler.create_and_send_event(
             {
-                "type": RoomRedactionEvent.TYPE,
+                "type": EventTypes.Redaction,
                 "content": content,
                 "room_id": room_id,
                 "sender": user.to_string(),