DEV: Remove now-redundant is_staff check in can_invite_to_forum #33742
Conversation
This file contains hidden or 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
Drenmi
commented
Jul 22, 2025
| return false if !@user.in_any_groups?(SiteSetting.invite_allowed_groups_map) | ||
| return false if !SiteSetting.max_invites_per_day.to_i.positive? && !is_staff? | ||
|
|
||
| groups.blank? || groups.all? { |g| can_edit_group?(g) } |
There was a problem hiding this comment.
is_admin? is already checked for in can_edit_group?, no need to leak the logic into here.
Drenmi
commented
Jul 22, 2025
| (is_admin? || groups.blank? || groups.all? { |g| can_edit_group?(g) }) | ||
| return false if !authenticated? | ||
| return false if !@user.in_any_groups?(SiteSetting.invite_allowed_groups_map) | ||
| return false if !SiteSetting.max_invites_per_day.to_i.positive? && !is_staff? |
There was a problem hiding this comment.
I'm not sure this escape hatch for staff works in practice, because I didn't see any conditional in the rate-limiting logic, but leaving it here for now and can investigate separately.
martin-brennan
approved these changes
Jul 22, 2025
af6e0de to
59ce6ed
Compare
5592d5e to
7c827d3
Compare
eee6853 to
5dd2c53
Compare
5dd2c53 to
bd8d4ec
Compare
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.
What is this change?
We check for membership in
invite_allowed_groups, which hasadminsandmoderatorsas a mandatory value, so it's redundant to checkis_staff?as well.I also unfurled this one long conditional into multiple guard clauses.
The refactoring is covered by existing tests in
invite_guardian_spec.rb.