move broadcasts out of try and add broadcasts prefix to config

Author: TraceLD

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 prefix;
     private final List<String> broadcastMessages;
     private final Server server;
 
@@ -15,7 +16,8 @@ public final class Broadcaster {
 
     public static final int BROADCAST_EVERY_X_IN_TICKS = (10 * 60 * 20);
 
-    public Broadcaster(List<String> broadcastMessages, Server server) {
+    public Broadcaster(String prefix, List<String> broadcastMessages, Server server) {
+        this.prefix = prefix;
         this.broadcastMessages = broadcastMessages;
         this.server = server;
 
@@ -36,8 +38,8 @@ public void tick() {
     private void broadcast() {
         String broadcastMsg = broadcastMessages.get(broadcastMsgsIndex);
         ChatProtos.ChatMessage msg = ChatProtos.ChatMessage.newBuilder()
-                .setServerId("MMCC")
-                .setMessage("[MMCC] " + broadcastMsg)
+                .setServerId(prefix)
+                .setMessage("[" + prefix + "] " + broadcastMsg)
                 .setMessageOffset(5)
                 .build();
         Any any = Any.pack(msg);

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

@@ -49,7 +49,8 @@ private PolychatServer() throws IOException, LoginException, InterruptedExceptio
 
         // set up broadcasts
         List<String> broadcastMessages = yamlConfig.get("broadcastMsgs");
-        broadcaster = new Broadcaster(broadcastMessages, server);
+        String broadcastPrefix = yamlConfig.get("broadcastsPrefix");
+        broadcaster = new Broadcaster(broadcastPrefix, broadcastMessages, server);
 
         // set up JDA event queue & servers hashmap;
         queue = new ConcurrentLinkedDeque<GenericEvent>();
@@ -115,9 +116,9 @@ private void spin() {
     }
 
     private void spinOnce() {
-        try {
-            broadcaster.tick();
+        broadcaster.tick();
 
+        try {
             for (Message message : server.poll()) {
                 polychatProtobufMessageDispatcher.handlePolychatMessage(message);
             }
@@ -136,6 +137,7 @@ private void spinOnce() {
 
     private YamlConfig getDefaultConfig(Path path) throws IOException {
         YamlConfig def = YamlConfig.fromInMemoryString("");
+        def.set("broadcastsPrefix", "");
         def.set("token", "");
         def.set("ownerId", "");
         def.set("commandPrefix", "!");