Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Do not calculate whether to create auto-rooms if there aren't any configured #15262

Merged
merged 2 commits into from
Mar 14, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/15262.misc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Skip processing of auto-join room behaviour if there are not auto-join rooms configured.
10 changes: 8 additions & 2 deletions synapse/handlers/register.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Comment on lines +599 to +601
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There's no work to do, so we avoid hitting the database at all.


# 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)
):
Comment on lines +609 to +612
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Inlining the await after we check the config potentially avoids database access if autocreate_auto_join_rooms is False.

count = await self.store.count_real_users()
should_auto_create_rooms = count == 1

Expand Down