diff options
| author | Patrick Cloke <clokep@users.noreply.github.com> | 2021-09-30 14:06:02 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-30 14:06:02 -0400 |
| commit | 9e5a429c8b082d4cfbc0bd04c1ddde8822fd96b4 (patch) | |
| tree | 6508ffc646e0da0823f9dc81357fe9b490afa13e /synapse/handlers | |
| parent | Strip "join_authorised_via_users_server" from join events which do not need i... (diff) | |
| download | synapse-9e5a429c8b082d4cfbc0bd04c1ddde8822fd96b4.tar.xz | |
Clean-up registration tests (#10945)
Uses `override_config` and fixes test_auto_create_auto_join_where_no_consent to properly configure auto-join rooms.
Diffstat (limited to 'synapse/handlers')
| -rw-r--r-- | synapse/handlers/register.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/synapse/handlers/register.py b/synapse/handlers/register.py index 4a7ccb882e..cb4eb0720b 100644 --- a/synapse/handlers/register.py +++ b/synapse/handlers/register.py @@ -340,6 +340,8 @@ class RegistrationHandler(BaseHandler): auth_provider=(auth_provider_id or ""), ).inc() + # 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: logger.info( @@ -387,7 +389,7 @@ class RegistrationHandler(BaseHandler): "preset": self.hs.config.registration.autocreate_auto_join_room_preset, } - # If the configuration providers a user ID to create rooms with, use + # If the configuration provides a user ID to create rooms with, use # that instead of the first user registered. requires_join = False if self.hs.config.registration.auto_join_user_id: |