SSE

xdnw · Jan 20, 2024 · aee52d0 · aee52d0
1 parent 51afdd1
commit aee52d0
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 18 deletions.
diff --git a/src/main/java/link/locutus/discord/web/commands/page/IndexPages.java b/src/main/java/link/locutus/discord/web/commands/page/IndexPages.java
@@ -225,8 +225,8 @@ public Object guildindex(WebStore ws, @Me GuildDB db, @Me User user, ArgumentSta
         CommandGroup pages = WebRoot.getInstance().getPageHandler().getCommands();
 
         StringBuilder result = new StringBuilder();
-        String cmdEndpoint = WebRoot.REDIRECT + "/" + db.getIdLong() + "/command/";
-        String pageEndpoint = WebRoot.REDIRECT + "/" + db.getIdLong() + "/";
+        String cmdEndpoint = WebRoot.REDIRECT + "/command/";
+        String pageEndpoint = WebRoot.REDIRECT + "/";
 
         result.append(
                 commands.toHtml(ws, stack.getPermissionHandler(), cmdEndpoint, false)

diff --git a/src/main/java/link/locutus/discord/web/jooby/PageHandler.java b/src/main/java/link/locutus/discord/web/jooby/PageHandler.java
@@ -194,7 +194,6 @@ private void sseMessage(SseClient2 sse, String message, boolean success) {
      */
     public void sse(SseClient2 sse) {
         try {
-
             Context ctx = sse.ctx;
             WebIO io = new WebIO(sse);
 
@@ -203,7 +202,7 @@ public void sse(SseClient2 sse) {
             if (cmds.isEmpty()) {
                 ArgumentStack stack = createStack(ctx);
                 String path = stack.consumeNext();
-                if (!path.equalsIgnoreCase("command")) {
+                if (!path.equalsIgnoreCase("sse")) {
                     sseMessage(sse, "Invalid path (not command): " + path, false);
                     return;
                 }
@@ -375,15 +374,6 @@ public static Map<String, String> parseQueryMap( Map<String, List<String>> query
         return combined;
     }
 
-//    @Command()
-//    public Object command(@Me GuildDB db, ArgumentStack stack, Context ctx) {
-//        List<String> args = stack.getRemainingArgs();
-//        CommandManager2 manager = Locutus.imp().getCommandManager().getV2();
-//        CommandCallable cmd = manager.getCallable(args);
-//
-//        return cmd.toHtml(stack.getStore(), stack.getPermissionHandler());
-//    }
-
     @NotNull
     @Override
     public void handle(@NotNull Context ctx) throws Exception {
@@ -431,7 +421,7 @@ private void handleCommand(Context ctx) {
                     }
 
                     cmd.validatePermissions(stack.getStore(), permisser);
-                    String endpoint = WebRoot.REDIRECT + "/command";
+                    String endpoint = WebRoot.REDIRECT + "/sse/" + cmd.getFullPath("/");
                     ctx.result(WebUtil.minify(cmd.toHtml(stack.getStore().getProvided(WebStore.class), stack.getPermissionHandler(), endpoint, true)));
                     break;
                 }

diff --git a/src/main/resources/js/command.js b/src/main/resources/js/command.js
@@ -115,11 +115,10 @@ function executeCommandFromArgMap(form, sse) {
     return executeCommandFromArgMapWithOutput(form, outDiv, sse);
 }
 
-function executeCommandFromArgMapWithOutput(form, outDiv, args, sse) {
-//    var domain = window.location.href.replace("/command", "").replace("web", "sse");
+function executeCommandFromArgMapWithOutput(form, outDiv, sse) {
     var domain;
     if (form.hasAttribute("endpoint")) {
-        domain = form.getAttribute("endpoint") + window.location.pathname;
+        domain = form.getAttribute("endpoint");
     } else {
         var domain = window.location.href.replace("command", "sse");
     }
@@ -266,7 +265,6 @@ function executeCommandFromArgMapWithDomain(domain, form, outDiv, sse) {
             createEventSource(domain, outDiv);
         }
     } else {
-        // redirect
         location.href = domain;
     }
     return false;