Fixed quick chat text injection (#1144)

## Description:
https://github.com/openfrontio/OpenFrontIO/issues/1035
Fixes #1035 
## Please complete the following:

- [x] I have added screenshots for all UI updates
- [x] I process any text displayed to the user through translateText()
and I've added it to the en.json file
- [x] I have added relevant tests to the test directory
- [x] I confirm I have thoroughly tested these changes and take full
responsibility for any bugs introduced
- [x] I understand that submitting code with bugs that could have been
caught through manual testing blocks releases and new features for all
contributors

## Please put your Discord username so you can be contacted if a bug or
regression is found:

.w.

---------

Co-authored-by: Scott Anderson <scottanderson@users.noreply.github.com>
Co-authored-by: evanpelle <evanpelle@gmail.com>

src/client/graphics/layers/ChatIntegration.ts

@@ -74,7 +74,7 @@ export class ChatIntegration {
                   new SendQuickChatEvent(
                     recipient,
                     `${category.id}.${phrase.key}`,
-                    {},
+                    undefined,
                   ),
                 );
               }

src/client/graphics/layers/ChatModal.ts

@@ -29,16 +29,16 @@ export class ChatModal extends LitElement {
     return this;
   }
 
-  private players: string[] = [];
+  private players: PlayerView[] = [];
 
   private playerSearchQuery: string = "";
   private previewText: string | null = null;
   private requiresPlayerSelection: boolean = false;
   private selectedCategory: string | null = null;
   private selectedPhraseText: string | null = null;
-  private selectedPlayer: string | null = null;
   private selectedPhraseTemplate: string | null = null;
   private selectedQuickChatKey: string | null = null;
+  private selectedPlayer: PlayerView | null = null;
 
   private recipient: PlayerView;
   private sender: PlayerView;
@@ -143,7 +143,7 @@ export class ChatModal extends LitElement {
                             : ""}"
                           @click=${() => this.selectPlayer(player)}
                         >
-                          ${player}
+                          ${player.name()}
                         </button>
                       `,
                     )}
@@ -177,7 +177,6 @@ export class ChatModal extends LitElement {
     this.selectedPhraseText = null;
     this.previewText = null;
     this.requiresPlayerSelection = false;
-    this.selectedPlayer = null;
     this.requestUpdate();
   }
 
@@ -194,7 +193,6 @@ export class ChatModal extends LitElement {
     );
     this.previewText = `chat.${this.selectedCategory}.${phrase.key}`;
     this.requiresPlayerSelection = phrase.requiresPlayer;
-    this.selectedPlayer = null;
     this.requestUpdate();
   }
 
@@ -202,10 +200,10 @@ export class ChatModal extends LitElement {
     return translateText(`chat.${this.selectedCategory}.${phrase.key}`);
   }
 
-  private selectPlayer(player: string) {
+  private selectPlayer(player: PlayerView) {
     if (this.previewText) {
       this.previewText =
-        this.selectedPhraseTemplate?.replace("[P1]", player) ?? null;
+        this.selectedPhraseTemplate?.replace("[P1]", player.name()) ?? null;
       this.selectedPlayer = player;
       this.requiresPlayerSelection = false;
       this.requestUpdate();
@@ -219,15 +217,11 @@ export class ChatModal extends LitElement {
     console.log("Key:", this.selectedQuickChatKey);
 
     if (this.sender && this.recipient && this.selectedQuickChatKey) {
-      const variables: Record<string, string> = this.selectedPlayer
-        ? { P1: this.selectedPlayer }
-        : {};
-
       this.eventBus.emit(
         new SendQuickChatEvent(
           this.recipient,
           this.selectedQuickChatKey,
-          variables,
+          this.selectedPlayer?.id(),
         ),
       );
     }
@@ -246,13 +240,15 @@ export class ChatModal extends LitElement {
     this.requestUpdate();
   }
 
-  private getSortedFilteredPlayers(): string[] {
-    const sorted = [...this.players].sort((a, b) => a.localeCompare(b));
+  private getSortedFilteredPlayers(): PlayerView[] {
+    const sorted = [...this.players].sort((a, b) =>
+      a.name().localeCompare(b.name()),
+    );
     const filtered = sorted.filter((p) =>
-      p.toLowerCase().includes(this.playerSearchQuery),
+      p.name().toLowerCase().includes(this.playerSearchQuery),
     );
     const others = sorted.filter(
-      (p) => !p.toLowerCase().includes(this.playerSearchQuery),
+      (p) => !p.name().toLowerCase().includes(this.playerSearchQuery),
     );
     return [...filtered, ...others];
   }
@@ -265,13 +261,10 @@ export class ChatModal extends LitElement {
     if (sender && recipient) {
       console.log("Sent message:", recipient);
       console.log("Sent message:", sender);
-      const alivePlayerNames = this.g
+      this.players = this.g
         .players()
-        .filter((p) => p.isAlive() && !(p.data.playerType === PlayerType.Bot))
-        .map((p) => p.data.name);
+        .filter((p) => p.isAlive() && p.data.playerType !== PlayerType.Bot);
 
-      console.log("Alive player names:", alivePlayerNames);
-      this.players = alivePlayerNames;
       this.recipient = recipient;
       this.sender = sender;
     }
@@ -284,7 +277,6 @@ export class ChatModal extends LitElement {
     this.selectedPhraseText = null;
     this.previewText = null;
     this.requiresPlayerSelection = false;
-    this.selectedPlayer = null;
     this.modalEl?.close();
   }
 
@@ -303,12 +295,10 @@ export class ChatModal extends LitElement {
     recipient?: PlayerView,
   ) {
     if (sender && recipient) {
-      const alivePlayerNames = this.g
+      this.players = this.g
         .players()
-        .filter((p) => p.isAlive() && !(p.data.playerType === PlayerType.Bot))
-        .map((p) => p.data.name);
+        .filter((p) => p.isAlive() && p.data.playerType !== PlayerType.Bot);
 
-      this.players = alivePlayerNames;
       this.recipient = recipient;
       this.sender = sender;
     }

src/client/graphics/layers/EventsDisplay.ts

@@ -305,10 +305,20 @@ export class EventsDisplay extends LitElement implements Layer {
     }
 
     const baseMessage = translateText(`chat.${event.category}.${event.key}`);
-    const translatedMessage = baseMessage.replace(
-      /\[([^\]]+)\]/g,
-      (_, key) => event.variables?.[key] || `[${key}]`,
-    );
+    let translatedMessage = baseMessage;
+    if (event.target) {
+      try {
+        const targetPlayer = this.game.player(event.target);
+        const targetName = targetPlayer?.name() ?? event.target;
+        translatedMessage = baseMessage.replace("[P1]", targetName);
+      } catch (e) {
+        console.warn(
+          `Failed to resolve player for target ID '${event.target}'`,
+          e,
+        );
+        return;
+      }
+    }
 
     this.addEvent({
       description: translateText(event.isFrom ? "chat.from" : "chat.to", {