Use LuckPerms duration formatter

The one built into PlaceholderAPI is awful and seems to have new bugs introduced into it in almost every release.

common/src/main/java/me/lucko/luckperms/placeholders/DurationFormatter.java

@@ -0,0 +1,130 @@
+/*
+ * This file is part of LuckPerms, licensed under the MIT License.
+ *
+ *  Copyright (c) lucko (Luck) <luck@lucko.me>
+ *  Copyright (c) contributors
+ *
+ *  Permission is hereby granted, free of charge, to any person obtaining a copy
+ *  of this software and associated documentation files (the "Software"), to deal
+ *  in the Software without restriction, including without limitation the rights
+ *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *  copies of the Software, and to permit persons to whom the Software is
+ *  furnished to do so, subject to the following conditions:
+ *
+ *  The above copyright notice and this permission notice shall be included in all
+ *  copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ *  SOFTWARE.
+ */
+
+package me.lucko.luckperms.placeholders;
+
+import com.google.common.collect.ImmutableMap;
+
+import java.time.Duration;
+import java.time.temporal.ChronoUnit;
+import java.util.Map;
+
+// Copied from https://github.com/lucko/LuckPerms/blob/master/common/src/main/java/me/lucko/luckperms/common/util/DurationFormatter.java
+// Uses String instead of Chat Components
+
+/**
+ * Formats durations to a readable form
+ */
+class DurationFormatter {
+    public static final DurationFormatter LONG = new DurationFormatter(false);
+    public static final DurationFormatter CONCISE = new DurationFormatter(true);
+    public static final DurationFormatter CONCISE_LOW_ACCURACY = new DurationFormatter(true, 3);
+
+    private static final ChronoUnit[] UNITS = new ChronoUnit[]{
+            ChronoUnit.YEARS,
+            ChronoUnit.MONTHS,
+            ChronoUnit.WEEKS,
+            ChronoUnit.DAYS,
+            ChronoUnit.HOURS,
+            ChronoUnit.MINUTES,
+            ChronoUnit.SECONDS
+    };
+
+    private final boolean concise;
+    private final int accuracy;
+
+    public DurationFormatter(boolean concise) {
+        this(concise, Integer.MAX_VALUE);
+    }
+
+    public DurationFormatter(boolean concise, int accuracy) {
+        this.concise = concise;
+        this.accuracy = accuracy;
+    }
+
+    /**
+     * Formats {@code duration} as a string.
+     *
+     * @param duration the duration
+     * @return the formatted string
+     */
+    public String format(Duration duration) {
+        long seconds = duration.getSeconds();
+        StringBuilder builder = new StringBuilder();
+        int outputSize = 0;
+
+        for (ChronoUnit unit : UNITS) {
+            long n = seconds / unit.getDuration().getSeconds();
+            if (n > 0) {
+                seconds -= unit.getDuration().getSeconds() * n;
+                if (outputSize != 0) {
+                    builder.append(' ');
+                }
+                builder.append(formatPart(n, unit));
+                outputSize++;
+            }
+            if (seconds <= 0 || outputSize >= this.accuracy) {
+                break;
+            }
+        }
+
+        if (outputSize == 0) {
+            return formatPart(0, ChronoUnit.SECONDS);
+        }
+        return builder.toString();
+    }
+
+    // Taken from https://github.com/lucko/LuckPerms/blob/master/common/src/main/resources/luckperms_en.properties
+    private static final Map<String, String> TRANSLATIONS = ImmutableMap.<String, String>builder()
+            .put("luckperms.duration.unit.years.plural", "%s years")
+            .put("luckperms.duration.unit.years.singular", "%s year")
+            .put("luckperms.duration.unit.years.short", "%sy")
+            .put("luckperms.duration.unit.months.plural", "%s months")
+            .put("luckperms.duration.unit.months.singular", "%s month")
+            .put("luckperms.duration.unit.months.short", "%smo")
+            .put("luckperms.duration.unit.weeks.plural", "%s weeks")
+            .put("luckperms.duration.unit.weeks.singular", "%s week")
+            .put("luckperms.duration.unit.weeks.short", "%sw")
+            .put("luckperms.duration.unit.days.plural", "%s days")
+            .put("luckperms.duration.unit.days.singular", "%s day")
+            .put("luckperms.duration.unit.days.short", "%sd")
+            .put("luckperms.duration.unit.hours.plural", "%s hours")
+            .put("luckperms.duration.unit.hours.singular", "%s hour")
+            .put("luckperms.duration.unit.hours.short", "%sh")
+            .put("luckperms.duration.unit.minutes.plural", "%s minutes")
+            .put("luckperms.duration.unit.minutes.singular", "%s minute")
+            .put("luckperms.duration.unit.minutes.short", "%sm")
+            .put("luckperms.duration.unit.seconds.plural", "%s seconds")
+            .put("luckperms.duration.unit.seconds.singular", "%s second")
+            .put("luckperms.duration.unit.seconds.short", "%ss")
+            .build();
+    
+    private String formatPart(long amount, ChronoUnit unit) {
+        String format = this.concise ? "short" : amount == 1 ? "singular" : "plural";
+        String translationKey = "luckperms.duration.unit." + unit.name().toLowerCase() + "." + format;
+        return String.format(TRANSLATIONS.get(translationKey), amount);
+    }
+
+}

common/src/main/java/me/lucko/luckperms/placeholders/LPPlaceholderProvider.java

@@ -44,6 +44,7 @@ import net.luckperms.api.node.types.InheritanceNode;
 import net.luckperms.api.query.QueryOptions;
 import net.luckperms.api.track.Track;
 
+import java.time.Duration;
 import java.util.Comparator;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -219,7 +220,7 @@ public class LPPlaceholderProvider implements PlaceholderProvider {
                         .filter(Objects::nonNull)
                         .filter(d -> !d.isNegative())
                         .findFirst()
-                        .map(d -> formatTime((int) d.getSeconds()))
+                        .map(this::formatDuration)
                         .orElse("")
         );
         builder.addDynamic("inherited_expiry_time", (player, user, userData, queryOptions, node) ->
@@ -230,7 +231,7 @@ public class LPPlaceholderProvider implements PlaceholderProvider {
                         .filter(Objects::nonNull)
                         .filter(d -> !d.isNegative())
                         .findFirst()
-                        .map(d -> formatTime((int) d.getSeconds()))
+                        .map(this::formatDuration)
                         .orElse("")
         );
         builder.addDynamic("group_expiry_time", (player, user, userData, queryOptions, group) ->
@@ -242,7 +243,7 @@ public class LPPlaceholderProvider implements PlaceholderProvider {
                         .filter(Objects::nonNull)
                         .filter(d -> !d.isNegative())
                         .findFirst()
-                        .map(d -> formatTime((int) d.getSeconds()))
+                        .map(this::formatDuration)
                         .orElse("")
         );
         builder.addDynamic("inherited_group_expiry_time", (player, user, userData, queryOptions, group) ->
@@ -255,7 +256,7 @@ public class LPPlaceholderProvider implements PlaceholderProvider {
                         .filter(Objects::nonNull)
                         .filter(d -> !d.isNegative())
                         .findFirst()
-                        .map(d -> formatTime((int) d.getSeconds()))
+                        .map(this::formatDuration)
                         .orElse("")
         );
         builder.addStatic("prefix", (player, user, userData, queryOptions) -> Strings.nullToEmpty(userData.getMetaData(queryOptions).getPrefix()));
@@ -350,13 +351,13 @@ public class LPPlaceholderProvider implements PlaceholderProvider {
     }
 
     /**
-     * Format a unix timestamp according to the placeholder platforms rules.
+     * Format a duration using the LuckPerms formatter.
      *
-     * @param time the time
-     * @return a formatted version of the time
+     * @param duration the duration
+     * @return a formatted version of the duration
      */
-    private String formatTime(int time) {
-        return this.platform.formatTime(time);
+    private String formatDuration(Duration duration) {
+        return DurationFormatter.CONCISE.format(duration);
     }
 
     /**

common/src/main/java/me/lucko/luckperms/placeholders/PlaceholderPlatform.java

@@ -27,20 +27,14 @@ package me.lucko.luckperms.placeholders;
  */
 public interface PlaceholderPlatform {
 
-    /**
-     * Format a unix timestamp according to the placeholder platforms rules.
-     *
-     * @param time the time
-     * @return a formatted version of the time
-     */
-    String formatTime(int time);
-
     /**
      * Format a boolean according to the placeholder platforms rules.
      *
      * @param value the boolean value
      * @return a formatted representation of the boolean
      */
-    String formatBoolean(boolean value);
+    default String formatBoolean(boolean value) {
+        return Boolean.toString(value);
+    }
 
 }

luckperms-mvdw-hook/src/main/java/me/lucko/luckperms/placeholders/LuckPermsMVdWHook.java

@@ -66,39 +66,4 @@ public class LuckPermsMVdWHook extends JavaPlugin implements PlaceholderReplacer
         return this.provider.onPlaceholderRequest(player, player.getUniqueId(), identifier);
     }
 
-    @Override
-    public String formatTime(int seconds) {
-        if (seconds == 0) {
-            return "0s";
-        }
-
-        long minute = seconds / 60;
-        seconds = seconds % 60;
-        long hour = minute / 60;
-        minute = minute % 60;
-        long day = hour / 24;
-        hour = hour % 24;
-
-        StringBuilder time = new StringBuilder();
-        if (day != 0) {
-            time.append(day).append("d ");
-        }
-        if (hour != 0) {
-            time.append(hour).append("h ");
-        }
-        if (minute != 0) {
-            time.append(minute).append("m ");
-        }
-        if (seconds != 0) {
-            time.append(seconds).append("s");
-        }
-
-        return time.toString().trim();
-    }
-
-    @Override
-    public String formatBoolean(boolean b) {
-        return b ? "yes" : "no";
-    }
-
 }

luckperms-papi-expansion/src/main/java/me/lucko/luckperms/placeholders/LuckPermsExpansion.java

@@ -68,11 +68,6 @@ public class LuckPermsExpansion extends PlaceholderExpansion implements Placehol
         return this.provider.onPlaceholderRequest(player, player.getUniqueId(), identifier);
     }
 
-    @Override
-    public String formatTime(int time) {
-        return TimeUtil.getTime(time);
-    }
-
     @Override
     public String formatBoolean(boolean b) {
         return b ? PlaceholderAPIPlugin.booleanTrue() : PlaceholderAPIPlugin.booleanFalse();