diff options
| author | Kegsay <kegsay@gmail.com> | 2015-03-02 14:56:32 +0000 |
|---|---|---|
| committer | Kegsay <kegsay@gmail.com> | 2015-03-02 14:56:32 +0000 |
| commit | 8ad024ea80ab8f9747472df3e96154b51c04ae13 (patch) | |
| tree | cfc962d742805c866885aae7b4ec41dd4400e94e /synapse/handlers/register.py | |
| parent | Merge pull request #88 from matrix-org/batched_get_pdu (diff) | |
| parent | Wording tweaks (diff) | |
| download | synapse-8ad024ea80ab8f9747472df3e96154b51c04ae13.tar.xz | |
Merge pull request #93 from matrix-org/application-services-exclusive
Application services exclusive flag support
Diffstat (limited to 'synapse/handlers/register.py')
| -rw-r--r-- | synapse/handlers/register.py | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/synapse/handlers/register.py b/synapse/handlers/register.py index 516a936cee..cda4a8502a 100644 --- a/synapse/handlers/register.py +++ b/synapse/handlers/register.py @@ -201,11 +201,12 @@ class RegistrationHandler(BaseHandler): interested_services = [ s for s in services if s.is_interested_in_user(user_id) ] - if len(interested_services) > 0: - raise SynapseError( - 400, "This user ID is reserved by an application service.", - errcode=Codes.EXCLUSIVE - ) + for service in interested_services: + if service.is_exclusive_user(user_id): + raise SynapseError( + 400, "This user ID is reserved by an application service.", + errcode=Codes.EXCLUSIVE + ) def _generate_token(self, user_id): # urlsafe variant uses _ and - so use . as the separator and replace |