Handle HierarchyExceptions in timeout command, add reason to timeout cancel

.idea/inspectionProfiles/Project_Default.xml

@@ -1,7 +1,14 @@
 <component name="InspectionProjectProfileManager">
   <profile version="1.0">
     <option name="myName" value="Project Default" />
+    <inspection_tool class="GrazieInspection" enabled="false" level="GRAMMAR_ERROR" enabled_by_default="false" />
     <inspection_tool class="InstantiationOfUtilityClass" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="LanguageDetectionInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="SpellCheckingInspection" enabled="false" level="TYPO" enabled_by_default="false">
+      <option name="processCode" value="true" />
+      <option name="processLiterals" value="true" />
+      <option name="processComments" value="true" />
+    </inspection_tool>
     <inspection_tool class="XmlHighlighting" enabled="false" level="ERROR" enabled_by_default="false" />
   </profile>
 </component>

src/main/java/net/hypr/doki/commands/moderation/Timeout.java

@@ -2,6 +2,7 @@ package net.hypr.doki.commands.moderation;
 
 import com.freya02.botcommands.api.annotations.BotPermissions;
 import com.freya02.botcommands.api.annotations.CommandMarker;
+import com.freya02.botcommands.api.annotations.Optional;
 import com.freya02.botcommands.api.annotations.UserPermissions;
 import com.freya02.botcommands.api.application.ApplicationCommand;
 import com.freya02.botcommands.api.application.annotations.AppOption;
@@ -9,10 +10,12 @@ import com.freya02.botcommands.api.application.slash.GuildSlashEvent;
 import com.freya02.botcommands.api.application.slash.annotations.JDASlashCommand;
 import net.dv8tion.jda.api.Permission;
 import net.dv8tion.jda.api.entities.Member;
+import net.dv8tion.jda.api.exceptions.HierarchyException;
 import net.hypr.doki.utils.DurationUtils;
 
 import java.time.Duration;
 import java.time.OffsetDateTime;
+import java.util.Objects;
 
 @CommandMarker
 @BotPermissions(Permission.MODERATE_MEMBERS)
@@ -25,13 +28,21 @@ public class Timeout extends ApplicationCommand {
     )
     public void timeout(GuildSlashEvent event,
                      @AppOption(name = "member") Member member,
-                     @AppOption(name = "duration", description = "ex: 2h5m, must be between 1m and 7d") String duration) {
+                     @AppOption(name = "duration", description = "ex: 2h5m, must be between 1m and 7d") String duration,
+                     @Optional @AppOption(name = "reason") String reason) {
         Duration timeoutDuration = DurationUtils.parseDuration(duration);
         if (!DurationUtils.isDurationBetween(timeoutDuration, Duration.ofMinutes(1), Duration.ofDays(7))) {
             event.replyFormat("Invalid duration %s!, must be between 1m and 7d", duration).queue();
             return;
         }
-        member.timeoutFor(timeoutDuration).queue();
+
+        try {
+            member.timeoutFor(timeoutDuration)
+                    .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();
     }
 
@@ -41,9 +52,16 @@ public class Timeout extends ApplicationCommand {
             description = "Cancels the specified users timeout"
     )
     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();
-        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();
     }
 

src/main/java/net/hypr/doki/commands/utils/Poll.java

@@ -18,7 +18,7 @@ import java.util.Objects;
 
 @CommandMarker
 @BotPermissions(Permission.MESSAGE_SEND_POLLS)
-@UserPermissions(Permission.MESSAGE_SEND_POLLS)
+@UserPermissions(Permission.MESSAGE_MANAGE)
 public class Poll extends ApplicationCommand {
     @JDASlashCommand(
             name = "poll",

src/main/java/net/hypr/doki/utils/DurationUtils.java

@@ -47,6 +47,7 @@ public class DurationUtils {
                 .plusSeconds(seconds);
     }
 
+    @SuppressWarnings("BooleanMethodIsAlwaysInverted")
     public static boolean isDurationBetween(Duration target, Duration lowerThreshold, Duration upperThreshold) {
         if (target == lowerThreshold || target == upperThreshold) return true;
         return !target.isNegative() &&