feat: private messaging has now the option to configure sender and re…

…ceiver format
rexlManu · Aug 10, 2023 · 2b3cf44 · 2b3cf44
1 parent 131d89e
commit 2b3cf44
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 13 deletions.
diff --git a/src/main/java/de/rexlmanu/fairychat/plugin/configuration/records/PrivateMessagingConfig.java b/src/main/java/de/rexlmanu/fairychat/plugin/configuration/records/PrivateMessagingConfig.java
@@ -10,8 +10,12 @@
 @Getter
 public class PrivateMessagingConfig {
 
-  @Comment("The format used for private messaging.")
-  private String format =
+  @Comment("The format used for private messaging as sender.")
+  private String senderFormat =
+      "<dark_gray>[<#5E548E>PM</#5E548E>] <gray><sender_name></gray> → <#9F86C0><recipient_name></#9F86C0> »<dark_gray> <gray><message></gray>";
+
+  @Comment("The format used for private messaging as receiver.")
+  private String receiverFormat =
       "<dark_gray>[<#5E548E>PM</#5E548E>] <gray><sender_name></gray> → <#9F86C0><recipient_name></#9F86C0> »<dark_gray> <gray><message></gray>";
 
   @Comment("The duration (in seconds) until a recipient can no longer respond.")

diff --git a/...lmanu/fairychat/plugin/core/privatemessaging/defaults/DefaultPrivateMessagingService.java b/...lmanu/fairychat/plugin/core/privatemessaging/defaults/DefaultPrivateMessagingService.java
@@ -31,10 +31,17 @@ public class DefaultPrivateMessagingService implements PrivateMessagingService {
 
   @Override
   public void sendMessage(User user, User recipient, String message) {
-    Audience.audience(this.getPlayer(user), this.getPlayer(recipient))
+    this.getPlayer(user)
         .sendMessage(
             this.miniMessage.deserialize(
-                configurationProvider.get().privateMessaging().format(),
+                configurationProvider.get().privateMessaging().senderFormat(),
+                Placeholder.unparsed("message", message),
+                Placeholder.unparsed("sender_name", user.username()),
+                Placeholder.unparsed("recipient_name", recipient.username())));
+    this.getPlayer(recipient)
+        .sendMessage(
+            this.miniMessage.deserialize(
+                configurationProvider.get().privateMessaging().receiverFormat(),
                 Placeholder.unparsed("message", message),
                 Placeholder.unparsed("sender_name", user.username()),
                 Placeholder.unparsed("recipient_name", recipient.username())));

diff --git a/...e/rexlmanu/fairychat/plugin/core/privatemessaging/redis/RedisPrivateMessagingService.java b/...e/rexlmanu/fairychat/plugin/core/privatemessaging/redis/RedisPrivateMessagingService.java
@@ -43,19 +43,27 @@ public void setLastRecipient(UUID senderId, UUID recipientId) {
   public void sendMessage(User user, User recipient, String message) {
     this.setLastRecipient(recipient.uniqueId(), user.uniqueId());
 
-    Component formattedMessage =
-        this.miniMessage.deserialize(
-            this.configurationProvider.get().privateMessaging().format(),
-            Placeholder.unparsed("message", message),
-            Placeholder.unparsed("sender_name", user.username()),
-            Placeholder.unparsed("recipient_name", recipient.username()));
-    this.getPlayer(user).ifPresent(player -> player.sendMessage(formattedMessage));
+    this.getPlayer(user)
+        .ifPresent(
+            player ->
+                player.sendMessage(
+                    this.miniMessage.deserialize(
+                        this.configurationProvider.get().privateMessaging().senderFormat(),
+                        Placeholder.unparsed("message", message),
+                        Placeholder.unparsed("sender_name", user.username()),
+                        Placeholder.unparsed("recipient_name", recipient.username()))));
 
     // If the recipient is on the same server, we send directly to the player.
     // Otherwise, we send the message over redis to the recipient.
     this.getPlayer(recipient)
         .ifPresentOrElse(
-            player -> player.sendMessage(formattedMessage),
+            player ->
+                player.sendMessage(
+                    this.miniMessage.deserialize(
+                        this.configurationProvider.get().privateMessaging().receiverFormat(),
+                        Placeholder.unparsed("message", message),
+                        Placeholder.unparsed("sender_name", user.username()),
+                        Placeholder.unparsed("recipient_name", recipient.username()))),
             () ->
                 connector.publish(
                     Constants.PRIVATE_MESSAGING_CHANNEL,

diff --git a/...exlmanu/fairychat/plugin/core/privatemessaging/redis/RedisPrivateMessagingSubscriber.java b/...exlmanu/fairychat/plugin/core/privatemessaging/redis/RedisPrivateMessagingSubscriber.java
@@ -44,7 +44,7 @@ public void handle(PrivateMessageData data) {
             player ->
                 player.sendMessage(
                     this.miniMessage.deserialize(
-                        this.configurationProvider.get().privateMessaging().format(),
+                        this.configurationProvider.get().privateMessaging().receiverFormat(),
                         Placeholder.unparsed("message", data.message()),
                         Placeholder.unparsed("sender_name", sender.username()),
                         Placeholder.unparsed("recipient_name", recipient.username()))));