Show rental time left in list command

Author: AlexanderTrysMine

realty-paper/src/main/java/io/github/md5sha256/realty/command/ListCommand.java

@@ -1,8 +1,10 @@
 package io.github.md5sha256.realty.command;
 
+import io.github.md5sha256.realty.api.DurationFormatter;
 import io.github.md5sha256.realty.api.RealtyApi;
 import io.github.md5sha256.realty.command.util.NamedAuthority;
 import io.github.md5sha256.realty.command.util.NamedAuthorityParser;
+import io.github.md5sha256.realty.database.entity.LeaseholdContractEntity;
 import io.github.md5sha256.realty.database.entity.RealtyRegionEntity;
 import io.github.md5sha256.realty.localisation.MessageContainer;
 import io.github.md5sha256.realty.localisation.MessageKeys;
@@ -141,7 +143,7 @@ private void listAll(@NotNull CommandSender sender, @NotNull UUID targetId,
         builder.append(parseMiniMessage(MessageKeys.LIST_HEADER, "<player>", targetName));
         appendCategory(builder, "Owned", result.owned());
         appendCategory(builder, "Landlord", result.landlord());
-        appendCategory(builder, "Rented", result.rented());
+        appendRentedCategory(builder, "Rented", result.rented());
         appendFooter(builder, targetName, null, page, totalPages);
         sender.sendMessage(builder.build());
     }
@@ -169,7 +171,11 @@ private void listCategory(@NotNull CommandSender sender, @NotNull UUID targetId,
         String label = "owned".equals(category) ? "Owned" : "Rented";
         TextComponent.Builder builder = Component.text();
         builder.append(parseMiniMessage(MessageKeys.LIST_HEADER, "<player>", targetName));
-        appendCategory(builder, label, result.regions());
+        if ("owned".equals(category)) {
+            appendCategory(builder, label, result.regions());
+        } else {
+            appendRentedCategory(builder, label, result.regions());
+        }
         appendFooter(builder, targetName, category, page, totalPages);
         sender.sendMessage(builder.build());
     }
@@ -189,6 +195,25 @@ private void appendCategory(@NotNull TextComponent.Builder builder, @NotNull Str
         }
     }
 
+    private void appendRentedCategory(@NotNull TextComponent.Builder builder, @NotNull String label,
+                                      @NotNull List<RealtyRegionEntity> regions) {
+        if (regions.isEmpty()) {
+            return;
+        }
+        builder.appendNewline()
+                .append(parseMiniMessage(MessageKeys.LIST_CATEGORY, "<label>", label));
+        for (RealtyRegionEntity region : regions) {
+            LeaseholdContractEntity leasehold = logic.getLeaseholdContract(region.worldGuardRegionId(), region.worldId());
+            String timeLeft = DurationFormatter.formatTimeLeft(leasehold != null ? leasehold.endDate() : null);
+            builder.appendNewline()
+                    .append(parseMiniMessage(
+                            MessageKeys.LIST_RENTED_ENTRY,
+                            "<region>", region.worldGuardRegionId(),
+                            "<time_left>", timeLeft
+                    ));
+        }
+    }
+
     private void appendFooter(@NotNull TextComponent.Builder builder, @NotNull String targetName,
                               @Nullable String category, int page, int totalPages) {
         Component previousComponent = page > 1

realty-paper/src/main/java/io/github/md5sha256/realty/localisation/MessageKeys.java

@@ -180,6 +180,7 @@ private MessageKeys() {}
     public static final String LIST_HEADER = "list.header";
     public static final String LIST_CATEGORY = "list.category";
     public static final String LIST_ENTRY = "list.entry";
+    public static final String LIST_RENTED_ENTRY = "list.rented-entry";
     public static final String LIST_FOOTER = "list.footer";
     public static final String LIST_PREVIOUS = "list.previous";
     public static final String LIST_NEXT = "list.next";

realty-paper/src/main/resources/messages.yml

@@ -171,6 +171,7 @@ list:
   header: "--- Regions for <player> ---"
   category: "<label>:"
   entry: "  - <region>"
+  rented-entry: "  - <region> <gray>(<time_left>)</gray>"
   footer: "Page <page> of <total> <previous><next>"
   previous: "<click:run_command:<command>><yellow>< Previous</yellow></click> "
   next: " <click:run_command:<command>><yellow>Next ></yellow></click>"