Merge pull request #3169 from Multiverse/zax71/MV5/confirm-command-cu…

…stom-timeout

Add config option for `/mv confirm` timeout

src/main/java/org/mvplugins/multiverse/core/commandtools/queue/CommandQueueManager.java

@@ -68,15 +68,15 @@ public void addToQueue(CommandQueuePayload payload) {
 
         Logging.finer("Add new command to queue for sender %s.", senderName);
         this.queuedCommandMap.put(senderName, payload);
-        payload.expireTask(runExpireLater(senderName, payload.validDuration()));
+        payload.expireTask(runExpireLater(senderName, config.getConfirmTimeout()));
 
         payload.issuer().sendInfo(payload.prompt());
         var confirmCommand = "/mv confirm";
         if (config.getUseConfirmOtp()) {
             confirmCommand += " " + payload.otp();
         }
         payload.issuer().sendMessage(String.format("Run %s%s %sto continue. This will expire in %s seconds.",
-                ChatColor.GREEN, confirmCommand, ChatColor.WHITE, payload.validDuration()));
+                ChatColor.GREEN, confirmCommand, ChatColor.WHITE, config.getConfirmTimeout()));
     }
 
     /**

src/main/java/org/mvplugins/multiverse/core/commandtools/queue/CommandQueuePayload.java

@@ -24,12 +24,10 @@ public static CommandQueuePayload issuer(@NotNull MVCommandIssuer issuer) {
     }
 
     private static final String DEFAULT_PROMPT_MESSAGE = "The command you are trying to run is deemed dangerous."; // todo: localize
-    private static final int DEFAULT_VALID_TIME = 10;
 
     private final int otp;
     private final MVCommandIssuer issuer;
     private Runnable action = () -> {};
-    private int validDuration = DEFAULT_VALID_TIME;
     private Message prompt = Message.of(DEFAULT_PROMPT_MESSAGE);
     private BukkitTask expireTask;
 
@@ -76,26 +74,6 @@ public int otp() {
         return otp;
     }
 
-    /**
-     * Sets the duration in which the command is valid for confirm in seconds.
-     *
-     * @param validDuration The target duration in seconds.
-     * @return The same {@link CommandQueuePayload} for method chaining.
-     */
-    public CommandQueuePayload validDuration(int validDuration) {
-        this.validDuration = validDuration;
-        return this;
-    }
-
-    /**
-     * Gets the duration in which the command is valid for confirm in seconds.
-     *
-     * @return The duration in seconds.
-     */
-    public int validDuration() {
-        return validDuration;
-    }
-
     /**
      * Sets the question to ask sender to confirm.
      *

src/main/java/org/mvplugins/multiverse/core/config/MVCoreConfig.java

@@ -467,6 +467,14 @@ public boolean getUseConfirmOtp() {
         return configHandle.get(configNodes.useConfirmOtp);
     }
 
+    public Integer getConfirmTimeout() {
+        return configHandle.get(configNodes.confirmTimeout);
+    }
+
+    public Try<Void> setConfirmTimeout(int confirmTimeout) {
+        return configHandle.set(configNodes.confirmTimeout, confirmTimeout);
+    }
+
     /**
      * {@inheritDoc}
      */

src/main/java/org/mvplugins/multiverse/core/config/MVCoreConfigNodes.java

@@ -320,6 +320,16 @@ private <N extends Node> N node(N node) {
             .name("use-confirm-otp")
             .build());
 
+    final ConfigNode<Integer> confirmTimeout = node(ConfigNode.builder("command.confirm-timeout", Integer.class)
+            .comment("")
+            .comment("The amount of time in seconds before `/mv confirm` times out")
+            .defaultValue(30)
+            .name("confirm-timeout")
+            .validator(value -> (value <= 0)
+                    ? Try.failure(new MultiverseException("Confirm timeout must be a positive number!"))
+                    : Try.success(null))
+            .build());
+
     private final ConfigHeaderNode miscHeader = node(ConfigHeaderNode.builder("misc")
             .comment("")
             .comment("")

src/test/resources/fresh_config.yml

@@ -33,6 +33,7 @@ command:
   resolve-alias-name: true
   confirm-mode: enable
   use-confirm-otp: true
+  confirm-timeout: 30
 
 misc:
   global-debug: 0