From 2e83da8ba68b0a70718ea5fcb656f8ced26f1e56 Mon Sep 17 00:00:00 2001 From: Patrick Cloke Date: Thu, 19 Nov 2020 15:07:58 -0500 Subject: [PATCH] Fix a bug with generating display names. --- synapse/handlers/register.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/synapse/handlers/register.py b/synapse/handlers/register.py index aaf64a9737..5aac7d2a50 100644 --- a/synapse/handlers/register.py +++ b/synapse/handlers/register.py @@ -245,6 +245,8 @@ class RegistrationHandler(BaseHandler): else: # autogen a sequential user ID fail_count = 0 + # If a default display name is not given, generate one. + generate_display_name = default_display_name is None # This breaks on successful registration *or* errors after 10 failures. while True: # Fail after being unable to find a suitable ID a few times @@ -255,9 +257,7 @@ class RegistrationHandler(BaseHandler): user = UserID(localpart, self.hs.hostname) user_id = user.to_string() self.check_user_id_not_appservice_exclusive(user_id) - # TODO This looks incorrect since default_display_name can only - # ever be None for the first iteration. - if default_display_name is None: + if generate_display_name: default_display_name = localpart try: await self.register_with_store(