summary refs log tree commit diff
path: root/synapse/handlers/register.py
diff options
context:
space:
mode:
authorPatrick Cloke <clokep@users.noreply.github.com>2021-10-04 07:18:54 -0400
committerGitHub <noreply@github.com>2021-10-04 07:18:54 -0400
commita0f48ee89d88fd7b6da8023dbba607a69073152e (patch)
tree107479097f59b480c0e1c6051db22fd9bd89b2ef /synapse/handlers/register.py
parentMerge remote-tracking branch 'origin/release-v1.44' into develop (diff)
downloadsynapse-a0f48ee89d88fd7b6da8023dbba607a69073152e.tar.xz
Use direct references for configuration variables (part 7). (#10959)
Diffstat (limited to 'synapse/handlers/register.py')
-rw-r--r--synapse/handlers/register.py9
1 files changed, 6 insertions, 3 deletions
diff --git a/synapse/handlers/register.py b/synapse/handlers/register.py

index cb4eb0720b..441af7a848 100644 --- a/synapse/handlers/register.py +++ b/synapse/handlers/register.py
@@ -116,8 +116,8 @@ class RegistrationHandler(BaseHandler): self._register_device_client = self.register_device_inner self.pusher_pool = hs.get_pusherpool() - self.session_lifetime = hs.config.session_lifetime - self.access_token_lifetime = hs.config.access_token_lifetime + self.session_lifetime = hs.config.registration.session_lifetime + self.access_token_lifetime = hs.config.registration.access_token_lifetime init_counters_for_auth_provider("") @@ -343,7 +343,10 @@ class RegistrationHandler(BaseHandler): # If the user does not need to consent at registration, auto-join any # configured rooms. if not self.hs.config.consent.user_consent_at_registration: - if not self.hs.config.auto_join_rooms_for_guests and make_guest: + if ( + not self.hs.config.registration.auto_join_rooms_for_guests + and make_guest + ): logger.info( "Skipping auto-join for %s because auto-join for guests is disabled", user_id,