refactor: make cooldown minutes check into separate method

Author: christolis

application/src/main/java/org/togetherjava/tjbot/features/roleapplication/ApplicationApplyHandler.java

@@ -37,13 +37,14 @@ public class ApplicationApplyHandler {
     /**
      * Constructs a new {@code ApplicationApplyHandler} instance.
      *
-     * @param roleApplicationSystemConfig the configuration that contains the details for the application form
-     *        including the cooldown duration and channel pattern.
+     * @param roleApplicationSystemConfig the configuration that contains the details for the
+     *        application form including the cooldown duration and channel pattern.
      */
     public ApplicationApplyHandler(RoleApplicationSystemConfig roleApplicationSystemConfig) {
         this.roleApplicationSystemConfig = roleApplicationSystemConfig;
         this.applicationChannelPattern =
-                Pattern.compile(roleApplicationSystemConfig.submissionsChannelPattern()).asMatchPredicate();
+                Pattern.compile(roleApplicationSystemConfig.submissionsChannelPattern())
+                    .asMatchPredicate();
 
         final Duration applicationSubmitCooldownDuration =
                 Duration.ofMinutes(roleApplicationSystemConfig.applicationSubmitCooldownMinutes());
@@ -85,8 +86,8 @@ protected void sendApplicationResult(final ModalInteractionEvent event, List<Str
         MessageEmbed.Field roleField = new MessageEmbed.Field("Role", roleString, false);
         embed.addField(roleField);
 
-        MessageEmbed.Field answerField =
-                new MessageEmbed.Field(roleApplicationSystemConfig.defaultQuestion(), answer, false);
+        MessageEmbed.Field answerField = new MessageEmbed.Field(
+                roleApplicationSystemConfig.defaultQuestion(), answer, false);
         embed.addField(answerField);
 
         applicationChannel.get().sendMessageEmbeds(embed.build()).queue();
@@ -129,4 +130,14 @@ protected void submitApplicationFromModalInteraction(ModalInteractionEvent event
 
         applicationSubmitCooldown.put(event.getMember(), OffsetDateTime.now());
     }
+
+    protected long getMemberCooldownMinutes(Member member) {
+        OffsetDateTime timeSentCache = getApplicationSubmitCooldown().getIfPresent(member);
+        if (timeSentCache != null) {
+            Duration duration = Duration.between(timeSentCache, OffsetDateTime.now());
+            return roleApplicationSystemConfig.applicationSubmitCooldownMinutes()
+                    - duration.toMinutes();
+        }
+        return 0L;
+    }
 }

application/src/main/java/org/togetherjava/tjbot/features/roleapplication/ApplicationCreateCommand.java

@@ -32,8 +32,6 @@
 import javax.annotation.Nullable;
 
 import java.awt.Color;
-import java.time.Duration;
-import java.time.OffsetDateTime;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -120,26 +118,20 @@ public void onSlashCommand(SlashCommandInteractionEvent event) {
     @Override
     public void onStringSelectSelection(StringSelectInteractionEvent event, List<String> args) {
         SelectOption selectOption = event.getSelectedOptions().getFirst();
+        Member member = event.getMember();
 
-        if (selectOption == null) {
+        if (selectOption == null || member == null) {
             return;
         }
 
-        OffsetDateTime timeSentCache = applicationApplyHandler.getApplicationSubmitCooldown()
-            .getIfPresent(event.getMember());
-        if (timeSentCache != null) {
-            Duration duration = Duration.between(timeSentCache, OffsetDateTime.now());
-            long remainingMinutes =
-                    roleApplicationSystemConfig.applicationSubmitCooldownMinutes() - duration.toMinutes();
-
-            if (duration.toMinutes() < roleApplicationSystemConfig.applicationSubmitCooldownMinutes()) {
-                event
-                    .reply("Please wait %d minutes before sending a new application form."
-                        .formatted(remainingMinutes))
-                    .setEphemeral(true)
-                    .queue();
-                return;
-            }
+        long remainingMinutes = applicationApplyHandler.getMemberCooldownMinutes(member);
+        if (remainingMinutes > 0) {
+            event
+                .reply("Please wait %d minutes before sending a new application form."
+                    .formatted(remainingMinutes))
+                .setEphemeral(true)
+                .queue();
+            return;
         }
 
         String questionLabel = roleApplicationSystemConfig.defaultQuestion();
@@ -151,7 +143,8 @@ public void onStringSelectSelection(StringSelectInteractionEvent event, List<Str
             .create(generateComponentId(event.getUser().getId()), questionLabel,
                     TextInputStyle.PARAGRAPH)
             .setRequired(true)
-            .setRequiredRange(roleApplicationSystemConfig.minimumAnswerLength(), roleApplicationSystemConfig.maximumAnswerLength())
+            .setRequiredRange(roleApplicationSystemConfig.minimumAnswerLength(),
+                    roleApplicationSystemConfig.maximumAnswerLength())
             .setPlaceholder("Enter your answer here")
             .build();