Skip to content

timeout users on automod #418

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.

Sign up for GitHub

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 1 commit into from
Jul 12, 2023
Merged

timeout users on automod #418

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 19 additions & 39 deletions src/main/java/net/javadiscord/javabot/systems/moderation/AutoMod.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
import java.util.Objects;
import java.util.Scanner;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.TimeUnit;
import java.util.regex.Matcher;
import java.util.regex.Pattern;

Expand Down Expand Up @@ -103,19 +104,6 @@ private boolean canBypassAutomod(Member member) {
* @param message the {@link Message} that should be checked
*/
private void checkNewMessageAutomod(@Nonnull Message message) {
// mention spam
if (message.getMentions().getUsers().size() >= 5) {
new ModerationService(notificationService, botConfig.get(message.getGuild()), warnRepository, asyncPool)
.warn(
message.getAuthor(),
WarnSeverity.MEDIUM,
"Automod: Mention Spam",
message.getGuild().getMember(message.getJDA().getSelfUser()),
message.getChannel(),
false
);
}

// spam
message.getChannel().getHistory().retrievePast(10).queue(messages -> {
int spamCount = (int) messages.stream().filter(msg -> !msg.equals(message))
Expand All @@ -138,39 +126,31 @@ private void checkNewMessageAutomod(@Nonnull Message message) {
private void checkContentAutomod(@Nonnull Message message) {
//Check for Advertising Links
if (hasAdvertisingLink(message)) {
notificationService.withGuild(message.getGuild()).sendToModerationLog(c -> c.sendMessageFormat("Message: `%s`", message.getContentRaw()));
new ModerationService(notificationService, botConfig.get(message.getGuild()), warnRepository, asyncPool)
.warn(
message.getAuthor(),
WarnSeverity.MEDIUM,
"Automod: Advertising",
message.getGuild().getMember(message.getJDA().getSelfUser()),
message.getChannel(),
isSuggestionsChannel(message.getChannel())
);
message.delete().queue(success -> {
}, error -> log.info("Message was deleted before Automod was able to handle it."));


doAutomodActions(message,"Advertising");
}

//Check for suspicious Links
if (hasSuspiciousLink(message)) {
notificationService.withGuild(message.getGuild()).sendToModerationLog(c -> c.sendMessageFormat("Suspicious Link sent by: %s (`%s`)", message.getAuthor().getAsMention(), message.getContentRaw()));
new ModerationService(notificationService, botConfig.get(message.getGuild()), warnRepository, asyncPool)
.warn(
message.getAuthor(),
WarnSeverity.MEDIUM,
"Automod: Suspicious Link",
message.getGuild().getMember(message.getJDA().getSelfUser()),
message.getChannel(),
isSuggestionsChannel(message.getChannel())
);
message.delete().queue(success -> {
}, error -> log.info("Message was deleted before Automod was able to handle it."));
doAutomodActions(message, "Suspicious Link");
}
}

private void doAutomodActions(Message message, String reason) {
notificationService.withGuild(message.getGuild()).sendToModerationLog(c -> c.sendMessageFormat("Message by %s: `%s`", message.getAuthor().getAsMention(), message.getContentRaw()));
new ModerationService(notificationService, botConfig.get(message.getGuild()), warnRepository, asyncPool)
.warn(
message.getAuthor(),
WarnSeverity.MEDIUM,
"Automod: " + reason,
message.getGuild().getMember(message.getJDA().getSelfUser()),
message.getChannel(),
isSuggestionsChannel(message.getChannel())
);
message.delete().queue(success -> {
}, error -> log.info("Message was deleted before Automod was able to handle it."));
message.getMember().timeoutFor(30, TimeUnit.SECONDS).queue();
}

/**
* Handles potential spam messages.
*
Expand Down