Add date to the xkcd command

Author: Matyrobbrt

src/commander/java/com/mcmoddev/mmdbot/commander/commands/HelpCommand.java

@@ -27,6 +27,7 @@
 import com.mcmoddev.mmdbot.commander.annotation.RegisterSlashCommand;
 import com.mcmoddev.mmdbot.core.commands.component.Component;
 import com.mcmoddev.mmdbot.core.commands.paginate.PaginatedCommand;
+import com.mcmoddev.mmdbot.core.commands.paginate.Paginator;
 import net.dv8tion.jda.api.EmbedBuilder;
 import net.dv8tion.jda.api.interactions.commands.OptionMapping;
 import net.dv8tion.jda.api.interactions.commands.OptionType;
@@ -57,7 +58,12 @@ public class HelpCommand extends PaginatedCommand {
     public static final String ISSUE_TRACKER = "https://github.com/MinecraftModDevelopment/MMDBot/issues";
 
     private HelpCommand() {
-        super(TheCommander.getComponentListener("help-cmd"), Component.Lifespan.TEMPORARY, 25);
+        super(
+            Paginator.builder(TheCommander.getComponentListener("help-cmd"))
+                .buttonOrder(Paginator.NATURAL_BUTTON_ORDER)
+                .lifespan(Component.Lifespan.TEMPORARY)
+                .itemsPerPage(25)
+        );
         name = "help";
         help = "Show all commands, or detailed information about a particular command.";
         guildOnly = false;

src/commander/java/com/mcmoddev/mmdbot/commander/commands/XkcdCommand.java

@@ -43,7 +43,7 @@
 import java.util.Random;
 
 @Slf4j
-public class XkcdCommand extends PaginatedCommand {
+public final class XkcdCommand extends PaginatedCommand {
 
     public static final URL LATEST_COMIC = Utils.rethrowSupplier(() -> new URL("https://xkcd.com/info.0.json")).get();
     public static final Random RANDOM = new Random();
@@ -73,7 +73,8 @@ protected EmbedBuilder getEmbed(final int startingIndex, final int maximum, fina
             return new EmbedBuilder()
                 .setTitle(xkcd.safe_title())
                 .setDescription(xkcd.alt())
-                .setImage(xkcd.img());
+                .setImage(xkcd.img())
+                .addField("Date", xkcd.day() + "/" + xkcd.month() + "/" + xkcd.year(), true);
         } catch (IOException e) {
             log.warn("Exception trying to resolve comic ", e);
             return new EmbedBuilder()

src/core/java/com/mcmoddev/mmdbot/core/commands/paginate/Paginator.java

@@ -44,6 +44,7 @@
 public interface Paginator {
     ButtonFactory DEFAULT_BUTTON_FACTORY = ButtonFactory.emoji(ButtonStyle.PRIMARY, fromMarkdown("◀️"), fromMarkdown("▶️"), fromMarkdown("⏮️"), fromMarkdown("⏭️"));
     List<ButtonType> DEFAULT_BUTTON_ORDER = List.of(ButtonType.PREVIOUS, ButtonType.DISMISS, ButtonType.NEXT);
+    List<ButtonType> NATURAL_BUTTON_ORDER = List.of(ButtonType.FIRST, ButtonType.PREVIOUS, ButtonType.DISMISS, ButtonType.NEXT, ButtonType.LAST);
 
     /**
      * Gets the component listener for handling the pagination. <br>