Merge pull request #301 from Jookly123/banned-user-discord-notif

Added banned user notification to Discord Remote Control, thanks Jookly123!

Author: onixiya1337

gradle.properties

@@ -4,5 +4,5 @@ baseGroup=com.jelly.farmhelperv2
 mcVersion=1.8.9
 modid=farmhelperv2
 modName=FarmHelper
-version=2.9.4-pre2
+version=2.9.4-pre3
 shouldRelease=true

src/main/java/com/jelly/farmhelperv2/config/FarmHelperConfig.java

@@ -1413,6 +1413,11 @@ public static void triggerManuallyPestsDestroyer() {
             description = "Sends messages when the macro has been enabled or disabled"
     )
     public static boolean sendMacroEnableDisableLogs = true;
+    @Switch(
+            name = "Send FH ban logs", category = DISCORD_INTEGRATION, subcategory = "Discord Webhook",
+            description = "Sends message when a FH user gets banned (Like in game chat)"
+    )
+    public static boolean sendFHBanLogs = false;
     @Text(
             name = "WebHook URL", category = DISCORD_INTEGRATION, subcategory = "Discord Webhook",
             description = "The URL to use for the webhook",

src/main/java/com/jelly/farmhelperv2/feature/impl/BanInfoWS.java

@@ -36,6 +36,7 @@
 import java.nio.charset.StandardCharsets;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
+import java.util.regex.Pattern;
 import java.util.zip.GZIPInputStream;
 import java.util.zip.GZIPOutputStream;
 
@@ -640,12 +641,18 @@ public void onMessage(String message) {
                         String crop = jsonObject.get("crop").getAsString().toLowerCase().replace("_", " ");
                         long longestSession7D = jsonObject.get("longestSession7D").getAsLong();
                         String lastFailsafe = jsonObject.get("lastFailsafe").getAsString();
-                        LogUtils.sendWarning("User §c" + username + "§e got banned for " + days + " days"
+                        String warningMessage = ("User §c" + username + "§e got banned for " + days + " days"
                                 + (macroEnabled ? " while " + (fastBreak ? "§c§nfastbreaking§r§e " : "farming ") + crop + "." : ".")
                                 + "\n§ePossible reason: §c" + reason + "§e."
                                 + "\n§eLongest session in the last 7 days: §c" + LogUtils.formatTime(longestSession7D)
                                 + (!lastFailsafe.isEmpty() ? "\n§eLast failsafe: §c" + lastFailsafe : ""));
+                        LogUtils.sendWarning(warningMessage);
                         // LogUtils.sendNotification("Farm Helper", "User " + username + " got banned for " + days + " days");
+                        if (FarmHelperConfig.sendFHBanLogs && FarmHelperConfig.enableWebHook) {
+                            Pattern MC_COLOUR = Pattern.compile("§[0-9A-FK-ORa-fk-or]");
+                            String cleanString = MC_COLOUR.matcher(warningMessage).replaceAll("").replace("\n", "\\n");
+                            LogUtils.FHBanLogsWebhook(cleanString);
+                        }
                         break;
                     }
                 }

src/main/java/com/jelly/farmhelperv2/util/LogUtils.java

@@ -181,6 +181,28 @@ public static void webhookLog(String message, boolean mentionAll, Tuple<String,
         sendWebhook(webhook);
     }
 
+    @SafeVarargs
+    public static void FHBanLogsWebhook(String message, Tuple<String, String>... fields) {
+        if (!FarmHelperConfig.enableWebHook) return;
+        if (!FarmHelperConfig.sendLogs) return;
+        if (!FarmHelperConfig.sendFHBanLogs) return;
+
+        DiscordWebhook webhook = new DiscordWebhook(FarmHelperConfig.webHookURL.replace(" ", "").replace("\n", "").trim());
+        webhook.setUsername("Jelly - User Bans Log");
+        webhook.setAvatarUrl("https://cdn.discordapp.com/attachments/1152966451406327858/1160577992876109884/icon.png");
+        String randomColor = String.format("#%06x", (int) (Math.random() * 0xFFFFFF));
+        DiscordWebhook.EmbedObject embedObject = new DiscordWebhook.EmbedObject()
+                .setDescription("### " + message)
+                .setColor(Color.decode(randomColor))
+                .setFooter("Farm Helper Webhook Status", "https://cdn.discordapp.com/attachments/861700235890130986/1144673641951395982/icon.png");
+        for (Tuple<String, String> field : fields) {
+            embedObject.addField(field.getFirst(), field.getSecond(), false);
+        }
+        retries = 0;
+        webhook.addEmbed(embedObject);
+        sendWebhook(webhook);
+    }
+
     private static void sendWebhook(DiscordWebhook webhook) {
         Multithreading.schedule(() -> {
             try {