summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorNeil Johnson <neil@matrix.org>2019-01-22 17:47:00 +0000
committerNeil Johnson <neil@matrix.org>2019-01-22 17:47:00 +0000
commitc99c2d58d775a7a7bcbcae426fed608d6a0e8ee3 (patch)
treed58f70cc03c5bfbac2511a2facbefea084eda72e /synapse
parentFix None guard in config.server.is_threepid_reserved (diff)
downloadsynapse-c99c2d58d775a7a7bcbcae426fed608d6a0e8ee3.tar.xz
move guard out of is_threepid_reserved and into register.py
Diffstat (limited to 'synapse')
-rw-r--r--synapse/config/server.py2
-rw-r--r--synapse/rest/client/v2_alpha/register.py9
2 files changed, 5 insertions, 6 deletions
diff --git a/synapse/config/server.py b/synapse/config/server.py
index 927c54ee5b..a915bb8b64 100644
--- a/synapse/config/server.py
+++ b/synapse/config/server.py
@@ -429,8 +429,6 @@ def is_threepid_reserved(reserved_threepids, threepid):
     Returns:
         boolean Is the threepid undertest reserved_user
     """
-    if not threepid:
-        return False
 
     for tp in reserved_threepids:
         if (threepid['medium'] == tp['medium'] and threepid['address'] == tp['address']):
diff --git a/synapse/rest/client/v2_alpha/register.py b/synapse/rest/client/v2_alpha/register.py
index 3ab253462b..7f812b8209 100644
--- a/synapse/rest/client/v2_alpha/register.py
+++ b/synapse/rest/client/v2_alpha/register.py
@@ -416,10 +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.mau_limits_reserved_threepids, 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)