Skip to content

filter out audit log entries in moderation log earlier #465

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
Jan 26, 2024
Merged

filter out audit log entries in moderation log earlier #465

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
15 changes: 9 additions & 6 deletions src/main/java/net/discordjug/javabot/systems/moderation/DiscordModerationLogListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,15 @@

import java.time.Duration;
import java.time.ZonedDateTime;
import java.util.EnumSet;
import java.util.concurrent.ExecutorService;

import lombok.RequiredArgsConstructor;
import net.discordjug.javabot.data.config.BotConfig;
import net.discordjug.javabot.systems.moderation.warn.dao.WarnRepository;
import net.discordjug.javabot.systems.notification.NotificationService;
import net.discordjug.javabot.util.ExceptionLogger;
import net.dv8tion.jda.api.audit.ActionType;
import net.dv8tion.jda.api.audit.AuditLogChange;
import net.dv8tion.jda.api.audit.AuditLogEntry;
import net.dv8tion.jda.api.events.guild.GuildAuditLogEntryCreateEvent;
Expand All @@ -26,7 +29,6 @@ public class DiscordModerationLogListener extends ListenerAdapter{

@Override
public void onGuildAuditLogEntryCreate(GuildAuditLogEntryCreateEvent event) {

ModerationService moderationService = new ModerationService(notificationService, botConfig.get(event.getGuild()), warnRepository, asyncPool);

AuditLogEntry entry = event.getEntry();
Expand All @@ -35,6 +37,9 @@ public void onGuildAuditLogEntryCreate(GuildAuditLogEntryCreateEvent event) {
if (moderatorUserId == event.getJDA().getSelfUser().getIdLong()) {
return;
}
if (!EnumSet.of(ActionType.KICK, ActionType.BAN, ActionType.UNBAN, ActionType.MEMBER_UPDATE).contains(entry.getType())) {
return;
}
event.getJDA().retrieveUserById(targetUserId).queue(targetUser -> {
event.getGuild().retrieveMemberById(moderatorUserId).queue(moderator -> {
String reason = entry.getReason();
Expand All @@ -56,11 +61,9 @@ public void onGuildAuditLogEntryCreate(GuildAuditLogEntryCreateEvent event) {
}
}
}
default -> {}
default -> ExceptionLogger.capture(new IllegalStateException("Unexpected audit log entry: "+entry.getType()), getClass().getName());
}
});
});

}, e -> ExceptionLogger.capture(e, getClass().getName()));
}, e -> ExceptionLogger.capture(e, getClass().getName()));
}

}