fix: problems with duplicate message sending

WiIIiam278 · Mar 30, 2024 · bb0d7ad · bb0d7ad
1 parent 46f7865
commit bb0d7ad
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 17 deletions.
diff --git a/common/src/main/java/net/william278/huskchat/message/BroadcastMessage.java b/common/src/main/java/net/william278/huskchat/message/BroadcastMessage.java
@@ -67,6 +67,8 @@ public void dispatch() {
 
             // Send the broadcast
             plugin.getOnlinePlayers().forEach(this::sendMessage);
+
+            // Log to console
             if (settings.isLogToConsole()) {
                 plugin.log(Level.INFO, settings.getLogFormat() + message);
             }

diff --git a/common/src/main/java/net/william278/huskchat/message/ChatMessage.java b/common/src/main/java/net/william278/huskchat/message/ChatMessage.java
@@ -151,20 +151,20 @@ public boolean dispatch() {
                         getPlugin().getLocales().sendLocalSpy(spy, color, getSender(), channel.get(), getMessage(), getPlugin());
                     }
                 }
+            });
 
-                // Log a message to console if enabled on the channel
-                if (channel.get().isLogToConsole()) {
-                    final String logFormat = getPlugin().getChannels().getChannelLogFormat()
-                            .replaceAll("%channel%", channel.get().getId().toUpperCase())
-                            .replaceAll("%sender%", getSender().getName());
-                    getPlugin().log(Level.INFO, logFormat + getMessage());
-                }
+            // Log a message to console if enabled on the channel
+            if (channel.get().isLogToConsole()) {
+                final String logFormat = getPlugin().getChannels().getChannelLogFormat()
+                        .replaceAll("%channel%", channel.get().getId().toUpperCase())
+                        .replaceAll("%sender%", getSender().getName());
+                getPlugin().log(Level.INFO, logFormat + getMessage());
+            }
 
-                // Dispatch message to a Discord webhook if enabled
-                if (getPlugin().getSettings().getDiscord().isEnabled()) {
-                    getPlugin().getDiscordHook().ifPresent(hook -> hook.postMessage(this));
-                }
-            });
+            // Dispatch message to a Discord webhook if enabled
+            if (getPlugin().getSettings().getDiscord().isEnabled()) {
+                getPlugin().getDiscordHook().ifPresent(hook -> hook.postMessage(this));
+            }
         });
 
         // Non-passthrough messages should always be canceled in the proxy-specific code

diff --git a/common/src/main/java/net/william278/huskchat/message/PrivateMessage.java b/common/src/main/java/net/william278/huskchat/message/PrivateMessage.java
@@ -132,13 +132,12 @@ public void dispatch() {
             plugin.getLocales().sendOutboundPrivateMessage(sender, receivers, finalMessage.get(), plugin);
 
             // Show the received message
-            for (OnlineUser target : receivers) {
+            plugin.editUserCache(c -> receivers.forEach(target -> {
                 final ArrayList<OnlineUser> receivedMessageFrom = new ArrayList<>(receivers);
                 receivedMessageFrom.removeIf(player -> player.getUuid().equals(target.getUuid()));
                 receivedMessageFrom.add(0, sender);
-
-                plugin.editUserCache(c -> c.setLastMessenger(target.getUuid(), receivedMessageFrom));
-            }
+                c.setLastMessenger(target.getUuid(), receivedMessageFrom);
+            }));
             plugin.getLocales().sendInboundPrivateMessage(receivers, sender, finalMessage.get(), plugin);
 
             // Show a message to social spies

diff --git a/gradle.properties b/gradle.properties
@@ -4,7 +4,7 @@ org.gradle.parallel=true
 org.gradle.daemon=true
 javaVersion=17
 
-plugin_version=3.0.1
+plugin_version=3.0.2
 plugin_archive=huskchat
 plugin_description=A simple & customizable no-frills Minecraft chat system