Merge branch 'main' into fix-console-reply

Author: zefir-git

src/main/java/pro/cloudnode/smp/cloudnodemsg/Permission.java

@@ -42,4 +42,9 @@ public final class Permission {
      * Allows to send private message even when the target have their private messages toggled
      */
     public final static @NotNull String TOGGLE_BYPASS = "cloudnodemsg.toggle.bypass";
+
+    /**
+     * Allows to see the private messages of other players
+     */
+    public final static @NotNull String SPY = "cloudnodemsg.spy";
 }

src/main/java/pro/cloudnode/smp/cloudnodemsg/PluginConfig.java

@@ -57,6 +57,27 @@ public PluginConfig(final @NotNull FileConfiguration config) {
         );
     }
 
+    /**
+     * Private message format as seen by people with the spy permission and console
+     * <p>Placeholders:</p>
+     * <ul>
+     *     <li>{@code <sender>} - the username of the message sender</li>
+     *     <li>{@code <recipient>} - the username of the message recipient</li>
+     *     <li>{@code <message>} - the message text</li>
+     * </ul>
+     *
+     * @param sender The username of the message sender
+     * @param recipient The username of the message recipient
+     * @param message The message text
+     */
+    public @NotNull Component spy(final @NotNull String sender, final @NotNull String recipient, final @NotNull Component message) {
+        return MiniMessage.miniMessage().deserialize(Objects.requireNonNull(config.getString("spy"))
+                        .replace("<sender>", sender)
+                        .replace("<recipient>", recipient),
+                Placeholder.component("message", message)
+        );
+    }
+
     /**
      * Player has successfully been ignored
      * <p>Placeholders:</p>

src/main/java/pro/cloudnode/smp/cloudnodemsg/message/Message.java

@@ -54,6 +54,8 @@ public void send() throws InvalidPlayerError {
         if (senderPlayer.isPresent() && !Message.hasChannel(senderPlayer.get(), recipient))
             setReplyTo(sender, recipient);
 
+        sendSpyMessage(sender, recipient, message);
+
         if (
                 (recipientPlayer.isPresent() && Message.isIgnored(recipientPlayer.get(), sender))
                 &&
@@ -78,6 +80,24 @@ public static void sendMessage(final @NotNull OfflinePlayer recipient, final @No
         else if (recipient.isOnline()) Objects.requireNonNull(recipient.getPlayer()).sendMessage(message);
     }
 
+    /**
+     * Send social spy to online players with permission
+     */
+    public static void sendSpyMessage(final @NotNull OfflinePlayer sender, final @NotNull OfflinePlayer recipient, final @NotNull Component message) {
+        final @NotNull String senderName = sender.getUniqueId().equals(console.getUniqueId()) ? CloudnodeMSG.getInstance().config().consoleName() : Optional.ofNullable(sender.getName()).orElse("Unknown Player");
+        final @NotNull String recipientName = recipient.getUniqueId().equals(console.getUniqueId()) ? CloudnodeMSG.getInstance().config().consoleName() : Optional.ofNullable(recipient.getName()).orElse("Unknown Player");
+        for (final @NotNull Player player : CloudnodeMSG.getInstance().getServer().getOnlinePlayers()) {
+            if (
+                    !player.hasPermission(Permission.SPY)
+                    || player.getUniqueId().equals(sender.getUniqueId())
+                    || player.getUniqueId().equals(recipient.getUniqueId())
+            ) continue;
+            sendMessage(player, CloudnodeMSG.getInstance().config().spy(senderName, recipientName, message));
+        }
+        if (!sender.getUniqueId().equals(console.getUniqueId()) && !recipient.getUniqueId().equals(console.getUniqueId()))
+            sendMessage(console, CloudnodeMSG.getInstance().config().spy(senderName, recipientName, message));
+    }
+
     private static @Nullable UUID consoleReply;
 
     public static final @NotNull NamespacedKey REPLY_TO = new NamespacedKey(CloudnodeMSG.getInstance(), "reply");

src/main/resources/config.yml

@@ -9,6 +9,10 @@ incoming: '<click:suggest_command:/msg <sender> ><dark_gray>[<#60a5fa><sender></
 # Same placeholders as incoming
 outgoing: '<click:suggest_command:/msg <recipient> ><dark_gray>[<#93c5fd>me</#93c5fd> <white>-></white> <#60a5fa><recipient></#60a5fa>]</dark_gray></click> <reset><#dbeafe><message></#dbeafe>'
 
+# Private message format as seen by people with the spy permission and console
+# Same placeholders as incoming
+spy: '<dark_gray>[SPY] [<click:suggest_command:/msg <sender> ><gray><sender></gray></click> -> <click:suggest_command:/msg <recipient> ><gray><recipient></gray></click>] <gray><message></gray></dark_gray>'
+
 # Player has successfully been ignored
 # Placeholders:
 #  <player> - the player's username