This repository has been archived by the owner on Apr 26, 2024. It is now read-only.
-
-
Notifications
You must be signed in to change notification settings - Fork 2.1k
Do not calculate whether to create auto-rooms if there aren't any configured #15262
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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) | ||
): | ||
Comment on lines
+609
to
+612
There was a problem hiding this comment. Choose a reason for hiding this commentThe 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 |
||
count = await self.store.count_real_users() | ||
should_auto_create_rooms = count == 1 | ||
|
||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
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.