diff options
| author | Erik Johnston <erik@matrix.org> | 2019-01-25 09:57:01 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2019-01-25 10:07:08 +0000 |
| commit | 62514bb81bfa631d5aaaee7126f43ee0e6a7f828 (patch) | |
| tree | 69514e969311bdee344e51a524969c73c0fdb066 /synapse/api | |
| parent | Review comments (diff) | |
| parent | Merge pull request #4448 from matrix-org/erikj/get_pdu_versions (diff) | |
| download | synapse-62514bb81bfa631d5aaaee7126f43ee0e6a7f828.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/msc_1813
Diffstat (limited to 'synapse/api')
| -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() |