Skip to content

Commit 44f77e0

Browse files
combined ModerateUserCommand logic with requireStaff
1 parent db8cea0 commit 44f77e0

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

src/main/java/net/javadiscord/javabot/systems/moderation/ModerateCommand.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,5 +41,9 @@ protected void setRequireStaff(boolean requireStaff) {
4141
this.requireStaff = requireStaff;
4242
}
4343

44+
protected boolean isRequireStaff() {
45+
return requireStaff;
46+
}
47+
4448
protected abstract ReplyCallbackAction handleModerationCommand(@NotNull SlashCommandInteractionEvent event, @NotNull Member moderator);
4549
}

src/main/java/net/javadiscord/javabot/systems/moderation/ModerateUserCommand.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ protected ReplyCallbackAction handleModerationCommand(@NotNull SlashCommandInter
3030
return Responses.error(event, "You cannot perform this action on yourself.");
3131
}
3232
Objects.requireNonNull(event.getGuild()).retrieveMemberById(target.getIdLong()).queue(targetMember -> {
33-
if (targetMember.isOwner() || !moderator.canInteract(targetMember)) {
33+
if (isRequireStaff() && targetMember.isOwner() || !moderator.canInteract(targetMember)) {
3434
Responses.error(event.getHook(), "You cannot perform actions on a higher member staff member.").queue();
3535
return;
3636
}

0 commit comments

Comments
 (0)