fix thinkos

2 files changed, 7 insertions, 7 deletions

diff --git a/synapse/handlers/register.py b/synapse/handlers/register.py
index a358bfc723..05e8f4ea73 100644
--- a/synapse/handlers/register.py
+++ b/synapse/handlers/register.py
@@ -515,10 +515,10 @@ class RegistrationHandler(BaseHandler):
     def _join_user_to_room(self, requester, room_identifier):
 
         # try to create the room if we're the first user on the server
-        if self.config.autocreate_auto_join_rooms:
+        if self.hs.config.autocreate_auto_join_rooms:
             count = yield self.store.count_all_users()
             if count == 1 and RoomAlias.is_valid(room_identifier):
-                room_creation_handler = hs.get_room_creation_handler()
+                room_creation_handler = self.hs.get_room_creation_handler()
                 info = yield room_creation_handler.create_room(
                     requester,
                     config={
@@ -528,11 +528,11 @@ class RegistrationHandler(BaseHandler):
                 )
                 room_id = info["room_id"]
 
-                directory_handler = hs.get_handlers().directory_handler
+                directory_handler = self.hs.get_handlers().directory_handler
+                room_alias = RoomAlias.from_string(room_identifier)
                 yield directory_handler.create_association(
-                    self,
-                    requester.user,
-                    room_identifier,
+                    requester.user.to_string(),
+                    room_alias,
                     room_id
                 )
 
diff --git a/synapse/storage/directory.py b/synapse/storage/directory.py
index cfb687cb53..61a029a53c 100644
--- a/synapse/storage/directory.py
+++ b/synapse/storage/directory.py
@@ -90,7 +90,7 @@ class DirectoryWorkerStore(SQLBaseStore):
 class DirectoryStore(DirectoryWorkerStore):
     @defer.inlineCallbacks
     def create_room_alias_association(self, room_alias, room_id, servers, creator=None):
-        """ Creates an associatin between  a room alias and room_id/servers
+        """ Creates an association between a room alias and room_id/servers
 
         Args:
             room_alias (RoomAlias)