Add broadcast ID and broadcast prefix

Author: 132ikl

server/src/main/java/club/moddedminecraft/polychat/server/Broadcaster.java

@@ -7,6 +7,7 @@
 import java.util.List;
 
 public final class Broadcaster {
+    private final String id;
     private final String prefix;
     private final List<String> broadcastMessages;
     private final Server server;
@@ -16,8 +17,9 @@ public final class Broadcaster {
 
     public static final int BROADCAST_EVERY_X_IN_TICKS = (10 * 60 * 20);
 
-    public Broadcaster(String prefix, List<String> broadcastMessages, Server server) {
-        this.prefix = prefix;
+    public Broadcaster(String broadcastID, String broadcastPrefix, List<String> broadcastMessages, Server server) {
+        this.id = broadcastID;
+        this.prefix = broadcastPrefix;
         this.broadcastMessages = broadcastMessages;
         this.server = server;
 
@@ -38,8 +40,8 @@ public void tick() {
     private void broadcast() {
         String broadcastMsg = broadcastMessages.get(broadcastMsgsIndex);
         ChatProtos.ChatMessage msg = ChatProtos.ChatMessage.newBuilder()
-                .setServerId(prefix)
-                .setMessage("[" + prefix + "] " + broadcastMsg)
+                .setServerId(id)
+                .setMessage(prefix + broadcastMsg)
                 .setMessageOffset(5)
                 .build();
         Any any = Any.pack(msg);

server/src/main/java/club/moddedminecraft/polychat/server/PolychatServer.java

@@ -48,9 +48,10 @@ private PolychatServer() throws IOException, LoginException, InterruptedExceptio
         server = new Server(yamlConfig.get("tcpPort"), yamlConfig.get("bufferSize"));
 
         // set up broadcasts
-        List<String> broadcastMessages = yamlConfig.get("broadcastMsgs");
-        String broadcastPrefix = yamlConfig.get("broadcastsPrefix");
-        broadcaster = new Broadcaster(broadcastPrefix, broadcastMessages, server);
+        List<String> broadcastMessages = yamlConfig.getOrDefault("broadcastMsgs", new ArrayList<String>());
+        String broadcastID = yamlConfig.getOrDefault("broadcastID", "BROADCAST");
+        String broadcastPrefix = yamlConfig.getOrDefault("broadcastPrefix", "[System]");
+        broadcaster = new Broadcaster(broadcastID, broadcastPrefix, broadcastMessages, server);
 
         // set up JDA event queue & servers hashmap;
         queue = new ConcurrentLinkedDeque<GenericEvent>();
@@ -145,6 +146,8 @@ private YamlConfig getDefaultConfig(Path path) throws IOException {
         def.set("tcpPort", 5005);
         def.set("bufferSize", 4096);
         def.set("broadcastMsgs", Arrays.asList("example broadcast message 1", "example broadcast message 2"));
+        def.set("broadcastID", "BROADCAST");
+        def.set("broadcastPrefix", "[System]");
         def.saveToFile(path);
         return def;
     }