Skip to content

Commit dd758d2

Browse files
committed
replies for /warn for non-staff members
1 parent 6365be2 commit dd758d2

File tree

4 files changed

+16
-1
lines changed

4 files changed

+16
-1
lines changed

src/main/java/net/javadiscord/javabot/systems/moderation/warn/DiscardAllWarnsSubcommand.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import net.javadiscord.javabot.systems.moderation.ModerationService;
1212
import net.javadiscord.javabot.systems.moderation.warn.dao.WarnRepository;
1313
import net.javadiscord.javabot.systems.notification.NotificationService;
14+
import net.javadiscord.javabot.util.Checks;
1415
import net.javadiscord.javabot.util.Responses;
1516

1617
import java.util.concurrent.ExecutorService;
@@ -54,6 +55,10 @@ public void execute(@NotNull SlashCommandInteractionEvent event) {
5455
Responses.replyGuildOnly(event).queue();
5556
return;
5657
}
58+
if(!Checks.hasStaffRole(botConfig, event.getMember())) {
59+
Responses.replyStaffOnly(event, botConfig.get(event.getGuild())).queue();
60+
return;
61+
}
5762
User target = userMapping.getAsUser();
5863
new ModerationService(notificationService, botConfig, event.getInteraction(), warnRepository, asyncPool).discardAllWarns(target, event.getMember());
5964
Responses.success(event, "Warns Discarded", "Successfully discarded all warns from **%s**.", UserUtils.getUserTag(target)).queue();

src/main/java/net/javadiscord/javabot/systems/moderation/warn/DiscardWarnByIdSubCommand.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import net.javadiscord.javabot.systems.moderation.ModerationService;
1010
import net.javadiscord.javabot.systems.moderation.warn.dao.WarnRepository;
1111
import net.javadiscord.javabot.systems.notification.NotificationService;
12+
import net.javadiscord.javabot.util.Checks;
1213
import net.javadiscord.javabot.util.Responses;
1314

1415
import java.util.concurrent.ExecutorService;
@@ -52,6 +53,10 @@ public void execute(@NotNull SlashCommandInteractionEvent event) {
5253
Responses.replyGuildOnly(event).queue();
5354
return;
5455
}
56+
if(!Checks.hasStaffRole(botConfig, event.getMember())) {
57+
Responses.replyStaffOnly(event, botConfig.get(event.getGuild())).queue();
58+
return;
59+
}
5560
int id = idMapping.getAsInt();
5661
ModerationService service = new ModerationService(notificationService, botConfig, event, warnRepository, asyncPool);
5762
if (service.discardWarnById(id, event.getUser())) {

src/main/java/net/javadiscord/javabot/systems/moderation/warn/WarnAddSubcommand.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public void execute(@NotNull SlashCommandInteractionEvent event) {
6969
return;
7070
}
7171
if(!Checks.hasStaffRole(botConfig, event.getMember())) {
72-
Responses.replyStaffOnly(event, botConfig.get(event.getGuild()));
72+
Responses.replyStaffOnly(event, botConfig.get(event.getGuild())).queue();
7373
return;
7474
}
7575
User target = userMapping.getAsUser();

src/main/java/net/javadiscord/javabot/systems/moderation/warn/WarnExportSubcommand.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
import net.javadiscord.javabot.systems.moderation.warn.dao.WarnRepository;
1616
import net.javadiscord.javabot.systems.moderation.warn.model.Warn;
1717
import net.javadiscord.javabot.systems.notification.NotificationService;
18+
import net.javadiscord.javabot.util.Checks;
1819
import net.javadiscord.javabot.util.ExceptionLogger;
1920
import net.javadiscord.javabot.util.Responses;
2021

@@ -71,6 +72,10 @@ public void execute(@NotNull SlashCommandInteractionEvent event) {
7172
Responses.replyGuildOnly(event).queue();
7273
return;
7374
}
75+
if(!Checks.hasStaffRole(botConfig, event.getMember())) {
76+
Responses.replyStaffOnly(event, botConfig.get(event.getGuild())).queue();
77+
return;
78+
}
7479
User target = userMapping.getAsUser();
7580
ModerationService service = new ModerationService(notificationService, botConfig, event, warnRepository, asyncPool);
7681
List<Warn> warns = service.getAllWarns(target.getIdLong());

0 commit comments

Comments
 (0)