diff options
| author | Erik Johnston <erik@matrix.org> | 2019-01-24 18:52:34 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2019-01-24 18:52:34 +0000 |
| commit | efb8ed1d453fc9f76f9e9225532281963b7ea53c (patch) | |
| tree | 62626873812dfce5f24b556b406b47a47159b214 /synapse/rest/client | |
| parent | Replace missed usages of FrozenEvent (diff) | |
| parent | Merge pull request #4448 from matrix-org/erikj/get_pdu_versions (diff) | |
| download | synapse-efb8ed1d453fc9f76f9e9225532281963b7ea53c.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/require_format_version
Diffstat (limited to 'synapse/rest/client')
| -rw-r--r-- | synapse/rest/client/v2_alpha/register.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/synapse/rest/client/v2_alpha/register.py b/synapse/rest/client/v2_alpha/register.py index 14025cd219..7f812b8209 100644 --- a/synapse/rest/client/v2_alpha/register.py +++ b/synapse/rest/client/v2_alpha/register.py @@ -416,8 +416,11 @@ class RegisterRestServlet(RestServlet): ) # Necessary due to auth checks prior to the threepid being # written to the db - if is_threepid_reserved(self.hs.config, threepid): - yield self.store.upsert_monthly_active_user(registered_user_id) + if threepid: + if is_threepid_reserved( + self.hs.config.mau_limits_reserved_threepids, threepid + ): + yield self.store.upsert_monthly_active_user(registered_user_id) # remember that we've now registered that user account, and with # what user ID (since the user may not have specified) |