diff options
| author | David Robertson <davidr@element.io> | 2021-10-07 17:20:15 +0100 |
|---|---|---|
| committer | David Robertson <davidr@element.io> | 2021-10-07 17:20:15 +0100 |
| commit | 0e68a4b162694d7b3ab809b7f834929d93debe60 (patch) | |
| tree | 35936fad9c5f6255cf2f14d6f7ad3a2afadb5afe /synapse/config/registration.py | |
| parent | Pin mypy versions (diff) | |
| parent | Ensure each cache config test uses separate state. (#11019) (diff) | |
| download | synapse-0e68a4b162694d7b3ab809b7f834929d93debe60.tar.xz | |
Merge branch 'develop' into dmr/typing/wip
Diffstat (limited to 'synapse/config/registration.py')
| -rw-r--r-- | synapse/config/registration.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/synapse/config/registration.py b/synapse/config/registration.py index 7cffdacfa5..a3d2a38c4c 100644 --- a/synapse/config/registration.py +++ b/synapse/config/registration.py @@ -45,7 +45,10 @@ class RegistrationConfig(Config): account_threepid_delegates = config.get("account_threepid_delegates") or {} self.account_threepid_delegate_email = account_threepid_delegates.get("email") self.account_threepid_delegate_msisdn = account_threepid_delegates.get("msisdn") - if self.account_threepid_delegate_msisdn and not self.public_baseurl: + if ( + self.account_threepid_delegate_msisdn + and not self.root.server.public_baseurl + ): raise ConfigError( "The configuration option `public_baseurl` is required if " "`account_threepid_delegate.msisdn` is set, such that " @@ -85,7 +88,7 @@ class RegistrationConfig(Config): if mxid_localpart: # Convert the localpart to a full mxid. self.auto_join_user_id = UserID( - mxid_localpart, self.server_name + mxid_localpart, self.root.server.server_name ).to_string() if self.autocreate_auto_join_rooms: |