Coverted website to using new system for tricks.

Author: RealMangorage

build.gradle

@@ -93,8 +93,8 @@ dependencies {
 
     launchtarget("org.mangorage:mangobotlaunchtarget:0.1.8")
 
-    plugin('org.mangorage:mangobot:12.0.89')
-    plugin('org.mangorage:mangobotplugin:12.0.50')
+    plugin('org.mangorage:mangobot:12.0.96')
+    plugin('org.mangorage:mangobotplugin:12.0.57')
 
     library('org.eclipse.jetty:jetty-server:11.0.16')
     library('org.eclipse.jetty:jetty-servlet:11.0.16')

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

@@ -41,7 +41,7 @@ public void load() {
         var pl = PluginManager.getInstance().getPlugin("mangobot").getInstance(MangoBot.class);
 
         ObjectMap objectMap = new ObjectMap();
-        objectMap.put("trickCommand", pl.getCommandManager().getCommand("trick"));
+        objectMap.put("trickManager", pl.getTrickManager());
         objectMap.put("jda", pl.getJDA());
         objectMap.put(WebConstants.FILE_MANAGER, fileUploadManager);
         objectMap.put(WebConstants.ENTITY_MANAGER, getEntityManager());

src/main/java/org/mangorage/mangobotsite/website/WebServer.java

@@ -56,12 +56,6 @@ public static void startWebServerSafely(ObjectMap objectMap) {
         }).start();
     }
 
-    public static void main(String[] args) {
-        ObjectMap map = new ObjectMap();
-        map.put(WebConstants.FILE_MANAGER, new FileUploadManager(Path.of("webpage-root/uploads")));
-        startWebServerSafely(map);
-    }
-
     public static void startWebServer(ObjectMap objectMap) throws Exception {
         Server server = new Server();
 

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

@@ -5,11 +5,9 @@
 import jakarta.servlet.http.HttpServletResponse;
 import net.dv8tion.jda.api.JDA;
 import org.mangorage.mangobotplugin.commands.trick.Trick;
-import org.mangorage.mangobotplugin.commands.trick.TrickCommand;
-import org.mangorage.mangobotsite.website.impl.ObjectMap;
+import org.mangorage.mangobotplugin.commands.trick.TrickManager;
 import org.mangorage.mangobotsite.website.impl.StandardHttpServlet;
 import org.mangorage.mangobotsite.website.util.MapBuilder;
-import org.mangorage.mangobotsite.website.util.WebConstants;
 import java.io.IOException;
 import java.time.Instant;
 import java.util.Comparator;
@@ -44,7 +42,7 @@ private static long getLong(String value) {
     protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
         // Retrieve shared objects from the servlet context
         var map = getObjectMap();
-        var command = map.get("trickCommand", TrickCommand.class);
+        var trickManager = map.get("trickManager", TrickManager.class);
         var jda = map.get("jda", JDA.class);
 
         resp.setContentType("text/html");
@@ -54,7 +52,7 @@ protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws Se
         if (guildId != null) {
             try {
                 long id = Long.parseLong(guildId);
-                if (command.getTricksForGuild(id).isEmpty()) {
+                if (trickManager.getTricksForGuild(id).isEmpty()) {
                     processTemplate(
                             MapBuilder.of()
                                     .self(this)
@@ -82,7 +80,7 @@ protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws Se
             }
         }
 
-        var trick = guildId != null && trickId != null ? command.getTrick(trickId, Long.parseLong(guildId)) : null;
+        var trick = guildId != null && trickId != null ? trickManager.getTrickForGuildByName(Long.parseLong(guildId), trickId) : null;
 
         if (trickId != null && guildId != null && trick == null) {
             processTemplate(
@@ -110,7 +108,7 @@ protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws Se
                             if (guildId == null) {
                                 b.put(
                                         "guilds",
-                                        command.getGuilds()
+                                        trickManager.getAllGuilds()
                                                 .stream()
                                                 .map(id -> new Guild(id.toString(), getGuild(jda, id)))
                                                 .toList()
@@ -119,7 +117,7 @@ protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws Se
 
                             if (guildId != null) {
                                 b.put("tricks",
-                                        command.getTricksForGuild(Long.parseLong(guildId))
+                                        trickManager.getTricksForGuild(Long.parseLong(guildId))
                                                 .stream()
                                                 .sorted(Comparator.comparing(Trick::getTrickID))
                                                 .toList()