DEV: Remove now-redundant is_staff check #33786
Merged
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 23, 2025
Comment on lines
+437
to
+438
| from_bot || from_system || notify_moderators || | ||
| @user.in_any_groups?(SiteSetting.personal_message_enabled_groups_map) |
There was a problem hiding this comment.
Removed is_staff? and moved notify_moderators condition because they can all fit on one line without awkward formatting. 😅
Drenmi
commented
Jul 23, 2025
Comment on lines
-98
to
-103
| it "disallows pms to other users if trust level is not met" do | ||
| SiteSetting.personal_message_enabled_groups = Group::AUTO_GROUPS[:trust_level_2] | ||
| user.update!(trust_level: TrustLevel[1]) | ||
| Group.user_trust_level_change!(user.id, TrustLevel[1]) | ||
| expect(Guardian.new(user).can_send_private_message?(another_user)).to be_falsey | ||
| end |
There was a problem hiding this comment.
This is a duplicate of https://github.com/discourse/discourse/blob/main/spec/lib/guardian_spec.rb#L87-L92
CvX
approved these changes
Jul 23, 2025
martin-brennan
approved these changes
Jul 24, 2025
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?
The
personal_message_enabled_groupssetting now hasadminsandmoderatorsas mandatory values, so we don't need to check foris_staff?as well.Also removes a duplicated test case.