From 0c3fa5437db29d631bdaaeac973090123f6a4d97 Mon Sep 17 00:00:00 2001 From: Patrick Cloke Date: Mon, 13 Mar 2023 14:52:57 -0400 Subject: [PATCH 1/2] Do not calculate whether to create auto-rooms if there aren't any configured. --- synapse/handlers/register.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/synapse/handlers/register.py b/synapse/handlers/register.py index e4e506e62c5e..6b110dcb6e4d 100644 --- a/synapse/handlers/register.py +++ b/synapse/handlers/register.py @@ -596,14 +596,20 @@ async def _auto_join_rooms(self, user_id: str) -> None: Args: user_id: The user to join """ + # If there are no rooms to auto-join, just bail. + if not self.hs.config.registration.auto_join_rooms: + return + # auto-join the user to any rooms we're supposed to dump them into # try to create the room if we're the first real user on the server. Note # that an auto-generated support or bot user is not a real user and will never be # the user to create the room should_auto_create_rooms = False - is_real_user = await self.store.is_real_user(user_id) - if self.hs.config.registration.autocreate_auto_join_rooms and is_real_user: + if ( + self.hs.config.registration.autocreate_auto_join_rooms + and await self.store.is_real_user(user_id) + ): count = await self.store.count_real_users() should_auto_create_rooms = count == 1 From fc3413cfe65e28d8da86c926f421ebe0e138db2a Mon Sep 17 00:00:00 2001 From: Patrick Cloke Date: Mon, 13 Mar 2023 14:54:05 -0400 Subject: [PATCH 2/2] Newsfragment --- changelog.d/15262.misc | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/15262.misc diff --git a/changelog.d/15262.misc b/changelog.d/15262.misc new file mode 100644 index 000000000000..d519f151c454 --- /dev/null +++ b/changelog.d/15262.misc @@ -0,0 +1 @@ +Skip processing of auto-join room behaviour if there are not auto-join rooms configured.