.idea/inspectionProfiles/Project_Default.xml

@@ -1,14 +1,7 @@
 <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>

README.md

@@ -1,10 +1,5 @@
 <img src="https://git.frzn.dev/fwoppydwisk/doki/raw/branch/master/assets/logo.svg" alt="" height="100"/>
 <hr>
-<a href="https://git.frzn.dev/fwoppydwisk/doki/releases/latest">
-  <img src="https://git.frzn.dev/fwoppydwisk/doki/badges/release.svg?style=for-the-badge" alt="">
-</a>
-<img src="https://git.frzn.dev/fwoppydwisk/doki/badges/stars.svg?style=for-the-badge" alt="">
-<br>
 A multipurpose Discord bot written in Java.
 
 ## Tested Environments

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

@@ -2,7 +2,6 @@ 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;
@@ -10,12 +9,10 @@ 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)
@@ -28,21 +25,9 @@ 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,
-                     @Optional @AppOption(name = "reason") String reason) {
+                     @AppOption(name = "duration", description = "ex: 2h5m, must be between 1m and 7d") String duration) {
         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;
-        }
-
-        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;
-        }
+        member.timeoutFor(timeoutDuration).queue();
         event.replyFormat("Timed out %s for %s", member.getAsMention(), duration).queue();
     }
 
@@ -52,16 +37,9 @@ public class Timeout extends ApplicationCommand {
             description = "Cancels the specified users timeout"
     )
     public void cancelTimeout(GuildSlashEvent event,
-                           @AppOption(name = "member") Member member,
-                           @Optional @AppOption(name = "reason") String reason) {
+                           @AppOption(name = "member") Member member) {
         OffsetDateTime timeoutEnd = member.getTimeOutEnd();
-        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;
-        }
+        member.removeTimeout().queue();
         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_MANAGE)
+@UserPermissions(Permission.MESSAGE_SEND_POLLS)
 public class Poll extends ApplicationCommand {
     @JDASlashCommand(
             name = "poll",
@@ -26,15 +26,11 @@ public class Poll extends ApplicationCommand {
     )
     public void poll(GuildSlashEvent event,
                      @AppOption(name = "title") String pollTitle,
-                     @AppOption(name = "duration", description = "ex: 2h, must be between 1h and 7d") String duration,
+                     @AppOption(name = "duration", description = "ex: 2h5m, must be between 1h and 7d") String duration,
                      @AppOption(name = "options", description = "Comma-seperated poll options") String options,
                      @Optional @AppOption(name = "multiple-choice", description = "Allow multiple choices? (defaults to false)") Boolean multiChoice) {
         Boolean pollMultiChoice = Objects.requireNonNullElse(multiChoice, false);
         Duration pollDuration = DurationUtils.parseDuration(duration);
-        if (!DurationUtils.isDurationBetween(pollDuration, Duration.ofHours(1), Duration.ofDays(7))) {
-            event.replyFormat("Invalid duration %s!, must be between 1h and 7d", duration).queue();
-            return;
-        }
         String[] pollOptions = options.split(",");
         MessagePollBuilder poll = MessagePollData.builder(pollTitle)
                 .setDuration(pollDuration);

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

@@ -7,53 +7,26 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 public class DurationUtils {
-    private static final Pattern DURATION_PATTERN = Pattern.compile(
-            "(\\d+d\\s*)?(\\d+h\\s*)?(\\d+m\\s*)?(\\d+s\\s*)?");
+    private static final Pattern timePattern = Pattern.compile("(\\d+)([dhms])?");
+    public static Duration parseDuration(String input) throws IllegalArgumentException {
+        Matcher matcher = timePattern.matcher(input);
 
-    public static Duration parseDuration(String durationString) {
-        durationString = durationString.trim();
-
-        Matcher matcher = DURATION_PATTERN.matcher(durationString);
-        long days = 0;
-        long hours = 0;
-        long minutes = 0;
-        long seconds = 0;
-
-        if (matcher.matches()) {
-            // Extract days if present
-            if (matcher.group(1) != null) {
-                days = Long.parseLong(matcher.group(1).replace("d", "").trim());
-            }
-
-            // Extract hours if present
-            if (matcher.group(2) != null) {
-                hours = Long.parseLong(matcher.group(2).replace("h", "").trim());
-            }
-
-            // Extract minutes if present
-            if (matcher.group(3) != null) {
-                minutes = Long.parseLong(matcher.group(3).replace("m", "").trim());
-            }
-
-            // Extract seconds if present
-            if (matcher.group(4) != null) {
-                seconds = Long.parseLong(matcher.group(4).replace("s", "").trim());
-            }
+        if (!matcher.matches()) {
+            throw new IllegalArgumentException("Invalid duration format");
         }
 
-        return Duration.ofDays(days)
-                .plusHours(hours)
-                .plusMinutes(minutes)
-                .plusSeconds(seconds);
+        int value = Integer.parseInt(matcher.group(1));
+        String unit = matcher.group(2);
+
+        return switch (unit == null || unit.isEmpty() ? "m" : unit.toLowerCase()) {
+            case "d" -> Duration.ofDays(value);
+            case "h" -> Duration.ofHours(value);
+            case "m" -> Duration.ofMinutes(value);
+            case "s" -> Duration.ofSeconds(value);
+            default -> throw new IllegalArgumentException("Invalid unit");
+        };
     }
 
-    @SuppressWarnings("BooleanMethodIsAlwaysInverted")
-    public static boolean isDurationBetween(Duration target, Duration lowerThreshold, Duration upperThreshold) {
-        if (target == lowerThreshold || target == upperThreshold) return true;
-        return !target.isNegative() &&
-                (target.compareTo(lowerThreshold) >= 0) &&
-                (target.compareTo(upperThreshold) <= 0);
-    }
     public static String getTimeDifference(OffsetDateTime offsetDateTime) {
         if (offsetDateTime == null) return "0 seconds";