From 728cac32812b6a5bb406fdf61769c60260318977 Mon Sep 17 00:00:00 2001
From: destro174 <40720638+destro174@users.noreply.github.com>
Date: Wed, 25 Aug 2021 12:12:29 +0200
Subject: [PATCH] Add blockednotification format in config

---
 .gitignore                                    |  1 -
 .../java/com/alttd/chat/config/Config.java    |  3 +++
 galaxy/pom.xml                                |  2 +-
 .../com/alttd/chat/util/GalaxyUtility.java    | 20 ++++++++++++++-----
 4 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3acf705..8de8d4c 100755
--- a/.gitignore
+++ b/.gitignore
@@ -3,7 +3,6 @@
 .idea
 testserver
 run
-notes
 
 # Compiled class file
 *.class
diff --git a/api/src/main/java/com/alttd/chat/config/Config.java b/api/src/main/java/com/alttd/chat/config/Config.java
index 5914151..05f9ecd 100755
--- a/api/src/main/java/com/alttd/chat/config/Config.java
+++ b/api/src/main/java/com/alttd/chat/config/Config.java
@@ -1,6 +1,7 @@
 package com.alttd.chat.config;
 
 import com.alttd.chat.objects.channels.CustomChannel;
+import com.alttd.chat.util.Utility;
 import com.google.common.base.Throwables;
 import com.google.common.collect.Lists;
 import com.google.common.reflect.TypeToken;
@@ -163,6 +164,7 @@ public final class Config {
     public static String MINIMIUMSTAFFRANK = "trainee";
     public static String CONSOLENAME = "Console";
     public static UUID CONSOLEUUID = UUID.randomUUID();
+    public static String NOTIFICATIONFORMAT = "<red>[<prefix>] <displayname> <target> <input>";
     private static void settings() {
         PREFIXGROUPS = getList("settings.prefix-groups",
                 Lists.newArrayList("discord", "socialmedia", "eventteam", "eventleader", "youtube", "twitch", "developer"));
@@ -173,6 +175,7 @@ public final class Config {
         CONSOLENAME = getString("settings.console-name", CONSOLENAME);
         CONSOLEUUID = UUID.fromString(getString("settings.console-uuid", CONSOLEUUID.toString()));
         MINIMIUMSTAFFRANK = getString("settings.minimum-staff-rank", MINIMIUMSTAFFRANK);
+        NOTIFICATIONFORMAT = getString("settings.blockedmessage-notification", NOTIFICATIONFORMAT);
     }
 
     public static List<String> MESSAGECOMMANDALIASES = new ArrayList<>();
diff --git a/galaxy/pom.xml b/galaxy/pom.xml
index 200d026..5151938 100755
--- a/galaxy/pom.xml
+++ b/galaxy/pom.xml
@@ -97,7 +97,7 @@
         <dependency><!-- Galaxy -->
             <groupId>com.alttd</groupId>
             <artifactId>galaxy-api</artifactId>
-            <version>1.17-R0.1-SNAPSHOT</version>
+            <version>1.17.1-R0.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
diff --git a/galaxy/src/main/java/com/alttd/chat/util/GalaxyUtility.java b/galaxy/src/main/java/com/alttd/chat/util/GalaxyUtility.java
index 3d0840f..6a9be92 100644
--- a/galaxy/src/main/java/com/alttd/chat/util/GalaxyUtility.java
+++ b/galaxy/src/main/java/com/alttd/chat/util/GalaxyUtility.java
@@ -1,21 +1,31 @@
 package com.alttd.chat.util;
 
+import com.alttd.chat.config.Config;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.minimessage.MiniMessage;
+import net.kyori.adventure.text.minimessage.Template;
 import net.kyori.adventure.text.serializer.plain.PlainComponentSerializer;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class GalaxyUtility {
     public static void sendBlockedNotification(String prefix, Player player, String input, String target) {
         MiniMessage miniMessage = MiniMessage.get();
+
+        List<Template> templates = new ArrayList<>(List.of(
+                Template.of("prefix", prefix),
+                Template.of("displayname", Utility.getDisplayName(player.getUniqueId(), player.getName())),
+                Template.of("target", (target.isEmpty() ? " tried to say: " : " -> " + target + ": ")),
+                Template.of("input", input)
+        ));
+        Component blockedNotification = miniMessage.parse(Config.NOTIFICATIONFORMAT, templates);
+
         Bukkit.getOnlinePlayers().forEach(a ->{
-            Component blockedNotification = miniMessage.parse("<red>[" + prefix + "] "
-                    + Utility.getDisplayName(player.getUniqueId(), player.getName())
-                    + (target.isEmpty() ? " tried to say: " : " -> " + target + ": ")
-                    + input + "</red>");
             if (a.hasPermission("chat.alert-blocked")) {
-                a.sendMessage(blockedNotification);//TODO make configurable (along with all the messages)
+                a.sendMessage(blockedNotification);
             }
         });
         player.sendMessage(miniMessage.parse("<red>The language you used in your message is not allowed, " +