FIX: chat direct message group user limit is off by 1 #27014
Merged
Conversation
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
github-actions
bot
added
chat
github-actions
bot
removed
the
i18n
dbattersby
changed the title
dbattersby
commented
Jun 3, 2024
| @@ -25,10 +25,11 @@ class AddUsersToChannel | |||
| contract | |||
| model :channel | |||
| policy :can_add_users_to_channel | |||
| model :users, optional: true | |||
| model :target_users, optional: true | |||
There was a problem hiding this comment.
Updated this to target_users to work with the MaxUsersExcessPolicy policy.
dbattersby
commented
Jun 3, 2024
| @@ -26,7 +26,11 @@ export default class NewGroup extends Component { | |||
| } else { | |||
| return acc + 1; | |||
| } | |||
| }, 1); | |||
| }, 0); | |||
There was a problem hiding this comment.
This is important as we want to set the default count to 0/N, previously it was 1/N to account for current user.
dbattersby
commented
Jun 3, 2024
| @@ -111,15 +111,16 @@ | |||
| user_1 = Fabricate(:user) | |||
| user_2 = Fabricate(:user) | |||
| user_3 = Fabricate(:user) | |||
| group = Fabricate(:public_group, users: [user_1, user_2]) | |||
| user_4 = Fabricate(:user) | |||
| group = Fabricate(:public_group, users: [user_1, user_2, user_3]) | |||
There was a problem hiding this comment.
Since max dm users is set to 3 in the before block, we should expect adding 4 users to be restricted.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This change allows the correct number of members to be added when creating a group direct message, based on the site setting
chat_max_direct_message_users.Previously we counted the current user within the max user limit. Therefore the count was off by 1:
Now we only show the users being added within the member count (not the current user):