Updated tricks.ftl to now allow for dynamic setting of the categories and their children.

Author: RealMangorage

src/main/java/module-info.java

@@ -16,11 +16,13 @@
 
     // TODO: Deal with it
     exports org.mangorage.mangobotsite.website.servlet.data;
+    exports org.mangorage.mangobotsite.website.servlet.data.trick;
+    exports org.mangorage.mangobotsite.website.servlet.data.category;
+
 
     exports org.mangorage.mangobotsite;
-    exports org.mangorage.mangobotsite.website.file;
-    exports org.mangorage.mangobotsite.website.servlet.entity;
 
+    exports org.mangorage.mangobotsite.website.file;
 
     exports org.mangorage.mangobotsite.website.filters to org.eclipse.jetty.server;
     exports org.mangorage.mangobotsite.website.servlet to org.eclipse.jetty.server;
@@ -29,12 +31,9 @@
     exports org.mangorage.mangobotsite.website.impl to freemarker;
     exports org.mangorage.mangobotsite.website.util to freemarker;
 
-    exports org.mangorage.mangobotsite.website.servlet.entity.discord to com.google.gson;
 
 
     opens org.mangorage.mangobotsite.website.servlet to freemarker, com.google.gson;
-    opens org.mangorage.mangobotsite.website.servlet.entity;
-
 
     provides org.mangorage.mangobotcore.api.plugin.v1.Plugin with org.mangorage.mangobotsite.MangoBotSite;
     uses org.mangorage.mangobotcore.api.plugin.v1.Plugin;

src/main/java/org/mangorage/mangobotsite/MangoBotSite.java

@@ -8,7 +8,6 @@
 import org.mangorage.mangobotsite.website.WebServer;
 import org.mangorage.mangobotsite.website.file.FileUploadManager;
 import org.mangorage.mangobotsite.website.impl.ObjectMap;
-import org.mangorage.mangobotsite.website.servlet.entity.EntityManager;
 import org.mangorage.mangobotsite.website.util.WebConstants;
 
 import java.nio.file.Path;
@@ -18,7 +17,6 @@ public final class MangoBotSite implements Plugin {
     public static final String ID = "mangobotsite";
 
     private final FileUploadManager fileUploadManager = new FileUploadManager(Path.of("webpage-root/uploads"));
-    private final EntityManager entityManager = new EntityManager();
 
     public MangoBotSite() {
     }
@@ -27,10 +25,6 @@ public FileUploadManager getFileUploadManager() {
         return fileUploadManager;
     }
 
-    public EntityManager getEntityManager() {
-        return entityManager;
-    }
-
     @Override
     public String getId() {
         return ID;
@@ -44,7 +38,6 @@ public void load() {
         objectMap.put("trickManager", pl.getTrickManager());
         objectMap.put("jda", pl.getJDA());
         objectMap.put(WebConstants.FILE_MANAGER, fileUploadManager);
-        objectMap.put(WebConstants.ENTITY_MANAGER, getEntityManager());
 
         WebServer.startWebServerSafely(objectMap);
     }

src/main/java/org/mangorage/mangobotsite/website/servlet/TricksServlet.java

@@ -8,12 +8,15 @@
 import org.mangorage.mangobotsite.website.WebsiteConstants;
 import org.mangorage.mangobotsite.website.impl.StandardHttpServlet;
 import org.mangorage.mangobotsite.website.servlet.data.GuildsData;
-import org.mangorage.mangobotsite.website.servlet.data.TrickData;
-import org.mangorage.mangobotsite.website.servlet.data.TrickInfoData;
+import org.mangorage.mangobotsite.website.servlet.data.category.CategoryData;
+import org.mangorage.mangobotsite.website.servlet.data.category.CategoryItemData;
+import org.mangorage.mangobotsite.website.servlet.data.trick.TrickData;
+import org.mangorage.mangobotsite.website.servlet.data.trick.TrickInfoData;
 import org.mangorage.mangobotsite.website.util.MapBuilder;
 import org.mangorage.mangobotsite.website.util.WebUtil;
 
 import java.io.IOException;
+import java.util.List;
 
 public final class TricksServlet extends StandardHttpServlet {
 
@@ -38,7 +41,9 @@ protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws Se
             mapBuilder.put("trick", new TrickData(trick));
             mapBuilder.put("selectedGuildId", selectedGuildId);
             WebUtil.processTemplate(
-                    mapBuilder.get(),
+                    mapBuilder
+                            .put("categories", CategoryData.of(trick, plugin.getJDA()))
+                            .get(),
                     "tricks.ftl",
                     resp.getWriter()
             );

src/main/java/org/mangorage/mangobotsite/website/servlet/data/category/CategoryData.java

@@ -0,0 +1,79 @@
+package org.mangorage.mangobotsite.website.servlet.data.category;
+
+import net.dv8tion.jda.api.JDA;
+import org.mangorage.mangobotplugin.commands.trick.Trick;
+
+import java.util.List;
+
+public record CategoryData(String name, List<CategoryItemData> info) {
+    public static List<CategoryData> of(Trick trick, JDA jda) {
+        final var guild = jda.getGuildById(trick.getGuildID());
+        return List.of(
+                new CategoryData(
+                        "DETAILS",
+                        List.of(
+                                new CategoryItemData(
+                                        "Guild",
+                                        guild == null ? "N/A" : guild.getName(),
+                                        false
+                                ),
+                                new CategoryItemData(
+                                        "Guild Id",
+                                        trick.getGuildID() + "",
+                                        false
+                                ),
+                                new CategoryItemData(
+                                        "Guild ID",
+                                        trick.getGuildID() + "",
+                                        false
+                                ),
+                                new CategoryItemData(
+                                        "Owner ID",
+                                        trick.getOwnerID() + "",
+                                        false
+                                )
+                        )
+                ),
+                new CategoryData(
+                        "STATISTICS",
+                        List.of(
+                                new CategoryItemData(
+                                        "Times Used",
+                                        trick.getTimesUsed() + "",
+                                        false
+                                ),
+                                new CategoryItemData(
+                                        "Created",
+                                        trick.getCreated() + "",
+                                        false
+                                ),
+                                new CategoryItemData(
+                                        "Last Edited",
+                                        trick.getLastEdited() + "",
+                                        false
+                                ),
+                                new CategoryItemData(
+                                        "Last Modified By",
+                                        trick.getLastUserEdited() + "",
+                                        false
+                                )
+                        )
+                ),
+                new CategoryData(
+                        "SETTINGS",
+                        List.of(
+                                new CategoryItemData(
+                                        "Locked",
+                                        trick.isLocked() ? "Yes" : "No",
+                                        false
+                                ),
+                                new CategoryItemData(
+                                        "Suppress Embeds",
+                                        trick.isSuppressed() ? "Yes" : "No",
+                                        false
+                                )
+                        )
+                )
+        );
+    }
+}

src/main/java/org/mangorage/mangobotsite/website/servlet/data/category/CategoryItemData.java

@@ -0,0 +1,3 @@
+package org.mangorage.mangobotsite.website.servlet.data.category;
+
+public record CategoryItemData(String name, String value, boolean bold) {}

…site/website/servlet/data/TrickData.java …ebsite/servlet/data/trick/TrickData.javasrc/main/java/org/mangorage/mangobotsite/website/servlet/data/TrickData.java renamed to src/main/java/org/mangorage/mangobotsite/website/servlet/data/trick/TrickData.java src/main/java/org/mangorage/mangobotsite/website/servlet/data/TrickData.java renamed to src/main/java/org/mangorage/mangobotsite/website/servlet/data/trick/TrickData.java

@@ -1,4 +1,4 @@
-package org.mangorage.mangobotsite.website.servlet.data;
+package org.mangorage.mangobotsite.website.servlet.data.trick;
 
 import org.mangorage.mangobotplugin.commands.trick.Trick;
 

…/website/servlet/data/TrickInfoData.java …te/servlet/data/trick/TrickInfoData.javasrc/main/java/org/mangorage/mangobotsite/website/servlet/data/TrickInfoData.java renamed to src/main/java/org/mangorage/mangobotsite/website/servlet/data/trick/TrickInfoData.java src/main/java/org/mangorage/mangobotsite/website/servlet/data/TrickInfoData.java renamed to src/main/java/org/mangorage/mangobotsite/website/servlet/data/trick/TrickInfoData.java

@@ -1,4 +1,4 @@
-package org.mangorage.mangobotsite.website.servlet.data;
+package org.mangorage.mangobotsite.website.servlet.data.trick;
 
 import org.mangorage.mangobotplugin.commands.trick.Trick;
 import org.mangorage.mangobotplugin.commands.trick.TrickManager;