From a7e0cd03dd805d7c6d20323637e0a5a95ae2fb65 Mon Sep 17 00:00:00 2001 From: xdnw Date: Fri, 19 Jan 2024 05:43:40 +0000 Subject: [PATCH 1/5] Add sitemap to sidebar --- .../java/com/locutus/wiki/WikiGenHandler.java | 22 ++++++ .../manager/v2/command/CommandGroup.java | 3 +- .../discord/web/commands/page/TestPages.java | 18 ++--- .../locutus/discord/web/jooby/WebRoot.java | 26 +------ src/main/jte/main.jte | 2 +- src/main/jte/sidebar.jte | 72 +++++++++++-------- 6 files changed, 80 insertions(+), 63 deletions(-) diff --git a/src/main/java/com/locutus/wiki/WikiGenHandler.java b/src/main/java/com/locutus/wiki/WikiGenHandler.java index 97bf55873..7cea042ed 100644 --- a/src/main/java/com/locutus/wiki/WikiGenHandler.java +++ b/src/main/java/com/locutus/wiki/WikiGenHandler.java @@ -43,6 +43,7 @@ import link.locutus.discord.commands.manager.v2.impl.pw.CommandManager2; import link.locutus.discord.commands.manager.v2.impl.pw.filter.PlaceholdersMap; import link.locutus.discord.gpt.pw.PWGPTHandler; +import org.json.JSONObject; import java.io.File; import java.io.IOException; @@ -202,4 +203,25 @@ private void writePage(BotWikiGen page) throws IOException { File file = new File(pathRelative + File.separator + page.getPageName().toLowerCase().replace(" ", "_") + ".md"); Files.write(file.toPath(), markdown.getBytes()); } + + public JSONObject generateSiteMap() { + JSONObject wiki = new JSONObject(); + wiki.put("home", ""); + JSONObject wikiIntro = new JSONObject(); + for (BotWikiGen page : getIntroPages()) { + wikiIntro.put(page.getPageName(), ""); + } + wiki.put("intro", wikiIntro); + JSONObject wikiTopics = new JSONObject(); + for (BotWikiGen page : getTopicPages()) { + wikiTopics.put(page.getPageName(), ""); + } + wiki.put("topic", wikiTopics); + JSONObject wikiCommands = new JSONObject(); + for (BotWikiGen page : getCommandPages()) { + wikiCommands.put(page.getPageName(), ""); + } + wiki.put("command", wikiCommands); + return wiki; + } } diff --git a/src/main/java/link/locutus/discord/commands/manager/v2/command/CommandGroup.java b/src/main/java/link/locutus/discord/commands/manager/v2/command/CommandGroup.java index 94d2b7096..824300be3 100644 --- a/src/main/java/link/locutus/discord/commands/manager/v2/command/CommandGroup.java +++ b/src/main/java/link/locutus/discord/commands/manager/v2/command/CommandGroup.java @@ -1,6 +1,5 @@ package link.locutus.discord.commands.manager.v2.command; -import com.google.gson.JsonObject; import gg.jte.generated.precompiled.command.JtecommandgroupGenerated; import link.locutus.discord.commands.manager.v2.binding.ValueStore; import link.locutus.discord.commands.manager.v2.binding.WebStore; @@ -34,7 +33,7 @@ public CommandGroup(CommandCallable parent, String[] aliases, ValueStore store, this.aliases = Arrays.asList(aliases); } - public JSONObject toCommandMap() { + public JSONObject generateSiteMap() { JSONObject root = new JSONObject(); getParametricCallables(f -> { String fullPath = f.getFullPath(); diff --git a/src/main/java/link/locutus/discord/web/commands/page/TestPages.java b/src/main/java/link/locutus/discord/web/commands/page/TestPages.java index 9ee075f11..ec7d7bca9 100644 --- a/src/main/java/link/locutus/discord/web/commands/page/TestPages.java +++ b/src/main/java/link/locutus/discord/web/commands/page/TestPages.java @@ -7,13 +7,13 @@ import net.dv8tion.jda.api.entities.User; public class TestPages { - @Command(desc = "Show running tax expenses by day by bracket") - public Object testIndex(@Me DBNation nation) { - return "Hello World: " + (nation != null ? nation.getNation() : "no nation"); - } - - @Command - public Object testPost(String argument) { - return "Test post: " + argument; - } +// @Command(desc = "Show running tax expenses by day by bracket") +// public Object testIndex(@Me DBNation nation) { +// return "Hello World: " + (nation != null ? nation.getNation() : "no nation"); +// } +// +// @Command +// public Object testPost(String argument) { +// return "Test post: " + argument; +// } } diff --git a/src/main/java/link/locutus/discord/web/jooby/WebRoot.java b/src/main/java/link/locutus/discord/web/jooby/WebRoot.java index 9f901ea0f..14f0a2d47 100644 --- a/src/main/java/link/locutus/discord/web/jooby/WebRoot.java +++ b/src/main/java/link/locutus/discord/web/jooby/WebRoot.java @@ -2,15 +2,9 @@ import com.aayushatharva.brotli4j.Brotli4jLoader; -import com.google.gson.JsonObject; -import com.locutus.wiki.BotWikiGen; import com.locutus.wiki.WikiGenHandler; -import gg.jte.CodeResolver; import gg.jte.ContentType; import gg.jte.TemplateEngine; -import gg.jte.TemplateOutput; -import gg.jte.html.HtmlInterceptor; -import gg.jte.html.HtmlPolicy; import gg.jte.resolve.DirectoryCodeResolver; import gg.jte.watcher.DirectoryWatcher; import io.javalin.Javalin; @@ -257,24 +251,10 @@ public File getFileRoot() { public JSONObject generateSiteMap() { if (siteMap != null) return siteMap; - siteMap = new JSONObject(); - // Pages - siteMap.put("pages", pageHandler.getCommands().toCommandMap()); - // Commands - siteMap.put("command", Locutus.cmd().getV2().getCommands().toCommandMap()); - // Wiki - JSONObject wiki = new JSONObject(); - wiki.put("home", ""); + siteMap = pageHandler.getCommands().generateSiteMap(); + siteMap.put("command", Locutus.cmd().getV2().getCommands().generateSiteMap()); WikiGenHandler gen = new WikiGenHandler("", Locutus.cmd().getV2()); - for (BotWikiGen page : gen.getIntroPages()) { - wiki.put("intro", page.getPageName()); - } - for (BotWikiGen page : gen.getTopicPages()) { - wiki.put("topic", page.getPageName()); - } - for (BotWikiGen page : gen.getCommandPages()) { - wiki.put("command", page.getPageName()); - } + JSONObject wiki = gen.generateSiteMap(); siteMap.put("wiki", wiki); return siteMap; } diff --git a/src/main/jte/main.jte b/src/main/jte/main.jte index 48ab2dbf5..8de7485f4 100644 --- a/src/main/jte/main.jte +++ b/src/main/jte/main.jte @@ -30,7 +30,7 @@ <%-- --%> - +<%-- --%> diff --git a/src/main/jte/sidebar.jte b/src/main/jte/sidebar.jte index 9a5684e7b..0485bebd7 100644 --- a/src/main/jte/sidebar.jte +++ b/src/main/jte/sidebar.jte @@ -8,16 +8,13 @@ -
+
- +
Press / to focus
-
- -
<%--
  • --%> <%--
    --%> <%-- Getting started--%> @@ -396,50 +393,69 @@ function toggleDarkMode() { } } // Init sidebar docs filtering -// get #sidbar var sidebar = document.getElementById("sidebar"); -// get data-src attribute as json object -var sidebarData = JSON.parse(sidebar.getAttribute("data-src")); function createNestedList(jsonObject, parentElement, path = '') { - var ul = document.createElement('ol'); - ul.className = ''; - + var ul = document.createElement('ul'); + if (path === '') { + ul.id = 'list'; + } + ul.className = 'sidebar-nav p-3 pt-0'; for (var key in jsonObject) { var li = document.createElement('li'); - - // If the value is an object, create a nested list + li.className = 'nav-item'; if (typeof jsonObject[key] === 'object') { - li.textContent = key; + var h6 = document.createElement('h6'); + h6.className = 'sidebar-header'; + h6.textContent = key; + li.appendChild(h6); var newPath = path ? path + '/' + key : key; + if (path.startsWith('wiki')) { + newPath = "/~https://github.com/xdnw/locutus/wiki"; + } var nestedUl = createNestedList(jsonObject[key], li, newPath); nestedUl.id = key; li.appendChild(nestedUl); } else { - // If the value is a string, use it as the name, otherwise use the key as the name var a = document.createElement('a'); - a.className = ''; + a.className = 'nav-link'; a.href = (path ? path + '/' + key : key); // use the full path for the href - a.textContent = typeof jsonObject[key] === 'string' ? jsonObject[key] : key; + let name = (typeof jsonObject[key] === 'string' && jsonObject[key] !== '') ? jsonObject[key] : key; + var span = document.createElement('span'); + span.className = 'sidebar-search-name'; + span.textContent = name; + a.appendChild(span); li.appendChild(a); } ul.appendChild(li); } - parentElement.appendChild(ul); return ul; } -console.log(sidebarData); -createNestedList(sidebarData, document.getElementById("sidebarlist")); +createNestedList(JSON.parse(sidebar.getAttribute("data-src")), document.getElementById("sidebarlist")); +sidebar.removeAttribute("data-src"); -new List("sidebar", {valueNames: ["sidebar-search-name"]}); -document.addEventListener("keydown", function (event) { - if (!document.querySelector(".form-control:focus")) { - event = event || window.event; - if (event.which == 191) { - document.querySelector(".filter-docs .form-control").focus(); - event.preventDefault(); +unhide_parent = (ele) => { + if(ele.parentNode.parentNode.style.display=="none") { + ele.parentNode.parentNode.style.display=''; + unhide_parent(ele.parentNode.parentNode) + } +}; +function filtersearch() { + var input, filter, ul, tr, search, i, txtValue; + input = document.getElementById("sb-s-i"); + filter = input.value.toUpperCase(); + ul = document.getElementById("list"); + tr = ul.getElementsByTagName("li"); + for (i = 0; i < tr.length; i++) { + search = tr[i].getElementsByTagName("a")[0]; + txtValue = search.textContent || search.innerText; + if (txtValue.toUpperCase().indexOf(filter) > -1) { + tr[i].style.display = ""; + unhide_parent(tr[i]) + } else { + tr[i].style.display = "none"; } } -}); +} \ No newline at end of file From 2b19e8cf98b9637a683767708375536c9131684e Mon Sep 17 00:00:00 2001 From: xdnw Date: Fri, 19 Jan 2024 05:50:23 +0000 Subject: [PATCH 2/5] Preserve insert order json --- .../java/com/locutus/wiki/WikiGenHandler.java | 26 +++++++++---------- .../locutus/wiki/pages/WikiAntiLeakPage.java | 2 +- .../wiki/pages/WikiAutoMaskingPage.java | 2 +- .../wiki/pages/WikiBeigeCyclingPage.java | 2 +- .../wiki/pages/WikiCustomSheetsPage.java | 2 +- .../wiki/pages/WikiDelegateServers.java | 2 +- .../wiki/pages/WikiFindingTargetsPage.java | 2 +- .../com/locutus/wiki/pages/WikiLoanPage.java | 2 +- .../com/locutus/wiki/pages/WikiSelfRoles.java | 2 +- .../wiki/pages/WikiSendTargetsPage.java | 2 +- .../com/locutus/wiki/pages/WikiSetupPage.java | 2 +- .../locutus/wiki/pages/WikiWarAlertsPage.java | 2 +- .../locutus/wiki/pages/WikiWarRoomPage.java | 2 +- .../manager/v2/command/CommandGroup.java | 13 +++++----- .../locutus/discord/web/jooby/WebRoot.java | 11 ++++---- 15 files changed, 38 insertions(+), 36 deletions(-) diff --git a/src/main/java/com/locutus/wiki/WikiGenHandler.java b/src/main/java/com/locutus/wiki/WikiGenHandler.java index 7cea042ed..72c7965e6 100644 --- a/src/main/java/com/locutus/wiki/WikiGenHandler.java +++ b/src/main/java/com/locutus/wiki/WikiGenHandler.java @@ -1,5 +1,6 @@ package com.locutus.wiki; +import com.google.gson.JsonObject; import com.locutus.wiki.pages.WikiAiTools; import com.locutus.wiki.pages.WikiAntiLeakPage; import com.locutus.wiki.pages.WikiArgumentsPage; @@ -43,7 +44,6 @@ import link.locutus.discord.commands.manager.v2.impl.pw.CommandManager2; import link.locutus.discord.commands.manager.v2.impl.pw.filter.PlaceholdersMap; import link.locutus.discord.gpt.pw.PWGPTHandler; -import org.json.JSONObject; import java.io.File; import java.io.IOException; @@ -204,24 +204,24 @@ private void writePage(BotWikiGen page) throws IOException { Files.write(file.toPath(), markdown.getBytes()); } - public JSONObject generateSiteMap() { - JSONObject wiki = new JSONObject(); - wiki.put("home", ""); - JSONObject wikiIntro = new JSONObject(); + public JsonObject generateSiteMap() { + JsonObject wiki = new JsonObject(); + wiki.addProperty("home", ""); + JsonObject wikiIntro = new JsonObject(); for (BotWikiGen page : getIntroPages()) { - wikiIntro.put(page.getPageName(), ""); + wikiIntro.addProperty(page.getPageName(), ""); } - wiki.put("intro", wikiIntro); - JSONObject wikiTopics = new JSONObject(); + wiki.add("intro", wikiIntro); + JsonObject wikiTopics = new JsonObject(); for (BotWikiGen page : getTopicPages()) { - wikiTopics.put(page.getPageName(), ""); + wikiTopics.addProperty(page.getPageName(), ""); } - wiki.put("topic", wikiTopics); - JSONObject wikiCommands = new JSONObject(); + wiki.add("topic", wikiTopics); + JsonObject wikiCommands = new JsonObject(); for (BotWikiGen page : getCommandPages()) { - wikiCommands.put(page.getPageName(), ""); + wikiCommands.addProperty(page.getPageName(), ""); } - wiki.put("command", wikiCommands); + wiki.add("command", wikiCommands); return wiki; } } diff --git a/src/main/java/com/locutus/wiki/pages/WikiAntiLeakPage.java b/src/main/java/com/locutus/wiki/pages/WikiAntiLeakPage.java index 49567ca6f..3bccaf5d5 100644 --- a/src/main/java/com/locutus/wiki/pages/WikiAntiLeakPage.java +++ b/src/main/java/com/locutus/wiki/pages/WikiAntiLeakPage.java @@ -7,7 +7,7 @@ public class WikiAntiLeakPage extends BotWikiGen { public WikiAntiLeakPage(CommandManager2 manager) { - super(manager, "announcements and opsec"); + super(manager, "announcements_and_opsec"); } @Override diff --git a/src/main/java/com/locutus/wiki/pages/WikiAutoMaskingPage.java b/src/main/java/com/locutus/wiki/pages/WikiAutoMaskingPage.java index 81f3479d0..b0c4ee163 100644 --- a/src/main/java/com/locutus/wiki/pages/WikiAutoMaskingPage.java +++ b/src/main/java/com/locutus/wiki/pages/WikiAutoMaskingPage.java @@ -12,7 +12,7 @@ public class WikiAutoMaskingPage extends BotWikiGen { public WikiAutoMaskingPage(CommandManager2 manager) { - super(manager, "auto masking"); + super(manager, "auto_masking"); } @Override diff --git a/src/main/java/com/locutus/wiki/pages/WikiBeigeCyclingPage.java b/src/main/java/com/locutus/wiki/pages/WikiBeigeCyclingPage.java index acf87dbc5..19c8055c5 100644 --- a/src/main/java/com/locutus/wiki/pages/WikiBeigeCyclingPage.java +++ b/src/main/java/com/locutus/wiki/pages/WikiBeigeCyclingPage.java @@ -14,7 +14,7 @@ public class WikiBeigeCyclingPage extends BotWikiGen { public WikiBeigeCyclingPage(CommandManager2 manager) { - super(manager, "beige cycling"); + super(manager, "beige_cycling"); } @Override diff --git a/src/main/java/com/locutus/wiki/pages/WikiCustomSheetsPage.java b/src/main/java/com/locutus/wiki/pages/WikiCustomSheetsPage.java index 82ff6b67a..deeea2c1c 100644 --- a/src/main/java/com/locutus/wiki/pages/WikiCustomSheetsPage.java +++ b/src/main/java/com/locutus/wiki/pages/WikiCustomSheetsPage.java @@ -15,7 +15,7 @@ public class WikiCustomSheetsPage extends BotWikiGen { public WikiCustomSheetsPage(CommandManager2 manager) { - super(manager, "custom spreadsheets"); + super(manager, "custom_spreadsheets"); } @Override diff --git a/src/main/java/com/locutus/wiki/pages/WikiDelegateServers.java b/src/main/java/com/locutus/wiki/pages/WikiDelegateServers.java index 833ebef4f..b29bc1af3 100644 --- a/src/main/java/com/locutus/wiki/pages/WikiDelegateServers.java +++ b/src/main/java/com/locutus/wiki/pages/WikiDelegateServers.java @@ -5,7 +5,7 @@ public class WikiDelegateServers extends BotWikiGen { public WikiDelegateServers(CommandManager2 manager) { - super(manager, "multiple servers"); + super(manager, "multiple_servers"); } @Override diff --git a/src/main/java/com/locutus/wiki/pages/WikiFindingTargetsPage.java b/src/main/java/com/locutus/wiki/pages/WikiFindingTargetsPage.java index 8ea668452..16b9a10be 100644 --- a/src/main/java/com/locutus/wiki/pages/WikiFindingTargetsPage.java +++ b/src/main/java/com/locutus/wiki/pages/WikiFindingTargetsPage.java @@ -5,7 +5,7 @@ public class WikiFindingTargetsPage extends BotWikiGen { public WikiFindingTargetsPage(CommandManager2 manager) { - super(manager, "target finding"); + super(manager, "target_finding"); } @Override diff --git a/src/main/java/com/locutus/wiki/pages/WikiLoanPage.java b/src/main/java/com/locutus/wiki/pages/WikiLoanPage.java index eb75dc68d..6922eb2a8 100644 --- a/src/main/java/com/locutus/wiki/pages/WikiLoanPage.java +++ b/src/main/java/com/locutus/wiki/pages/WikiLoanPage.java @@ -10,7 +10,7 @@ public class WikiLoanPage extends BotWikiGen { public WikiLoanPage(CommandManager2 manager) { - super(manager, "loan reporting"); + super(manager, "loan_reporting"); } @Override diff --git a/src/main/java/com/locutus/wiki/pages/WikiSelfRoles.java b/src/main/java/com/locutus/wiki/pages/WikiSelfRoles.java index d28e9d1e2..e9cfc132b 100644 --- a/src/main/java/com/locutus/wiki/pages/WikiSelfRoles.java +++ b/src/main/java/com/locutus/wiki/pages/WikiSelfRoles.java @@ -5,7 +5,7 @@ public class WikiSelfRoles extends BotWikiGen { public WikiSelfRoles(CommandManager2 manager) { - super(manager, "multiple servers"); + super(manager, "multiple_servers"); } @Override diff --git a/src/main/java/com/locutus/wiki/pages/WikiSendTargetsPage.java b/src/main/java/com/locutus/wiki/pages/WikiSendTargetsPage.java index af408be0c..2d727c450 100644 --- a/src/main/java/com/locutus/wiki/pages/WikiSendTargetsPage.java +++ b/src/main/java/com/locutus/wiki/pages/WikiSendTargetsPage.java @@ -7,7 +7,7 @@ public class WikiSendTargetsPage extends BotWikiGen { public WikiSendTargetsPage(CommandManager2 manager) { - super(manager, "sending targets"); + super(manager, "sending_targets"); } @Override diff --git a/src/main/java/com/locutus/wiki/pages/WikiSetupPage.java b/src/main/java/com/locutus/wiki/pages/WikiSetupPage.java index a28a1f4db..a4ccdbca9 100644 --- a/src/main/java/com/locutus/wiki/pages/WikiSetupPage.java +++ b/src/main/java/com/locutus/wiki/pages/WikiSetupPage.java @@ -18,7 +18,7 @@ public class WikiSetupPage extends BotWikiGen { public WikiSetupPage(CommandManager2 manager) { - super(manager, "initial setup"); + super(manager, "initial_setup"); } @Override diff --git a/src/main/java/com/locutus/wiki/pages/WikiWarAlertsPage.java b/src/main/java/com/locutus/wiki/pages/WikiWarAlertsPage.java index 726d11aae..1a6458cbe 100644 --- a/src/main/java/com/locutus/wiki/pages/WikiWarAlertsPage.java +++ b/src/main/java/com/locutus/wiki/pages/WikiWarAlertsPage.java @@ -13,7 +13,7 @@ public class WikiWarAlertsPage extends BotWikiGen { public WikiWarAlertsPage(CommandManager2 manager) { - super(manager, "war alerts"); + super(manager, "war_alerts"); } @Override diff --git a/src/main/java/com/locutus/wiki/pages/WikiWarRoomPage.java b/src/main/java/com/locutus/wiki/pages/WikiWarRoomPage.java index dd4167241..2e7a8b06e 100644 --- a/src/main/java/com/locutus/wiki/pages/WikiWarRoomPage.java +++ b/src/main/java/com/locutus/wiki/pages/WikiWarRoomPage.java @@ -8,7 +8,7 @@ public class WikiWarRoomPage extends BotWikiGen { public WikiWarRoomPage(CommandManager2 manager) { - super(manager, "war rooms"); + super(manager, "war_rooms"); } @Override diff --git a/src/main/java/link/locutus/discord/commands/manager/v2/command/CommandGroup.java b/src/main/java/link/locutus/discord/commands/manager/v2/command/CommandGroup.java index 824300be3..84209c4e9 100644 --- a/src/main/java/link/locutus/discord/commands/manager/v2/command/CommandGroup.java +++ b/src/main/java/link/locutus/discord/commands/manager/v2/command/CommandGroup.java @@ -1,5 +1,6 @@ package link.locutus.discord.commands.manager.v2.command; +import com.google.gson.JsonObject; import gg.jte.generated.precompiled.command.JtecommandgroupGenerated; import link.locutus.discord.commands.manager.v2.binding.ValueStore; import link.locutus.discord.commands.manager.v2.binding.WebStore; @@ -33,20 +34,20 @@ public CommandGroup(CommandCallable parent, String[] aliases, ValueStore store, this.aliases = Arrays.asList(aliases); } - public JSONObject generateSiteMap() { - JSONObject root = new JSONObject(); + public JsonObject generateSiteMap() { + JsonObject root = new JsonObject(); getParametricCallables(f -> { String fullPath = f.getFullPath(); String[] split = fullPath.split(" "); - JSONObject current = root; + JsonObject current = root; for (int i = 0; i < split.length - 1; i++) { String s = split[i]; if (!current.has(s)) { - current.put(s, new JSONObject()); + current.add(s, new JsonObject()); } - current = current.getJSONObject(s); + current = current.getAsJsonObject(s); } - current.put(split[split.length - 1], ""); + current.addProperty(split[split.length - 1], ""); return false; }); return root; diff --git a/src/main/java/link/locutus/discord/web/jooby/WebRoot.java b/src/main/java/link/locutus/discord/web/jooby/WebRoot.java index 14f0a2d47..9de374a63 100644 --- a/src/main/java/link/locutus/discord/web/jooby/WebRoot.java +++ b/src/main/java/link/locutus/discord/web/jooby/WebRoot.java @@ -2,6 +2,7 @@ import com.aayushatharva.brotli4j.Brotli4jLoader; +import com.google.gson.JsonObject; import com.locutus.wiki.WikiGenHandler; import gg.jte.ContentType; import gg.jte.TemplateEngine; @@ -247,15 +248,15 @@ public File getFileRoot() { return fileRoot; } - private JSONObject siteMap; + private JsonObject siteMap; - public JSONObject generateSiteMap() { + public JsonObject generateSiteMap() { if (siteMap != null) return siteMap; siteMap = pageHandler.getCommands().generateSiteMap(); - siteMap.put("command", Locutus.cmd().getV2().getCommands().generateSiteMap()); + siteMap.add("command", Locutus.cmd().getV2().getCommands().generateSiteMap()); WikiGenHandler gen = new WikiGenHandler("", Locutus.cmd().getV2()); - JSONObject wiki = gen.generateSiteMap(); - siteMap.put("wiki", wiki); + JsonObject wiki = gen.generateSiteMap(); + siteMap.add("wiki", wiki); return siteMap; } From 35c51d5e5ae3363d337f8bb70870c028bdbd116b Mon Sep 17 00:00:00 2001 From: xdnw Date: Fri, 19 Jan 2024 12:46:55 +0000 Subject: [PATCH 3/5] Search --- .../manager/v2/binding/MethodParser.java | 2 + .../v2/binding/bindings/Placeholders.java | 2 +- .../v2/command/ParametricCallable.java | 3 +- .../v2/impl/pw/commands/GrantCommands.java | 3 +- .../v2/impl/pw/filter/NationPlaceholders.java | 42 ++- .../web/commands/binding/AuthBindings.java | 12 +- .../discord/web/commands/page/IndexPages.java | 13 +- .../discord/web/commands/page/StatPages.java | 2 + .../discord/web/jooby/PageHandler.java | 38 +- .../locutus/discord/web/jooby/WebRoot.java | 56 --- src/main/jte/command/commandgroup.jte | 5 - src/main/jte/command/parametriccallable.jte | 3 - src/main/jte/data/barchartdatasrc.jte | 1 + src/main/jte/footer.jte | 39 ++ src/main/jte/guild/milcom/globaltierstats.jte | 5 +- src/main/jte/main.jte | 65 +--- src/main/jte/navbar.jte | 2 +- src/main/jte/sidebar.jte | 335 +----------------- 18 files changed, 127 insertions(+), 501 deletions(-) create mode 100644 src/main/jte/footer.jte diff --git a/src/main/java/link/locutus/discord/commands/manager/v2/binding/MethodParser.java b/src/main/java/link/locutus/discord/commands/manager/v2/binding/MethodParser.java index 1d41fd54e..92ce02413 100644 --- a/src/main/java/link/locutus/discord/commands/manager/v2/binding/MethodParser.java +++ b/src/main/java/link/locutus/discord/commands/manager/v2/binding/MethodParser.java @@ -139,6 +139,8 @@ public T apply(ValueStore store, Object t) { if (!paramKey.isDefault()) { System.out.println("Failed to apply " + paramKey + " to " + method.getDeclaringClass().getSimpleName() + "#" + method.getName()); throw e; + } else { + System.out.println("Option is default " + paramKey + " to " + method.getDeclaringClass().getSimpleName() + "#" + method.getName() + " | " + e.getMessage()); } arg = null; } diff --git a/src/main/java/link/locutus/discord/commands/manager/v2/binding/bindings/Placeholders.java b/src/main/java/link/locutus/discord/commands/manager/v2/binding/bindings/Placeholders.java index 22af93446..07c5bb06f 100644 --- a/src/main/java/link/locutus/discord/commands/manager/v2/binding/bindings/Placeholders.java +++ b/src/main/java/link/locutus/discord/commands/manager/v2/binding/bindings/Placeholders.java @@ -517,7 +517,7 @@ public Set parseSet(ValueStore store2, String input) { // get function TypedFunction function = functions.get(section); if (function != null) { - System.out.println("Return function 1" + function.getName() + " | " + function.getType()); + System.out.println("Return function 1:" + function.getName() + " | " + function.getType()); return function; } System.out.println("Return non function section " + section); diff --git a/src/main/java/link/locutus/discord/commands/manager/v2/command/ParametricCallable.java b/src/main/java/link/locutus/discord/commands/manager/v2/command/ParametricCallable.java index c60f24b1e..e3dabaeb2 100644 --- a/src/main/java/link/locutus/discord/commands/manager/v2/command/ParametricCallable.java +++ b/src/main/java/link/locutus/discord/commands/manager/v2/command/ParametricCallable.java @@ -109,6 +109,7 @@ public ParametricCallable(CommandCallable parent, ValueStore store, Object objec for (Annotation annotation : annotations) { if (annotation instanceof Switch) { parameter.setFlag(((Switch) annotation).value()); + parameter.setOptional(true); } else if (annotation instanceof Default) { parameter.setOptional(true); String[] value = ((Default) annotation).value(); @@ -743,7 +744,7 @@ public Object apply(ParameterData param, Object o) { public Object apply(ParameterData param, Object o) { if (o == null) { if (!param.getBinding().isConsumer(store)) { - return locals.getProvided(param.getBinding().getKey(), false); + return locals.getProvided(param.getBinding().getKey(), !param.isOptional()); } String def = param.getDefaultValueString(); if (def != null) { diff --git a/src/main/java/link/locutus/discord/commands/manager/v2/impl/pw/commands/GrantCommands.java b/src/main/java/link/locutus/discord/commands/manager/v2/impl/pw/commands/GrantCommands.java index 491b8b471..00b8576aa 100644 --- a/src/main/java/link/locutus/discord/commands/manager/v2/impl/pw/commands/GrantCommands.java +++ b/src/main/java/link/locutus/discord/commands/manager/v2/impl/pw/commands/GrantCommands.java @@ -40,6 +40,7 @@ import link.locutus.discord.util.offshore.OffshoreInstance; import link.locutus.discord.apiv1.enums.ResourceType; import link.locutus.discord.util.offshore.TransferResult; +import link.locutus.discord.web.jooby.WebRoot; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.entities.Role; @@ -2278,7 +2279,7 @@ public String withdrawEscrowed(@Me OffshoreInstance offshore, @Me IMessageIO cha @Command @RolePermission(Roles.MEMBER) public synchronized String grants(@Me GuildDB db, DBNation nation) { - String baseUrl = Settings.INSTANCE.WEB.REDIRECT + "/" + db.getIdLong() + "/"; + String baseUrl = WebRoot.REDIRECT + "/" + db.getIdLong() + "/"; List pages = Arrays.asList( baseUrl + "infragrants/" + nation.getNation_id(), baseUrl + "landgrants/" + nation.getNation_id(), diff --git a/src/main/java/link/locutus/discord/commands/manager/v2/impl/pw/filter/NationPlaceholders.java b/src/main/java/link/locutus/discord/commands/manager/v2/impl/pw/filter/NationPlaceholders.java index dd47c9e7d..ff09051a3 100644 --- a/src/main/java/link/locutus/discord/commands/manager/v2/impl/pw/filter/NationPlaceholders.java +++ b/src/main/java/link/locutus/discord/commands/manager/v2/impl/pw/filter/NationPlaceholders.java @@ -1,5 +1,6 @@ package link.locutus.discord.commands.manager.v2.impl.pw.filter; +import io.javalin.http.RedirectResponse; import it.unimi.dsi.fastutil.objects.ObjectArraySet; import link.locutus.discord.Locutus; import link.locutus.discord.commands.manager.v2.binding.Key; @@ -16,6 +17,8 @@ import link.locutus.discord.commands.manager.v2.command.CommandCallable; import link.locutus.discord.commands.manager.v2.command.CommandUsageException; import link.locutus.discord.commands.manager.v2.command.IMessageIO; +import link.locutus.discord.commands.manager.v2.command.ParameterData; +import link.locutus.discord.commands.manager.v2.command.ParametricCallable; import link.locutus.discord.commands.manager.v2.impl.discord.permission.RolePermission; import link.locutus.discord.commands.manager.v2.impl.pw.binding.PWBindings; import link.locutus.discord.commands.manager.v2.impl.pw.refs.CM; @@ -114,17 +117,20 @@ public String getDescription() { public List getMetrics(ValueStore store) { List result = new ArrayList<>(); - for (CommandCallable cmd : getFilterCallables()) { - String id = cmd.aliases().get(0); + for (CommandCallable callable : getFilterCallables()) { + ParametricCallable cmd = (ParametricCallable) callable; + if (cmd.getUserParameters().stream().anyMatch(f -> !f.isOptional())) continue; try { - TypedFunction typeFunction = formatRecursively(store, id, null, 0, false); - if (typeFunction == null) continue; - - NationAttribute metric = new NationAttribute(cmd.getPrimaryCommandId(), cmd.simpleDesc(), typeFunction.getType(), typeFunction); - result.add(metric); - } catch (IllegalStateException | CommandUsageException ignore) { - continue; - } + String id = cmd.aliases().get(0); + try { + TypedFunction typeFunction = formatRecursively(store, id, null, 0, false); + if (typeFunction == null) continue; + NationAttribute metric = new NationAttribute(cmd.getPrimaryCommandId(), cmd.simpleDesc(), typeFunction.getType(), typeFunction); + result.add(metric); + } catch (IllegalStateException | CommandUsageException ignore) { + continue; + } + } catch (RedirectResponse ignore) {} } return result; } @@ -166,12 +172,16 @@ public NationAttributeDouble getMetricDouble(ValueStore store, String id, boolea public List getMetricsDouble(ValueStore store) { List result = new ArrayList<>(); - for (CommandCallable cmd : getFilterCallables()) { - String id = cmd.aliases().get(0); - NationAttributeDouble metric = getMetricDouble(store, id, true); - if (metric != null) { - result.add(metric); - } + for (CommandCallable callable : getFilterCallables()) { + ParametricCallable cmd = (ParametricCallable) callable; + if (cmd.getUserParameters().stream().anyMatch(f -> !f.isOptional())) continue; + try { + String id = cmd.aliases().get(0); + NationAttributeDouble metric = getMetricDouble(store, id, true); + if (metric != null) { + result.add(metric); + } + } catch (RedirectResponse ignore) {} } for (Map.Entry entry : customMetrics.entrySet()) { String id = entry.getKey(); diff --git a/src/main/java/link/locutus/discord/web/commands/binding/AuthBindings.java b/src/main/java/link/locutus/discord/web/commands/binding/AuthBindings.java index c590564ce..6deb6ca67 100644 --- a/src/main/java/link/locutus/discord/web/commands/binding/AuthBindings.java +++ b/src/main/java/link/locutus/discord/web/commands/binding/AuthBindings.java @@ -115,7 +115,15 @@ public static void setGuild(Context context, Guild guild) { @Me @Binding public static Guild guild(Context context, @Default @Me DBNation nation, @Default @Me User user) { - return guild(context, nation, user, true); + System.out.println("Get guild " + context + " | " + nation + " | " + user); + try { + Guild guild = guild(context, nation, user, true); + System.out.println("Return guild"); + return guild; + } catch (RuntimeException e) { + e.printStackTrace(); + throw e; + } } public static Guild guild(Context context, @Default @Me DBNation nation, @Default @Me User user, boolean allowRedirect) { @@ -482,7 +490,7 @@ public static Auth getAuth(WebStore ws, Context context, boolean allowRedirect, String title = "Bot Login | timestamp:" + System.currentTimeMillis(); String body = "DO NOT SHARE THIS URL OR OPEN IT IF YOU DID NOT REQUEST IT:
    " + - MarkupUtil.htmlUrl(Settings.INSTANCE.WEB.REDIRECT + " | Verify Login", authUrl); + MarkupUtil.htmlUrl(WebRoot.REDIRECT + " | Verify Login", authUrl); ApiKeyPool pool = ApiKeyPool.create(Settings.INSTANCE.NATION_ID, Settings.INSTANCE.API_KEY_PRIMARY); JsonObject result = nation.sendMail(pool, title, body, true); 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 index cd4f87d50..d8758bff5 100644 --- a/src/main/java/link/locutus/discord/web/commands/page/IndexPages.java +++ b/src/main/java/link/locutus/discord/web/commands/page/IndexPages.java @@ -83,7 +83,7 @@ public Object index(WebStore ws, Context context) throws IOException { } @Command - public Object search(WebStore ws, @Me GuildDB db, String term) { + public Object search(WebStore ws, String term) { term = URLDecoder.decode(term).trim(); double nameEquals = 100; @@ -93,8 +93,7 @@ public Object search(WebStore ws, @Me GuildDB db, String term) { String termLow = term.toLowerCase(); - String urlBase = Settings.INSTANCE.WEB.REDIRECT + "/" + db.getIdLong() + "/"; - String cmdUrl = urlBase + "command/"; + String urlBase = WebRoot.REDIRECT + "/"; List results = new ArrayList<>(); @@ -136,7 +135,7 @@ public void accept(String cmdPrefix, CommandCallable callable) { }; recursive(Locutus.imp().getCommandManager().getV2().getCommands(), f -> cmdSearch.accept(urlBase + "command/", f)); - recursive(WebRoot.getInstance().getPageHandler().getCommands(), f -> cmdSearch.accept(urlBase + "/", f)); + recursive(WebRoot.getInstance().getPageHandler().getCommands(), f -> cmdSearch.accept(urlBase + "page/", f)); for (DBNation nation : Locutus.imp().getNationDB().getNations().values()) { @@ -226,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 = Settings.INSTANCE.WEB.REDIRECT + "/" + db.getIdLong() + "/command/"; - String pageEndpoint = Settings.INSTANCE.WEB.REDIRECT + "/" + db.getIdLong() + "/"; + String cmdEndpoint = WebRoot.REDIRECT + "/" + db.getIdLong() + "/command/"; + String pageEndpoint = WebRoot.REDIRECT + "/" + db.getIdLong() + "/"; result.append( commands.toHtml(ws, stack.getPermissionHandler(), cmdEndpoint, false) @@ -336,7 +335,7 @@ public Object guildselect(WebStore ws, Context context, ValueStore store, @Defau @Command() public Object logout(Context context) throws IOException { WebRoot.getInstance().getPageHandler().logout(context); - return "Logging out. If you are not redirected, please visit " + Settings.INSTANCE.WEB.REDIRECT + ""; + return "Logging out. If you are not redirected, please visit " + WebRoot.REDIRECT + ""; } @Command() diff --git a/src/main/java/link/locutus/discord/web/commands/page/StatPages.java b/src/main/java/link/locutus/discord/web/commands/page/StatPages.java index e4f7fe541..bea6bc5f4 100644 --- a/src/main/java/link/locutus/discord/web/commands/page/StatPages.java +++ b/src/main/java/link/locutus/discord/web/commands/page/StatPages.java @@ -8,6 +8,7 @@ import link.locutus.discord.commands.manager.v2.binding.WebStore; import link.locutus.discord.commands.manager.v2.binding.annotation.Command; import link.locutus.discord.commands.manager.v2.binding.annotation.Default; +import link.locutus.discord.commands.manager.v2.binding.annotation.NoFormat; import link.locutus.discord.commands.manager.v2.binding.annotation.Switch; import link.locutus.discord.commands.manager.v2.binding.annotation.Timediff; import link.locutus.discord.commands.manager.v2.binding.annotation.Timestamp; @@ -84,6 +85,7 @@ public Object aaStats(WebStore ws, Set metrics, @Timestamp long } @Command() + @NoFormat public Object globalTierStats(WebStore ws, Set metrics, int topX, @Default("getCities") NationAttributeDouble groupBy, @Switch("t") boolean total) { if (topX > 250) return "Treaty information is not available for those alliances (outside top 80)"; diff --git a/src/main/java/link/locutus/discord/web/jooby/PageHandler.java b/src/main/java/link/locutus/discord/web/jooby/PageHandler.java index 3351e6b8d..c8590a5bc 100644 --- a/src/main/java/link/locutus/discord/web/jooby/PageHandler.java +++ b/src/main/java/link/locutus/discord/web/jooby/PageHandler.java @@ -432,7 +432,7 @@ private void handleCommand(Context ctx) { } cmd.validatePermissions(stack.getStore(), permisser); - String endpoint = Settings.INSTANCE.WEB.REDIRECT + "/command"; + String endpoint = WebRoot.REDIRECT + "/command"; ctx.result(WebUtil.minify(cmd.toHtml(stack.getStore().getProvided(WebStore.class), stack.getPermissionHandler(), endpoint, true))); break; } @@ -548,22 +548,30 @@ private LocalValueStore setupLocals(LocalValueStore locals, Context ctx, if (nation != null) { locals.addProvider(Key.of(DBNation.class, Me.class), nation); } - } - locals.addProvider(Key.of(Context.class), ctx); - Map path = ctx.pathParamMap(); - if (path.containsKey("guild_id") && args != null && !args.isEmpty()) { - Long guildId = Long.parseLong(path.get("guild_id")); - args.remove(guildId + ""); - GuildDB guildDb = Locutus.imp().getGuildDB(guildId); - if (guildDb == null) { - throw new IllegalArgumentException("No guild found for id: " + guildId); + Guild guild = AuthBindings.guild(ctx, nation, user, false); + if (guild != null) { + GuildDB guildDb = Locutus.imp().getGuildDB(guild); + locals.addProvider(Key.of(Guild.class, Me.class), guild); + locals.addProvider(Key.of(GuildDB.class, Me.class), guildDb); } - Guild guild = guildDb.getGuild(); - - locals.addProvider(Key.of(Guild.class, Me.class), guild); - locals.addProvider(Key.of(GuildDB.class, Me.class), guildDb); } + + locals.addProvider(Key.of(Context.class), ctx); +// Map path = ctx.pathParamMap(); +// +// if (path.containsKey("guild_id") && args != null && !args.isEmpty()) { +// Long guildId = Long.parseLong(path.get("guild_id")); +// args.remove(guildId + ""); +// GuildDB guildDb = Locutus.imp().getGuildDB(guildId); +// if (guildDb == null) { +// throw new IllegalArgumentException("No guild found for id: " + guildId); +// } +// Guild guild = guildDb.getGuild(); +// +// locals.addProvider(Key.of(Guild.class, Me.class), guild); +// locals.addProvider(Key.of(GuildDB.class, Me.class), guildDb); +// } return locals; } @@ -592,7 +600,7 @@ public void sseCmdPage(SseClient2 sse) throws IOException { return; } - String redirectBase = Settings.INSTANCE.WEB.REDIRECT + "/command/" + cmd.getFullPath("/").toLowerCase() + "/"; + String redirectBase = WebRoot.REDIRECT + "/command/" + cmd.getFullPath("/").toLowerCase() + "/"; Map combined = parseQueryMap(ctx.queryParamMap()); ParametricCallable parametric = (ParametricCallable) cmd; diff --git a/src/main/java/link/locutus/discord/web/jooby/WebRoot.java b/src/main/java/link/locutus/discord/web/jooby/WebRoot.java index 9de374a63..0dd873ce9 100644 --- a/src/main/java/link/locutus/discord/web/jooby/WebRoot.java +++ b/src/main/java/link/locutus/discord/web/jooby/WebRoot.java @@ -260,63 +260,7 @@ public JsonObject generateSiteMap() { return siteMap; } - // { -// get("/{guildid}", ctx -> { -// Map path = ctx.pathMap(); -// Map headers = ctx.headerMap(); -// String url = ctx.getRequestURL(); -// Map query = ctx.queryMap(); -// String method = ctx.getMethod(); -// Map attributes = ctx.getAttributes(); -// }); -// } - public PageHandler getPageHandler() { return pageHandler; } - -// public static void main(String[] args) throws ClassNotFoundException, SQLException, InterruptedException, LoginException { -//// Settings.INSTANCE.reload(Settings.INSTANCE.getDefaultFile()); -//// Settings.INSTANCE.ENABLED_COMPONENTS.disableListeners(); -//// Settings.INSTANCE.ENABLED_COMPONENTS.disableTasks(); -//// -//// Locutus locutus = Locutus.create().start(); -//// -//// System.out.println("Port " + Settings.INSTANCE.WEB.PORT_HTTP + " | " + Settings.INSTANCE.WEB.PORT_HTTPS); -//// WebRoot webRoot = new WebRoot(Settings.INSTANCE.WEB.PORT_HTTP, Settings.INSTANCE.WEB.PORT_HTTPS); -// -// SSLPlugin plugin = new SSLPlugin(conf -> { -// if (Settings.INSTANCE.WEB.PRIVKEY_PASSWORD.isEmpty()) { -// conf.pemFromPath(Settings.INSTANCE.WEB.CERT_PATH, Settings.INSTANCE.WEB.PRIVKEY_PATH); -// } else { -// conf.pemFromPath(Settings.INSTANCE.WEB.CERT_PATH, Settings.INSTANCE.WEB.PRIVKEY_PATH, Settings.INSTANCE.WEB.PRIVKEY_PASSWORD); -// } -// conf.redirect = true; -// // set ports -// conf.securePort = Settings.INSTANCE.WEB.PORT; -// }); -// JavalinJte.init(createTemplateEngine()); -// Javalin javalin = Javalin.create(config -> { -//// if (Settings.INSTANCE.WEB.PORT_HTTPS > 0) { -//// config.plugins.register(plugin); -//// } -// config.plugins.enableDevLogging(); -//// config.enableCorsForOrigin(); -// if (Brotli4jLoader.isAvailable()) { -// System.out.println("Using brotli"); -// config.compression.brotliAndGzip(); -// } else { -// System.out.println("Using gzip"); -// config.compression.gzipOnly(); -// } -// }).start(Settings.INSTANCE.WEB.PORT); -// -// // print hello world -// javalin.get("/", ctx -> { -// System.out.println("Hello World"); -// ctx.result("Hello World"); -// }); -// -// javalin.start(); -// } } diff --git a/src/main/jte/command/commandgroup.jte b/src/main/jte/command/commandgroup.jte index 30a4d9e47..b006fb845 100644 --- a/src/main/jte/command/commandgroup.jte +++ b/src/main/jte/command/commandgroup.jte @@ -9,11 +9,6 @@ @param Map subcommands @param String endpoint @template.main(ws = ws, title = command.getFullPath(), navbar = null, content = @` -@if(command.getParent() != null) -
    - Go back ${command.getParent().getPrimaryCommandId()} -
    -@endif
    @if(command.help(ws.store()) != null)

    Help

    diff --git a/src/main/jte/command/parametriccallable.jte b/src/main/jte/command/parametriccallable.jte index 7f2f652d1..f7418d008 100644 --- a/src/main/jte/command/parametriccallable.jte +++ b/src/main/jte/command/parametriccallable.jte @@ -10,9 +10,6 @@ @param Content form @template.main(ws = ws, title = "Command: " + command.getPrimaryCommandId(), content = @`
    -@if(command.getParent() != null) -Go back ${command.getParent().getPrimaryCommandId()} -@endif @if(command.help(ws.store()) != null)

    Help

    $unsafe{MarkupUtil.markdownToHTML(command.help(ws.store()))}

    diff --git a/src/main/jte/data/barchartdatasrc.jte b/src/main/jte/data/barchartdatasrc.jte index 91820374e..daed12652 100644 --- a/src/main/jte/data/barchartdatasrc.jte +++ b/src/main/jte/data/barchartdatasrc.jte @@ -4,4 +4,5 @@ @param String title @param JsonObject data @param boolean stacked +${title} \ No newline at end of file diff --git a/src/main/jte/footer.jte b/src/main/jte/footer.jte new file mode 100644 index 000000000..2a2b92e00 --- /dev/null +++ b/src/main/jte/footer.jte @@ -0,0 +1,39 @@ +@import link.locutus.discord.commands.manager.v2.binding.WebStore +@import link.locutus.discord.config.Settings + \ No newline at end of file diff --git a/src/main/jte/guild/milcom/globaltierstats.jte b/src/main/jte/guild/milcom/globaltierstats.jte index dff174def..1d015b59c 100644 --- a/src/main/jte/guild/milcom/globaltierstats.jte +++ b/src/main/jte/guild/milcom/globaltierstats.jte @@ -17,8 +17,7 @@ @param boolean removeApps @template.main(ws = ws, title = "Global Stats", navbar = null, content = @`

    Search

    - - + @for (Integer sphereId : spheres.getSpheres())
    @@ -63,4 +62,4 @@ $(document).ready(function(){ }); }); - `) \ No newline at end of file +`) \ No newline at end of file diff --git a/src/main/jte/main.jte b/src/main/jte/main.jte index 8de7485f4..55d04a105 100644 --- a/src/main/jte/main.jte +++ b/src/main/jte/main.jte @@ -54,63 +54,12 @@
    ${content}
    - -<%-- Add navbar --%> -<%--@template.navbar(ws = ws)--%> -<%--add sidebar jte --%> -<%--@template.sidebar(ws = ws)--%> -<%----%> +@template.footer() + \ No newline at end of file diff --git a/src/main/jte/navbar.jte b/src/main/jte/navbar.jte index 837dd3788..6f4fc3a71 100644 --- a/src/main/jte/navbar.jte +++ b/src/main/jte/navbar.jte @@ -28,7 +28,7 @@
    diff --git a/src/main/jte/sidebar.jte b/src/main/jte/sidebar.jte index 0485bebd7..c5dec9901 100644 --- a/src/main/jte/sidebar.jte +++ b/src/main/jte/sidebar.jte @@ -8,342 +8,13 @@
    -
    +
    Press / to focus
    -<%-- --%>