tileradotorg/synapse
1
0
Fork 0
forked from MirrorHub/synapse
Code Pull requests Activity

move guard out of is_threepid_reserved and into register.py

Browse source
This commit is contained in:
Neil Johnson 2019-01-22 17:47:00 +00:00
parent d619b113ed
commit c99c2d58d7
3 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
changelog.d/4435.bugfix
View file

@ -1 +1 @@
Fix None guard in config.server.is_threepid_reserved Fix None guard in calling config.server.is_threepid_reserved

2
synapse/config/server.py
View file

@ -429,8 +429,6 @@ def is_threepid_reserved(reserved_threepids, threepid):
Returns: Returns:
boolean Is the threepid undertest reserved_user boolean Is the threepid undertest reserved_user
""" """
if not threepid:
return False
for tp in reserved_threepids: for tp in reserved_threepids:
if (threepid['medium'] == tp['medium'] and threepid['address'] == tp['address']): if (threepid['medium'] == tp['medium'] and threepid['address'] == tp['address']):

9
synapse/rest/client/v2_alpha/register.py
View file

@ -416,10 +416,11 @@ class RegisterRestServlet(RestServlet):
) )
# Necessary due to auth checks prior to the threepid being # Necessary due to auth checks prior to the threepid being
# written to the db # written to the db
if is_threepid_reserved( if threepid:
self.hs.config.mau_limits_reserved_threepids, threepid if is_threepid_reserved(
): self.hs.config.mau_limits_reserved_threepids, threepid
yield self.store.upsert_monthly_active_user(registered_user_id) ):
yield self.store.upsert_monthly_active_user(registered_user_id)
# remember that we've now registered that user account, and with # remember that we've now registered that user account, and with
# what user ID (since the user may not have specified) # what user ID (since the user may not have specified)