RoscoeDaWah/doki
RoscoeDaWah/doki
1
1
Fork 0
Code Issues Pull requests Projects Releases 10 Packages Wiki Activity Actions

Handle HierarchyExceptions in timeout command, add reason to timeout cancel

Browse source
This commit is contained in:
floppydiskette 2024-11-24 20:59:38 +00:00
commit 80f558c808
No known key found for this signature in database
1 changed files with 18 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/main/java/net/hypr/doki/commands/moderation/Timeout.java
View file

@ -10,6 +10,7 @@ import com.freya02.botcommands.api.application.slash.GuildSlashEvent;
import com.freya02.botcommands.api.application.slash.annotations.JDASlashCommand; import com.freya02.botcommands.api.application.slash.annotations.JDASlashCommand;
import net.dv8tion.jda.api.Permission; import net.dv8tion.jda.api.Permission;
import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.entities.Member;
import net.dv8tion.jda.api.exceptions.HierarchyException;
import net.hypr.doki.utils.DurationUtils; import net.hypr.doki.utils.DurationUtils;
import java.time.Duration; import java.time.Duration;
@ -34,8 +35,14 @@ public class Timeout extends ApplicationCommand {
event.replyFormat("Invalid duration %s!, must be between 1m and 7d", duration).queue(); event.replyFormat("Invalid duration %s!, must be between 1m and 7d", duration).queue();
return; return;
} }
try {
member.timeoutFor(timeoutDuration) member.timeoutFor(timeoutDuration)
.reason(Objects.requireNonNullElse(reason, "No reason provided")).queue(); .reason(Objects.requireNonNullElse(reason, "No reason provided")).queue();
} catch (HierarchyException ex) {
event.replyFormat("Failed to time out %s (member has roles above me!)", member.getAsMention()).setEphemeral(true).queue();
return;
}
event.replyFormat("Timed out %s for %s", member.getAsMention(), duration).queue(); event.replyFormat("Timed out %s for %s", member.getAsMention(), duration).queue();
} }
@ -45,9 +52,16 @@ public class Timeout extends ApplicationCommand {
description = "Cancels the specified users timeout" description = "Cancels the specified users timeout"
) )
public void cancelTimeout(GuildSlashEvent event, public void cancelTimeout(GuildSlashEvent event,
@AppOption(name = "member") Member member) { @AppOption(name = "member") Member member,
@Optional @AppOption(name = "reason") String reason) {
OffsetDateTime timeoutEnd = member.getTimeOutEnd(); OffsetDateTime timeoutEnd = member.getTimeOutEnd();
member.removeTimeout().queue(); try {
member.removeTimeout()
.reason(Objects.requireNonNullElse(reason, "No reason provided")).queue();
} catch (HierarchyException ex) {
event.replyFormat("Failed to remove %s's timeout (member has roles above me!)", member.getAsMention()).setEphemeral(true).queue();
return;
}
event.replyFormat("Removed %s's timeout (%s remaining)", member.getAsMention(), DurationUtils.getTimeDifference(timeoutEnd)).queue(); event.replyFormat("Removed %s's timeout (%s remaining)", member.getAsMention(), DurationUtils.getTimeDifference(timeoutEnd)).queue();
} }