diff options
| author | Andrew Morgan <andrew@amorgan.xyz> | 2019-01-25 11:09:53 +0000 |
|---|---|---|
| committer | Andrew Morgan <andrew@amorgan.xyz> | 2019-01-25 11:09:53 +0000 |
| commit | 821b65aeb51e744055e0eaaf9b528587fa494b20 (patch) | |
| tree | c4231f142f51d319c4b86c2dcc0e4fa691a3bed0 /synapse/api/auth.py | |
| parent | Move tag and direct state copying into separate function (diff) | |
| parent | Merge pull request #4415 from matrix-org/anoa/full_search_upgraded_rooms (diff) | |
| download | synapse-821b65aeb51e744055e0eaaf9b528587fa494b20.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into anoa/dm_room_upgrade
Diffstat (limited to 'synapse/api/auth.py')
| -rw-r--r-- | synapse/api/auth.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/synapse/api/auth.py b/synapse/api/auth.py index ba1019b9b2..e37b807c94 100644 --- a/synapse/api/auth.py +++ b/synapse/api/auth.py @@ -819,7 +819,9 @@ class Auth(object): elif threepid: # If the user does not exist yet, but is signing up with a # reserved threepid then pass auth check - if is_threepid_reserved(self.hs.config, threepid): + if is_threepid_reserved( + self.hs.config.mau_limits_reserved_threepids, threepid + ): return # Else if there is no room in the MAU bucket, bail current_mau = yield self.store.get_monthly_active_count() |