-
-
Notifications
You must be signed in to change notification settings - Fork 89
Adding /quarantine and /unquarantine #398
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
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
7486a0d
to
1eda98b
Compare
Tais993
requested changes
Feb 24, 2022
...n/src/main/java/org/togetherjava/tjbot/commands/moderation/RejoinModerationRoleListener.java
Outdated
Show resolved
Hide resolved
application/src/main/java/org/togetherjava/tjbot/commands/moderation/QuarantineCommand.java
Outdated
Show resolved
Hide resolved
application/src/main/java/org/togetherjava/tjbot/commands/moderation/UnquarantineCommand.java
Outdated
Show resolved
Hide resolved
CR tais
* used the wrong field (CR tais) * also renamed method slightly
Tais993
reviewed
Feb 25, 2022
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.
Mr Styling has returned, besides that;
I'm fine with ignoring the code duplication, so 👍 from me
application/src/main/java/org/togetherjava/tjbot/commands/moderation/QuarantineCommand.java
Outdated
Show resolved
Hide resolved
application/src/main/java/org/togetherjava/tjbot/commands/moderation/QuarantineCommand.java
Outdated
Show resolved
Hide resolved
application/src/main/java/org/togetherjava/tjbot/commands/moderation/UnquarantineCommand.java
Outdated
Show resolved
Hide resolved
application/src/main/java/org/togetherjava/tjbot/commands/moderation/UnquarantineCommand.java
Outdated
Show resolved
Hide resolved
Tais993
previously approved these changes
Feb 28, 2022
4954606
to
b39c387
Compare
SonarCloud Quality Gate failed. |
Tais993
approved these changes
Feb 28, 2022
One week has passed, merging |
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.
Overview
This adds the
/quarantine
and/unquarantine
commands. They act mostly as preparation for #394 , but should also aid as help for mods and staff to manually resolve situations.Quarantining is similar to muting, but will have subtle differences in how it is handled in the server, permission-wise. For example, a quarantined user might only be given access to a special
#quarantine_zone
channel, where he can talk to the moderators. Also, they will have less permissions than muted users, for example not being able to view any other channel anymore.Quarantines are permanent, but the code supports temporary quarantines as well (this will be interesting for the scam blocker).
Details
This is mostly a copy&paste&edit of mute. Touched stuff:
Commands:
QuarantineCommand
UnquarantineCommand
ModerationAction
ModerationUtils
To auto-revoke temporary quarantines:
TemporaryQuarantineAction
TemporaryModerationRoutine
To reapply the role after rejoin:
RejoinMuteListener
with quarantine into more generalRejoinModerationRoleListener
Config
This changed the config. See the template: