Pardon command from web support

Xinecraft · Xinecraft · commit b1d9db83c0e4 · 2025-01-12T16:05:22.000+05:30
diff --git a/build.gradle b/build.gradle
@@ -19,7 +19,7 @@ allprojects {
         maven { url 'https://repo.enonic.com/public/' }
         maven { url "https://oss.sonatype.org/content/groups/public/" }
         maven { url "https://repo.aikar.co/content/groups/aikar/" }
-        maven { url 'https://papermc.io/repo/repository/maven-public/' }
+        maven { url 'https://repo.papermc.io/repository/maven-public/' }
         maven { url 'https://hub.spigotmc.org/nexus/content/groups/public/' }
 
         maven { url 'https://hub.spigotmc.org/nexus/content/repositories/snapshots/' }
diff --git a/bukkit/build.gradle b/bukkit/build.gradle
@@ -6,10 +6,10 @@ dependencies {
     compileOnly 'org.spigotmc:spigot-api:1.18.1-R0.1-SNAPSHOT'
     compileOnly 'com.github.MilkBowl:VaultAPI:1.7'
     compileOnly 'org.apache.logging.log4j:log4j-core:2.17.2'
-    compileOnly 'me.clip:placeholderapi:2.11.3'
+    compileOnly 'me.clip:placeholderapi:2.11.6'
     compileOnly 'com.viaversion:viaversion-api:4.7.0'
-    compileOnly files('D:/Wurky/MineTrax/Plugin Development/Plugins/VentureChat-2.23.2.jar')
-    compileOnly files('D:/Wurky/MineTrax/Plugin Development/Plugins/EpicCore-1.6.jar')
+    compileOnly files('W:/Wurky/MineTrax/Plugin Development/Plugins/VentureChat-2.23.2.jar')
+    compileOnly files('W:/Wurky/MineTrax/Plugin Development/Plugins/EpicCore-1.6.jar')
 }
 
 java {
diff --git a/bukkit/src/main/java/com/xinecraft/minetrax/bukkit/commander/BukkitCommander.java b/bukkit/src/main/java/com/xinecraft/minetrax/bukkit/commander/BukkitCommander.java
@@ -1,11 +1,12 @@
 package com.xinecraft.minetrax.bukkit.commander;
 
+import com.xinecraft.minetrax.common.MinetraxCommon;
 import com.xinecraft.minetrax.common.interfaces.commander.CommonCommander;
 import org.bukkit.Bukkit;
 
 public class BukkitCommander implements CommonCommander {
     @Override
     public void dispatchCommand(String command) {
-        Bukkit.dispatchCommand(Bukkit.getConsoleSender(), command);
+        MinetraxCommon.getInstance().getScheduler().run(() -> Bukkit.dispatchCommand(Bukkit.getConsoleSender(), command));
     }
 }
diff --git a/bukkit/src/main/java/com/xinecraft/minetrax/bukkit/webquery/BukkitWebQuery.java b/bukkit/src/main/java/com/xinecraft/minetrax/bukkit/webquery/BukkitWebQuery.java
@@ -169,8 +169,8 @@ public String handleCheckPlayerOnline(String playerUuid) throws Exception {
     }
 
     @Override
-    public String handleBanwardenPardon(BanWardenPunishmentType type, String victim, String reason) throws Exception {
-        boolean status = this.plugin.getCommon().getBanWarden().pardon(type, victim, reason);
+    public String handleBanwardenPardon(BanWardenPunishmentType type, String victim, String reason, String admin) throws Exception {
+        boolean status = this.plugin.getCommon().getBanWarden().pardon(type, victim, reason, admin);
         return status ? "true" : "false";
     }
 }
diff --git a/bungee/src/main/java/com/xinecraft/minetrax/bungee/commander/BungeeCommander.java b/bungee/src/main/java/com/xinecraft/minetrax/bungee/commander/BungeeCommander.java
@@ -1,11 +1,12 @@
 package com.xinecraft.minetrax.bungee.commander;
 
+import com.xinecraft.minetrax.common.MinetraxCommon;
 import com.xinecraft.minetrax.common.interfaces.commander.CommonCommander;
 import net.md_5.bungee.api.ProxyServer;
 
 public class BungeeCommander implements CommonCommander {
     @Override
     public void dispatchCommand(String command) {
-        ProxyServer.getInstance().getPluginManager().dispatchCommand(ProxyServer.getInstance().getConsole(), command);
+        MinetraxCommon.getInstance().getScheduler().run(() -> ProxyServer.getInstance().getPluginManager().dispatchCommand(ProxyServer.getInstance().getConsole(), command));
     }
 }
diff --git a/bungee/src/main/java/com/xinecraft/minetrax/bungee/webquery/BungeeWebQuery.java b/bungee/src/main/java/com/xinecraft/minetrax/bungee/webquery/BungeeWebQuery.java
@@ -149,8 +149,8 @@ public String handleCheckPlayerOnline(String playerUuid) throws Exception {
     }
 
     @Override
-    public String handleBanwardenPardon(BanWardenPunishmentType type, String victim, String reason) throws Exception {
-        boolean status = this.plugin.getCommon().getBanWarden().pardon(type, victim, reason);
+    public String handleBanwardenPardon(BanWardenPunishmentType type, String victim, String reason, String admin) throws Exception {
+        boolean status = this.plugin.getCommon().getBanWarden().pardon(type, victim, reason, admin);
         return status ? "true" : "false";
     }
 }
diff --git a/common/src/main/java/com/xinecraft/minetrax/common/banwarden/BanWarden.java b/common/src/main/java/com/xinecraft/minetrax/common/banwarden/BanWarden.java
@@ -15,7 +15,7 @@ public void sync(BanWardenSyncType type) {
         hook.sync(type);
     }
 
-    public boolean pardon(BanWardenPunishmentType type, String victim, String reason) {
-        return hook.pardon(type, victim, reason);
+    public boolean pardon(BanWardenPunishmentType type, String victim, String reason, String admin) {
+        return hook.pardon(type, victim, reason, admin);
     }
 }
diff --git a/common/src/main/java/com/xinecraft/minetrax/common/banwarden/hooks/AdvancedbanHook.java b/common/src/main/java/com/xinecraft/minetrax/common/banwarden/hooks/AdvancedbanHook.java
@@ -13,7 +13,7 @@ public String punish(BanWardenPunishmentType type, String punishmentString) {
     }
 
     @Override
-    public boolean pardon(BanWardenPunishmentType type, String victim, String reason) {
+    public boolean pardon(BanWardenPunishmentType type, String victim, String reason, String admin) {
         return false;
     }
 
diff --git a/common/src/main/java/com/xinecraft/minetrax/common/banwarden/hooks/LibertybansHook.java b/common/src/main/java/com/xinecraft/minetrax/common/banwarden/hooks/LibertybansHook.java
@@ -46,7 +46,7 @@ public String punish(BanWardenPunishmentType type, String punishmentString) {
     }
 
     @Override
-    public boolean pardon(BanWardenPunishmentType type, String victim, String reason) {
+    public boolean pardon(BanWardenPunishmentType type, String victim, String reason, String admin) {
         switch (type) {
             case BAN -> common.getCommander().dispatchCommand("libertybans:unban " + victim);
             case MUTE -> common.getCommander().dispatchCommand("libertybans:unmute " + victim);
diff --git a/common/src/main/java/com/xinecraft/minetrax/common/banwarden/hooks/LitebansHook.java b/common/src/main/java/com/xinecraft/minetrax/common/banwarden/hooks/LitebansHook.java
@@ -40,14 +40,15 @@ public String punish(BanWardenPunishmentType type, String punishmentString) {
     }
 
     @Override
-    public boolean pardon(BanWardenPunishmentType type, String victim, String reason) {
-        if (reason.isBlank()) {
+    public boolean pardon(BanWardenPunishmentType type, String victim, String reason, String admin) {
+        if (reason == null || reason.isBlank()) {
             reason = "-";
         }
+        String parsedAdmin = admin == null || admin.isBlank() ? "--sender=BanWarden" : "--sender=" + admin;
         switch (type) {
-            case BAN -> common.getCommander().dispatchCommand("litebans:unban " + victim + " " + reason);
-            case MUTE -> common.getCommander().dispatchCommand("litebans:unmute " + victim + " " + reason);
-            case WARN -> common.getCommander().dispatchCommand("litebans:unwarn " + victim + " " + reason);
+            case BAN -> common.getCommander().dispatchCommand("litebans:unban " + victim + " " + reason + " " + parsedAdmin);
+            case MUTE -> common.getCommander().dispatchCommand("litebans:unmute " + victim + " " + reason + " " + parsedAdmin);
+            case WARN -> common.getCommander().dispatchCommand("litebans:unwarn " + victim + " " + reason + " " + parsedAdmin);
             default -> LoggingUtil.error("[LitebansHook] Pardon -> Unknown punishment type: " + type);
         }
         return true;
diff --git a/common/src/main/java/com/xinecraft/minetrax/common/banwarden/hooks/NullHook.java b/common/src/main/java/com/xinecraft/minetrax/common/banwarden/hooks/NullHook.java
@@ -16,7 +16,7 @@ public String punish(BanWardenPunishmentType type, String punishmentString) {
     }
 
     @Override
-    public boolean pardon(BanWardenPunishmentType type, String victim, String reason) {
+    public boolean pardon(BanWardenPunishmentType type, String victim, String reason, String admin) {
         warn();
         return false;
     }
diff --git a/common/src/main/java/com/xinecraft/minetrax/common/interfaces/banwarden/BanWardenHook.java b/common/src/main/java/com/xinecraft/minetrax/common/interfaces/banwarden/BanWardenHook.java
@@ -6,7 +6,7 @@
 
 public interface BanWardenHook {
     String punish(BanWardenPunishmentType type, String punishmentString);
-    boolean pardon(BanWardenPunishmentType type, String victim, String reason);
+    boolean pardon(BanWardenPunishmentType type, String victim, String reason, String admin);
     PunishmentData getPunishment(String punishmentId);
     void sync(BanWardenSyncType type);
 }
diff --git a/common/src/main/java/com/xinecraft/minetrax/common/interfaces/webquery/CommonWebQuery.java b/common/src/main/java/com/xinecraft/minetrax/common/interfaces/webquery/CommonWebQuery.java
@@ -11,5 +11,5 @@ public interface CommonWebQuery {
     String handleSetPlayerSkin(String playerUuid, String commandType, String value) throws Exception;
     String handleAccountLinkSuccess(String playerUuid, String userId) throws Exception;
     String handleCheckPlayerOnline(String playerUuid) throws Exception;
-    String handleBanwardenPardon(BanWardenPunishmentType type, String victim, String reason) throws Exception;
+    String handleBanwardenPardon(BanWardenPunishmentType type, String victim, String reason, String admin) throws Exception;
 }
diff --git a/common/src/main/java/com/xinecraft/minetrax/common/utils/GsonUtil.java b/common/src/main/java/com/xinecraft/minetrax/common/utils/GsonUtil.java
@@ -0,0 +1,12 @@
+package com.xinecraft.minetrax.common.utils;
+
+import com.google.gson.JsonElement;
+
+public class GsonUtil {
+    public static String getAsString(JsonElement element, String defaultValue) {
+        if (element == null || element.isJsonNull()) {
+            return defaultValue;
+        }
+        return element.getAsString();
+    }
+}
diff --git a/common/src/main/java/com/xinecraft/minetrax/common/webquery/protocol/WebQueryProtocol.java b/common/src/main/java/com/xinecraft/minetrax/common/webquery/protocol/WebQueryProtocol.java
@@ -5,6 +5,7 @@
 import com.xinecraft.minetrax.common.data.WebQueryRequestData;
 import com.xinecraft.minetrax.common.enums.BanWardenPunishmentType;
 import com.xinecraft.minetrax.common.utils.CryptoUtil;
+import com.xinecraft.minetrax.common.utils.GsonUtil;
 import com.xinecraft.minetrax.common.utils.LoggingUtil;
 
 public class WebQueryProtocol {
@@ -65,11 +66,13 @@ public static String processInput(String input) throws Exception {
                 response = "Work in progress";
                 break;
             case "banwarden-pardon":
-                String pType = payloadJson.get("type").getAsString();
+                String pType = payloadJson.get("punishment_type").getAsString();
                 BanWardenPunishmentType punishmentType = BanWardenPunishmentType.valueOf(pType.toUpperCase());
                 String victim = payloadJson.get("victim").getAsString();
-                String reason = payloadJson.get("reason").getAsString();
-                response = common.getWebQuery().handleBanwardenPardon(punishmentType, victim, reason);
+                String reason = GsonUtil.getAsString(payloadJson.get("reason"), null);
+                String admin = GsonUtil.getAsString(payloadJson.get("admin"), null);
+                response = common.getWebQuery().handleBanwardenPardon(punishmentType, victim, reason, admin);
+                break;
             default:
                 throw new Exception("Invalid webquery command type");
         }
diff --git a/velocity/src/main/java/com/xinecraft/minetrax/velocity/webquery/VelocityWebQuery.java b/velocity/src/main/java/com/xinecraft/minetrax/velocity/webquery/VelocityWebQuery.java
@@ -148,8 +148,8 @@ public String handleCheckPlayerOnline(String playerUuid) throws Exception {
     }
 
     @Override
-    public String handleBanwardenPardon(BanWardenPunishmentType type, String victim, String reason) throws Exception {
-        boolean status = this.plugin.getCommon().getBanWarden().pardon(type, victim, reason);
+    public String handleBanwardenPardon(BanWardenPunishmentType type, String victim, String reason, String admin) throws Exception {
+        boolean status = this.plugin.getCommon().getBanWarden().pardon(type, victim, reason, admin);
         return status ? "true" : "false";
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,12 @@`
`1`	`1`	`package com.xinecraft.minetrax.bukkit.commander;`
`2`	`2`
	`3`	`+import com.xinecraft.minetrax.common.MinetraxCommon;`
`3`	`4`	`import com.xinecraft.minetrax.common.interfaces.commander.CommonCommander;`
`4`	`5`	`import org.bukkit.Bukkit;`
`5`	`6`
`6`	`7`	`public class BukkitCommander implements CommonCommander {`
`7`	`8`	`@Override`
`8`	`9`	`public void dispatchCommand(String command) {`
`9`		`- Bukkit.dispatchCommand(Bukkit.getConsoleSender(), command);`
	`10`	`+ MinetraxCommon.getInstance().getScheduler().run(() -> Bukkit.dispatchCommand(Bukkit.getConsoleSender(), command));`
`10`	`11`	`}`
`11`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -169,8 +169,8 @@ public String handleCheckPlayerOnline(String playerUuid) throws Exception {`
`169`	`169`	`}`
`170`	`170`
`171`	`171`	`@Override`
`172`		`- public String handleBanwardenPardon(BanWardenPunishmentType type, String victim, String reason) throws Exception {`
`173`		`- boolean status = this.plugin.getCommon().getBanWarden().pardon(type, victim, reason);`
	`172`	`+ public String handleBanwardenPardon(BanWardenPunishmentType type, String victim, String reason, String admin) throws Exception {`
	`173`	`+ boolean status = this.plugin.getCommon().getBanWarden().pardon(type, victim, reason, admin);`
`174`	`174`	`return status ? "true" : "false";`
`175`	`175`	`}`
`176`	`176`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,12 @@`
`1`	`1`	`package com.xinecraft.minetrax.bungee.commander;`
`2`	`2`
	`3`	`+import com.xinecraft.minetrax.common.MinetraxCommon;`
`3`	`4`	`import com.xinecraft.minetrax.common.interfaces.commander.CommonCommander;`
`4`	`5`	`import net.md_5.bungee.api.ProxyServer;`
`5`	`6`
`6`	`7`	`public class BungeeCommander implements CommonCommander {`
`7`	`8`	`@Override`
`8`	`9`	`public void dispatchCommand(String command) {`
`9`		`- ProxyServer.getInstance().getPluginManager().dispatchCommand(ProxyServer.getInstance().getConsole(), command);`
	`10`	`+ MinetraxCommon.getInstance().getScheduler().run(() -> ProxyServer.getInstance().getPluginManager().dispatchCommand(ProxyServer.getInstance().getConsole(), command));`
`10`	`11`	`}`
`11`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -149,8 +149,8 @@ public String handleCheckPlayerOnline(String playerUuid) throws Exception {`
`149`	`149`	`}`
`150`	`150`
`151`	`151`	`@Override`
`152`		`- public String handleBanwardenPardon(BanWardenPunishmentType type, String victim, String reason) throws Exception {`
`153`		`- boolean status = this.plugin.getCommon().getBanWarden().pardon(type, victim, reason);`
	`152`	`+ public String handleBanwardenPardon(BanWardenPunishmentType type, String victim, String reason, String admin) throws Exception {`
	`153`	`+ boolean status = this.plugin.getCommon().getBanWarden().pardon(type, victim, reason, admin);`
`154`	`154`	`return status ? "true" : "false";`
`155`	`155`	`}`
`156`	`156`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ public void sync(BanWardenSyncType type) {`
`15`	`15`	`hook.sync(type);`
`16`	`16`	`}`
`17`	`17`
`18`		`- public boolean pardon(BanWardenPunishmentType type, String victim, String reason) {`
`19`		`- return hook.pardon(type, victim, reason);`
	`18`	`+ public boolean pardon(BanWardenPunishmentType type, String victim, String reason, String admin) {`
	`19`	`+ return hook.pardon(type, victim, reason, admin);`
`20`	`20`	`}`
`21`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ public String punish(BanWardenPunishmentType type, String punishmentString) {`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`@Override`
`16`		`- public boolean pardon(BanWardenPunishmentType type, String victim, String reason) {`
	`16`	`+ public boolean pardon(BanWardenPunishmentType type, String victim, String reason, String admin) {`
`17`	`17`	`return false;`
`18`	`18`	`}`
`19`	`19`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ public String punish(BanWardenPunishmentType type, String punishmentString) {`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`@Override`
`49`		`- public boolean pardon(BanWardenPunishmentType type, String victim, String reason) {`
	`49`	`+ public boolean pardon(BanWardenPunishmentType type, String victim, String reason, String admin) {`
`50`	`50`	`switch (type) {`
`51`	`51`	`case BAN -> common.getCommander().dispatchCommand("libertybans:unban " + victim);`
`52`	`52`	`case MUTE -> common.getCommander().dispatchCommand("libertybans:unmute " + victim);`