summary refs log tree commit diff
diff options
context:
space:
mode:
authorMatthew Hodgson <matthew@matrix.org>2018-09-28 15:37:28 +0100
committerMatthew Hodgson <matthew@matrix.org>2018-09-28 15:37:28 +0100
commit8f646f2d04e7d21aa0570826bd78a0bbc3bb706b (patch)
tree44dcac16b1ff740642255d789a4566e4eaad449c
parentuntested stab at autocreating autojoin rooms (diff)
downloadsynapse-8f646f2d04e7d21aa0570826bd78a0bbc3bb706b.tar.xz
fix UTs
-rw-r--r--synapse/config/registration.py2
-rw-r--r--synapse/handlers/register.py13
2 files changed, 10 insertions, 5 deletions
diff --git a/synapse/config/registration.py b/synapse/config/registration.py
index 686c7fa9f7..dcf2374ed2 100644
--- a/synapse/config/registration.py
+++ b/synapse/config/registration.py
@@ -44,7 +44,7 @@ class RegistrationConfig(Config):
         )
 
         self.auto_join_rooms = config.get("auto_join_rooms", [])
-        self.autocreate_auto_join_rooms = config.get("autocreate_auto_join_rooms", true)
+        self.autocreate_auto_join_rooms = config.get("autocreate_auto_join_rooms", True)
 
     def default_config(self, **kwargs):
         registration_shared_secret = random_string_with_symbols(50)
diff --git a/synapse/handlers/register.py b/synapse/handlers/register.py
index 0e5337d26c..a358bfc723 100644
--- a/synapse/handlers/register.py
+++ b/synapse/handlers/register.py
@@ -50,8 +50,6 @@ class RegistrationHandler(BaseHandler):
         self._auth_handler = hs.get_auth_handler()
         self.profile_handler = hs.get_profile_handler()
         self.user_directory_handler = hs.get_user_directory_handler()
-        self._room_creation_handler = hs.get_room_creation_handler()
-        self._directory_handler = hs.get_handlers().directory_handler
         self.captcha_client = CaptchaServerHttpClient(hs)
 
         self._next_generated_user_id = None
@@ -520,7 +518,8 @@ class RegistrationHandler(BaseHandler):
         if self.config.autocreate_auto_join_rooms:
             count = yield self.store.count_all_users()
             if count == 1 and RoomAlias.is_valid(room_identifier):
-                info = yield self._room_creation_handler.create_room(
+                room_creation_handler = hs.get_room_creation_handler()
+                info = yield room_creation_handler.create_room(
                     requester,
                     config={
                         "preset": "public_chat",
@@ -529,7 +528,13 @@ class RegistrationHandler(BaseHandler):
                 )
                 room_id = info["room_id"]
 
-                yield create_association(self, requester.user, room_identifier, room_id)
+                directory_handler = hs.get_handlers().directory_handler
+                yield directory_handler.create_association(
+                    self,
+                    requester.user,
+                    room_identifier,
+                    room_id
+                )
 
         room_id = None
         room_member_handler = self.hs.get_room_member_handler()