Update profile link handling and version increment; add LiteBans dependency

Author: Xinecraft

build.gradle

@@ -9,7 +9,7 @@ plugins {
 allprojects {
     group = 'com.xinecraft'
     description = 'Minetrax'
-    version = '7.0.0'
+    version = '7.0.2'
 
     repositories {
         mavenLocal()

bukkit/src/main/java/com/xinecraft/minetrax/bukkit/listeners/PlayerJoinLeaveListener.java

@@ -264,7 +264,7 @@ private void runAccountLinkReminder(Player player) {
         for (String line : messageList) {
             line = line.replace("{LINK_URL}", MinetraxHttpUtil.getUrl(MinetraxHttpUtil.ACCOUNT_LINK_ROUTE));
             line = line.replace("{WEB_URL}", MinetraxBukkit.getPlugin().getApiHost());
-            line = line.replace("{PROFILE_URL}", playerData.profile_link);
+            line = line.replace("{PROFILE_URL}", playerData.profile_link.isBlank() ? "-" : playerData.profile_link);
             MinetraxBukkit.getPlugin().adventure().player(player).sendMessage(MineDown.parse(line));
         }
     }

bukkit/src/main/java/com/xinecraft/minetrax/bukkit/tasks/AccountLinkReminderTask.java

@@ -27,7 +27,7 @@ public void run() {
             for (String line : messageList) {
                 line = line.replace("{LINK_URL}", MinetraxHttpUtil.getUrl(MinetraxHttpUtil.ACCOUNT_LINK_ROUTE));
                 line = line.replace("{WEB_URL}", MinetraxBukkit.getPlugin().getApiHost());
-                line = line.replace("{PROFILE_URL}", playerData.profile_link);
+                line = line.replace("{PROFILE_URL}", playerData.profile_link.isBlank() ? "-" : playerData.profile_link);
                 MinetraxBukkit.getPlugin().adventure().player(player).sendMessage(MineDown.parse(line));
             }
         }

bungee/src/main/resources/bungee.yml

@@ -2,4 +2,4 @@ name: Minetrax
 version: '${version}'
 main: com.xinecraft.minetrax.bungee.MinetraxBungee
 author: xinecraft
-softDepends: ['SkinsRestorer']
+softDepends: ['SkinsRestorer', 'LiteBans']

common/src/main/java/com/xinecraft/minetrax/common/webquery/WebQueryChannelHandler.java

@@ -13,16 +13,17 @@ public class WebQueryChannelHandler extends SimpleChannelInboundHandler<String>
     protected void channelRead0(ChannelHandlerContext ctx, String s) throws Exception {
         String response = null;
         String status;
+        String clientIp = ctx.channel().remoteAddress().toString();
         try {
             response = WebQueryProtocol.processInput(s);
             status = "ok";
 
             if (response == null) {
-                MinetraxCommon.getInstance().getLogger().error("[WebQuery] Error processing input: output is null");
+                MinetraxCommon.getInstance().getLogger().error("[WebQuery]["+clientIp+"] Error processing input: output is null.");
                 status = "error";
             }
         } catch (Exception e) {
-            MinetraxCommon.getInstance().getLogger().error("[WebQuery] Error processing input: " + e.getMessage());
+            MinetraxCommon.getInstance().getLogger().error("[WebQuery]["+clientIp+"] Error processing input: " + e.getMessage());
             LoggingUtil.trace(e);
             status = "error";
         }
@@ -35,7 +36,8 @@ protected void channelRead0(ChannelHandlerContext ctx, String s) throws Exceptio
 
     @Override
     public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) {
-        MinetraxCommon.getInstance().getLogger().error("[WebQuery] Exception caught: " + cause.getMessage());
+        String clientIp = ctx.channel().remoteAddress().toString();
+        MinetraxCommon.getInstance().getLogger().error("[WebQuery]["+clientIp+"] Exception caught: " + cause.getMessage());
         if (MinetraxCommon.getInstance().getPlugin().getIsDebugMode()) {
             cause.printStackTrace();
         }

common/src/main/java/com/xinecraft/minetrax/common/webquery/protocol/WebQueryProtocol.java

@@ -19,6 +19,9 @@ public static String processInput(String input) throws Exception {
 
         // Decrypt the input to plain text and map in JSON object.
         WebQueryRequestData requestData = decryptRequest(input);
+        if (requestData == null) {
+            throw new Exception("Invalid request data");
+        }
 
         LoggingUtil.debug("[WebQuery] Request: " + requestData.toString());
 

velocity/src/main/java/com/xinecraft/minetrax/velocity/MinetraxVelocity.java

@@ -49,7 +49,16 @@
 import java.util.concurrent.TimeUnit;
 
 @Getter
-@Plugin(id = "minetrax", name = "Minetrax", authors = {"Xinecraft"}, version = BuildConstants.VERSION, dependencies = {@Dependency(id = "skinsrestorer", optional = true)})
+@Plugin(
+        id = "minetrax",
+        name = "Minetrax",
+        authors = {"Xinecraft"},
+        version = BuildConstants.VERSION,
+        dependencies = {
+                @Dependency(id = "skinsrestorer", optional = true),
+                @Dependency(id = "litebans", optional = true)
+        }
+)
 public class MinetraxVelocity implements MinetraxPlugin {
     @Inject
     private Logger logger;