From 6786795c1f943e639b1ac311bad68aaa5b8ac203 Mon Sep 17 00:00:00 2001
From: TheFaser <artem.mochalin11@gmail.com>
Date: Sun, 24 Dec 2023 22:03:31 +0500
Subject: [PATCH] Integrations: fix invisible name for DiscordSRV

---
 .../chat/module/integrations/FDiscordSRV.java | 60 +++++++++++--------
 1 file changed, 36 insertions(+), 24 deletions(-)

diff --git a/src/main/java/net/flectone/chat/module/integrations/FDiscordSRV.java b/src/main/java/net/flectone/chat/module/integrations/FDiscordSRV.java
index 94503d8..e1e223b 100644
--- a/src/main/java/net/flectone/chat/module/integrations/FDiscordSRV.java
+++ b/src/main/java/net/flectone/chat/module/integrations/FDiscordSRV.java
@@ -13,9 +13,11 @@
 import net.flectone.chat.model.damager.PlayerDamager;
 import net.flectone.chat.model.file.FConfiguration;
 import net.flectone.chat.model.player.Moderation;
+import net.flectone.chat.util.MessageUtil;
 import net.flectone.chat.util.TimeUtil;
 import org.bukkit.Material;
 import org.bukkit.OfflinePlayer;
+import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 import org.bukkit.event.Listener;
@@ -69,22 +71,31 @@ public void init() {
 
     public void sendDeathMessage(@NotNull Player sender, @NotNull PlayerDamager playerDamager, @NotNull String typeDeath) {
         Entity finalEntity = playerDamager.getFinalEntity();
+
         Material finalBlock = playerDamager.getFinalBlockDamager();
         Entity killer = playerDamager.getKiller();
         ItemStack killerItem = playerDamager.getKillerItem();
 
         String message = integrations.getString("DiscordSRV.message.death.type" + typeDeath);
 
-        if (finalEntity != null) message = message
-                .replace("<killer>", finalEntity.getName())
-                .replace("<projectile>", finalEntity.getName());
+        if (finalEntity != null) {
+            String finalEntityName = finalEntity instanceof Player player
+                    ? MessageUtil.formatPlayerString(player, "<player>")
+                    : finalEntity.getName();
+            message = message
+                    .replace("<killer>", finalEntityName)
+                    .replace("<projectile>", finalEntityName);
+        }
 
         if (finalBlock != null) message = message
                 .replace("<block>", finalBlock.name());
 
         if (killer != null && finalEntity != null && !killer.getType().equals(finalEntity.getType())) {
+            String killerName = killer instanceof Player player
+                    ? MessageUtil.formatPlayerString(player, "<player>")
+                    : finalEntity.getName();
             String dueToMessage = integrations.getString("DiscordSRV.message.death.due-to");
-            message = message.replace("<due_to>", dueToMessage.replace("<killer>", killer.getName()));
+            message = message.replace("<due_to>", dueToMessage.replace("<killer>", killerName));
         }
 
         if (killerItem != null) {
@@ -106,45 +117,49 @@ public void sendDeathMessage(@NotNull Player sender, @NotNull PlayerDamager play
         Map<String, String> replacements = new HashMap<>();
 
         replacements.put("<type>", message);
-        replacements.put("<player>", sender.getName());
+        replacements.put("<player>", MessageUtil.formatPlayerString(sender, "<player>"));
 
         sendMessage(sender, "death", replacements);
     }
 
     public void sendJoinMessage(@NotNull Player sender, @NotNull String type) {
+        String senderName = MessageUtil.formatPlayerString(sender, "<player>");
+
         String message = integrations.getString("DiscordSRV.message.join.type." + type)
-                .replace("<player>", sender.getName());
+                .replace("<player>", senderName);
 
         Map<String, String> replacements = new HashMap<>();
 
         replacements.put("<type>", message);
-        replacements.put("<player>", sender.getName());
+        replacements.put("<player>", senderName);
 
         sendMessage(sender, "join", replacements);
     }
 
     public void sendQuitMessage(@NotNull Player sender, @NotNull String type) {
+        String senderName = MessageUtil.formatPlayerString(sender, "<player>");
+
         String message = integrations.getString("DiscordSRV.message.quit.type." + type)
-                .replace("<player>", sender.getName());
+                .replace("<player>", senderName);
 
         Map<String, String> replacements = new HashMap<>();
 
         replacements.put("<type>", message);
-        replacements.put("<player>", sender.getName());
+        replacements.put("<player>", senderName);
 
         sendMessage(sender, "quit", replacements);
     }
 
     public void sendAdvancementMessage(@NotNull Player sender, @NotNull FAdvancement advancement) {
         HashMap<String, String> replacements = new HashMap<>();
-        replacements.put("<player>", sender.getName());
+        replacements.put("<player>", MessageUtil.formatPlayerString(sender, "<player>"));
         replacements.put("<advancement>", advancement.getTitle());
 
         sendMessage(sender, "advancement-" + advancement.getType(), replacements);
     }
 
     public void sendStreamMessage(@Nullable Player sender, @NotNull String urls) {
-        String senderName = sender == null ? "CONSOLE" : sender.getName();
+        String senderName = sender == null ? "CONSOLE" : MessageUtil.formatPlayerString(sender, "<player>");
 
         HashMap<String, String> replacements = new HashMap<>();
         replacements.put("<player>", senderName);
@@ -170,7 +185,7 @@ public void sendBanMessage(@Nullable OfflinePlayer sender, @NotNull Moderation m
 
     public void sendMuteMessage(@Nullable OfflinePlayer sender, @NotNull Moderation moderation) {
         HashMap<String, String> replacements = new HashMap<>();
-        replacements.put("<player>", moderation.getModeratorName());
+        replacements.put("<player>", moderation.getPlayerName());
         replacements.put("<time>", TimeUtil.convertTime(null, moderation.getRemainingTime()));
         replacements.put("<reason>", moderation.getReason());
         replacements.put("<moderator>", moderation.getModeratorName());
@@ -179,7 +194,7 @@ public void sendMuteMessage(@Nullable OfflinePlayer sender, @NotNull Moderation
 
     public void sendWarnMessage(@Nullable OfflinePlayer sender, @NotNull Moderation moderation, int count) {
         HashMap<String, String> replacements = new HashMap<>();
-        replacements.put("<player>", moderation.getModeratorName());
+        replacements.put("<player>", moderation.getPlayerName());
         replacements.put("<count>", String.valueOf(count));
         replacements.put("<time>", TimeUtil.convertTime(null, moderation.getRemainingTime()));
         replacements.put("<reason>", moderation.getReason());
@@ -198,7 +213,7 @@ public void sendKickMessage(@Nullable OfflinePlayer sender, @NotNull String reas
     }
 
     public void sendBroadcastMessage(@Nullable OfflinePlayer sender, @NotNull String message) {
-        String senderName = sender == null ? "CONSOLE" : sender.getName();
+        String senderName = sender == null ? "CONSOLE" : MessageUtil.formatPlayerString((CommandSender) sender, "<player>");
 
         HashMap<String, String> replacements = new HashMap<>();
         replacements.put("<player>", senderName);
@@ -207,9 +222,8 @@ public void sendBroadcastMessage(@Nullable OfflinePlayer sender, @NotNull String
     }
 
     public void sendMaintenanceMessage(@Nullable OfflinePlayer sender, @NotNull String type) {
-        String senderName = sender == null ? "CONSOLE" : sender.getName();
+        String senderName = sender == null ? "CONSOLE" : MessageUtil.formatPlayerString((CommandSender) sender, "<player>");
 
-        assert senderName != null;
         String message = integrations.getString("DiscordSRV.message.maintenance.type." + type)
                 .replace("<player>", senderName);
 
@@ -220,7 +234,7 @@ public void sendMaintenanceMessage(@Nullable OfflinePlayer sender, @NotNull Stri
     }
 
     public void sendPollMessage(@Nullable OfflinePlayer sender, @NotNull String message, int id) {
-        String senderName = sender == null ? "CONSOLE" : sender.getName();
+        String senderName = sender == null ? "CONSOLE" : MessageUtil.formatPlayerString((CommandSender) sender, "<player>");
 
         HashMap<String, String> replacements = new HashMap<>();
         replacements.put("<player>", senderName);
@@ -230,7 +244,7 @@ public void sendPollMessage(@Nullable OfflinePlayer sender, @NotNull String mess
     }
 
     public void sendMeMessage(@Nullable OfflinePlayer sender, @NotNull String message) {
-        String senderName = sender == null ? "CONSOLE" : sender.getName();
+        String senderName = sender == null ? "CONSOLE" : MessageUtil.formatPlayerString((CommandSender) sender, "<player>");
 
         HashMap<String, String> replacements = new HashMap<>();
         replacements.put("<player>", senderName);
@@ -239,7 +253,7 @@ public void sendMeMessage(@Nullable OfflinePlayer sender, @NotNull String messag
     }
 
     public void sendTranslatetoMessage(@Nullable OfflinePlayer sender, @NotNull String targetLanguage, @NotNull String message) {
-        String senderName = sender == null ? "CONSOLE" : sender.getName();
+        String senderName = sender == null ? "CONSOLE" : MessageUtil.formatPlayerString((CommandSender) sender, "<player>");
 
         HashMap<String, String> replacements = new HashMap<>();
         replacements.put("<language>", targetLanguage);
@@ -249,9 +263,8 @@ public void sendTranslatetoMessage(@Nullable OfflinePlayer sender, @NotNull Stri
     }
 
     public void sendTryMessage(@Nullable OfflinePlayer sender, @NotNull String message, @NotNull String percent, @NotNull String type) {
-        String senderName = sender == null ? "CONSOLE" : sender.getName();
+        String senderName = sender == null ? "CONSOLE" : MessageUtil.formatPlayerString((CommandSender) sender, "<player>");
 
-        assert senderName != null;
         String messageConfig = integrations.getString("DiscordSRV.message.try.type." + type)
                 .replace("<player>", senderName)
                 .replace("<message>", message)
@@ -264,9 +277,8 @@ public void sendTryMessage(@Nullable OfflinePlayer sender, @NotNull String messa
     }
 
     public void sendDiceMessage(@Nullable OfflinePlayer sender, @NotNull String cube, @NotNull String type) {
-        String senderName = sender == null ? "CONSOLE" : sender.getName();
+        String senderName = sender == null ? "CONSOLE" : MessageUtil.formatPlayerString((CommandSender) sender, "<player>");
 
-        assert senderName != null;
         String messageConfig = integrations.getString("DiscordSRV.message.dice.type." + type)
                 .replace("<player>", senderName)
                 .replace("<cube>", cube);
@@ -278,7 +290,7 @@ public void sendDiceMessage(@Nullable OfflinePlayer sender, @NotNull String cube
     }
 
     public void sendBallMessage(@Nullable OfflinePlayer sender, @NotNull String message, @NotNull String answer) {
-        String senderName = sender == null ? "CONSOLE" : sender.getName();
+        String senderName = sender == null ? "CONSOLE" : MessageUtil.formatPlayerString((CommandSender) sender, "<player>");
 
         HashMap<String, String> replacements = new HashMap<>();
         replacements.put("<player>", senderName);