summary refs log tree commit diff
path: root/synapse/rest
diff options
context:
space:
mode:
Diffstat (limited to 'synapse/rest')
-rw-r--r--synapse/rest/__init__.py2
-rw-r--r--synapse/rest/base.py2
-rw-r--r--synapse/rest/room.py9
3 files changed, 5 insertions, 8 deletions
diff --git a/synapse/rest/__init__.py b/synapse/rest/__init__.py
index e391e5678d..a59630ec96 100644
--- a/synapse/rest/__init__.py
+++ b/synapse/rest/__init__.py
@@ -28,7 +28,7 @@ class RestServletFactory(object):
     speaking, they serve as wrappers around events and the handlers that
     process them.
 
-    See synapse.api.events for information on synapse events.
+    See synapse.events for information on synapse events.
     """
 
     def __init__(self, hs):
diff --git a/synapse/rest/base.py b/synapse/rest/base.py
index 72bb66ddda..06eda2587c 100644
--- a/synapse/rest/base.py
+++ b/synapse/rest/base.py
@@ -67,8 +67,6 @@ class RestServlet(object):
         self.auth = hs.get_auth()
         self.txns = HttpTransactionStore()
 
-        self.validator = hs.get_event_validator()
-
     def register(self, http_server):
         """ Register this servlet with the given HTTP server. """
         if hasattr(self, "PATTERN"):
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(),