From c08f781aa11ac044506afada90bc6acb4de8cd04 Mon Sep 17 00:00:00 2001
From: Stabar-ti <stabarrabats@gmail.com>
Date: Sun, 26 Jul 2026 00:25:27 +0200
Subject: [PATCH 1/5] API and refactor

---
 .gitignore                                    |   1 +
 .../AncientTradeRoutesAcd2ButtonHandler.java  |  13 +-
 .../acd2/ArbitrationAcd2ButtonHandler.java    |  28 +-
 .../acd2/ArmsDealAcd2ButtonHandler.java       |  12 +-
 .../acd2/BetrayalAcd2ButtonHandler.java       |  15 +-
 .../BlackMarketIntelAcd2ButtonHandler.java    |   3 +-
 .../acd2/BountyAcd2ButtonHandler.java         |   6 +-
 .../acd2/DefectorsAcd2ButtonHandler.java      |   8 +-
 .../acd2/EspionageAcd2ButtonHandler.java      |  16 +-
 .../acd2/FalseFlagAcd2ButtonHandler.java      |   8 +-
 .../acd2/HeistAcd2ButtonHandler.java          |   6 +-
 .../acd2/IxthianGiftAcd2ButtonHandler.java    |   9 +-
 .../acd2/JointResearchAcd2ButtonHandler.java  |   9 +-
 .../acd2/PrisonersOfWarAcd2ButtonHandler.java |  10 +-
 .../acd2/RefugeesAcd2ButtonHandler.java       |  12 +-
 .../acd2/SyndicateAcd2ButtonHandler.java      |   5 +-
 .../java/ti4/helpers/ActionCardHelper.java    |  38 +-
 src/main/java/ti4/helpers/AgendaHelper.java   |   7 +
 .../ti4/helpers/ButtonHelperAbilities.java    |  24 +-
 .../ti4/helpers/ButtonHelperActionCards.java  | 365 ++++++------------
 .../java/ti4/helpers/ButtonHelperAgents.java  |  38 +-
 .../helpers/ButtonHelperFactionSpecific.java  | 122 ++----
 .../java/ti4/helpers/ButtonHelperHeroes.java  |  28 +-
 .../ButtonHelperTwilightsFallActionCards.java |  10 +-
 src/main/java/ti4/helpers/FoWHelper.java      | 177 +++++++++
 .../thundersedge/TeHelperActionCards.java     |  15 +-
 .../helpers/thundersedge/TeHelperAgents.java  |   3 +-
 .../thundersedge/TeHelperCommanders.java      |   2 +-
 .../service/actioncard/SabotageService.java   |   3 +-
 .../ti4/service/explore/ExploreService.java   |  71 ++--
 src/test/java/ti4/helpers/FoWHelperTest.java  | 165 ++++++++
 31 files changed, 608 insertions(+), 621 deletions(-)
 create mode 100644 src/test/java/ti4/helpers/FoWHelperTest.java

diff --git a/.gitignore b/.gitignore
index a740fac065..4d32da6d64 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,3 +35,4 @@ scripts/**/__pycache__/
 /ti4-backup/
 /ti4-bkup-cleaned/
 /.claude/settings.local.json
+/.claude/workfiles/
diff --git a/src/main/java/ti4/discord/interactions/buttons/handlers/actioncards/acd2/AncientTradeRoutesAcd2ButtonHandler.java b/src/main/java/ti4/discord/interactions/buttons/handlers/actioncards/acd2/AncientTradeRoutesAcd2ButtonHandler.java
index 0451299685..5d568520f4 100644
--- a/src/main/java/ti4/discord/interactions/buttons/handlers/actioncards/acd2/AncientTradeRoutesAcd2ButtonHandler.java
+++ b/src/main/java/ti4/discord/interactions/buttons/handlers/actioncards/acd2/AncientTradeRoutesAcd2ButtonHandler.java
@@ -4,7 +4,6 @@
 import java.util.List;
 import lombok.experimental.UtilityClass;
 import net.dv8tion.jda.api.components.buttons.Button;
-import net.dv8tion.jda.api.entities.emoji.Emoji;
 import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent;
 import org.apache.commons.lang3.function.Consumers;
 import ti4.discord.interactions.buttons.Buttons;
@@ -12,6 +11,7 @@
 import ti4.game.Game;
 import ti4.game.Player;
 import ti4.helpers.ButtonHelperAgents;
+import ti4.helpers.FoWHelper;
 import ti4.logging.BotLogger;
 import ti4.message.MessageHelper;
 
@@ -29,16 +29,7 @@ public static void resolveAncientTradeRoutes(Player player, Game game, ButtonInt
             if (p2 == player) {
                 continue;
             }
-            if (game.isFowMode()) {
-                buttons.add(Buttons.gray("ancientTradeRoutesStep2_" + p2.getFaction(), p2.getColor()));
-            } else {
-                Button button = Buttons.gray(
-                        "ancientTradeRoutesStep2_" + p2.getFaction(),
-                        p2.getFactionModel().getShortName());
-                String factionEmojiString = p2.getFactionEmoji();
-                button = button.withEmoji(Emoji.fromFormatted(factionEmojiString));
-                buttons.add(button);
-            }
+            buttons.add(FoWHelper.fogSafeTargetButton("ancientTradeRoutesStep2_" + p2.getFaction(), "gray", p2));
         }
         buttons.add(Buttons.red("deleteButtons", "Don't Give Commodities"));
         event.getMessage().delete().queue(Consumers.nop(), BotLogger::catchRestError);
diff --git a/src/main/java/ti4/discord/interactions/buttons/handlers/actioncards/acd2/ArbitrationAcd2ButtonHandler.java b/src/main/java/ti4/discord/interactions/buttons/handlers/actioncards/acd2/ArbitrationAcd2ButtonHandler.java
index 35afa56dcd..8b8ebb099a 100644
--- a/src/main/java/ti4/discord/interactions/buttons/handlers/actioncards/acd2/ArbitrationAcd2ButtonHandler.java
+++ b/src/main/java/ti4/discord/interactions/buttons/handlers/actioncards/acd2/ArbitrationAcd2ButtonHandler.java
@@ -6,7 +6,6 @@
 import java.util.Objects;
 import lombok.experimental.UtilityClass;
 import net.dv8tion.jda.api.components.buttons.Button;
-import net.dv8tion.jda.api.entities.emoji.Emoji;
 import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent;
 import ti4.discord.interactions.buttons.Buttons;
 import ti4.discord.interactions.routing.ButtonHandler;
@@ -16,6 +15,7 @@
 import ti4.game.Tile;
 import ti4.helpers.ButtonHelper;
 import ti4.helpers.ButtonHelperAbilities;
+import ti4.helpers.FoWHelper;
 import ti4.helpers.Helper;
 import ti4.message.MessageHelper;
 import ti4.service.unit.AddUnitService;
@@ -129,15 +129,8 @@ private static List<Button> getArbitrationOwnerButtons(Game game, Player player)
                             .isEmpty()) {
                 continue;
             }
-            if (game.isFowMode()) {
-                buttons.add(Buttons.gray(
-                        player.factionButtonChecker() + "arbitrationOwner_" + owner.getFaction(), owner.getColor()));
-            } else {
-                Button button = Buttons.gray(
-                        player.factionButtonChecker() + "arbitrationOwner_" + owner.getFaction(),
-                        owner.getFactionModel().getShortName());
-                buttons.add(button.withEmoji(Emoji.fromFormatted(owner.getFactionEmoji())));
-            }
+            buttons.add(FoWHelper.fogSafeTargetButton(
+                    player.factionButtonChecker() + "arbitrationOwner_" + owner.getFaction(), "gray", owner));
         }
 
         if (!getArbitrationPlanetButtons(game, player, "neutralUnits").isEmpty()) {
@@ -184,17 +177,10 @@ private static List<Button> getArbitrationTargetButtons(Game game, Player player
             if (target == player || target.hasPlanet(planet)) {
                 continue;
             }
-            if (game.isFowMode()) {
-                buttons.add(Buttons.gray(
-                        player.factionButtonChecker() + "arbitrationTarget_" + planet + "_" + target.getFaction(),
-                        target.getColor()));
-            } else {
-                Button button = Buttons.gray(
-                        player.factionButtonChecker() + "arbitrationTarget_" + planet + "_" + target.getFaction(),
-                        target.getFactionModel().getShortName());
-                String factionEmojiString = target.getFactionEmoji();
-                buttons.add(button.withEmoji(Emoji.fromFormatted(factionEmojiString)));
-            }
+            buttons.add(FoWHelper.fogSafeTargetButton(
+                    player.factionButtonChecker() + "arbitrationTarget_" + planet + "_" + target.getFaction(),
+                    "gray",
+                    target));
         }
         return buttons;
     }
diff --git a/src/main/java/ti4/discord/interactions/buttons/handlers/actioncards/acd2/ArmsDealAcd2ButtonHandler.java b/src/main/java/ti4/discord/interactions/buttons/handlers/actioncards/acd2/ArmsDealAcd2ButtonHandler.java
index b8584b40b3..a023d19396 100644
--- a/src/main/java/ti4/discord/interactions/buttons/handlers/actioncards/acd2/ArmsDealAcd2ButtonHandler.java
+++ b/src/main/java/ti4/discord/interactions/buttons/handlers/actioncards/acd2/ArmsDealAcd2ButtonHandler.java
@@ -4,13 +4,13 @@
 import java.util.List;
 import lombok.experimental.UtilityClass;
 import net.dv8tion.jda.api.components.buttons.Button;
-import net.dv8tion.jda.api.entities.emoji.Emoji;
 import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent;
 import org.apache.commons.lang3.function.Consumers;
 import ti4.discord.interactions.buttons.Buttons;
 import ti4.discord.interactions.routing.ButtonHandler;
 import ti4.game.Game;
 import ti4.game.Player;
+import ti4.helpers.FoWHelper;
 import ti4.helpers.Helper;
 import ti4.logging.BotLogger;
 import ti4.message.MessageHelper;
@@ -26,15 +26,7 @@ public static void resolveArmsDeal(Player player, Game game, ButtonInteractionEv
             if (p2 == player || !player.getNeighbouringPlayers(true).contains(p2)) {
                 continue;
             }
-            if (game.isFowMode()) {
-                buttons.add(Buttons.gray("armsDealStep2_" + p2.getFaction(), p2.getColor()));
-            } else {
-                Button button = Buttons.gray(
-                        "armsDealStep2_" + p2.getFaction(), p2.getFactionModel().getShortName());
-                String factionEmojiString = p2.getFactionEmoji();
-                button = button.withEmoji(Emoji.fromFormatted(factionEmojiString));
-                buttons.add(button);
-            }
+            buttons.add(FoWHelper.fogSafeTargetButton("armsDealStep2_" + p2.getFaction(), "gray", p2));
         }
         event.getMessage().delete().queue(Consumers.nop(), BotLogger::catchRestError);
         MessageHelper.sendMessageToChannelWithButtons(
diff --git a/src/main/java/ti4/discord/interactions/buttons/handlers/actioncards/acd2/BetrayalAcd2ButtonHandler.java b/src/main/java/ti4/discord/interactions/buttons/handlers/actioncards/acd2/BetrayalAcd2ButtonHandler.java
index 7c29576535..d90e9d7a90 100644
--- a/src/main/java/ti4/discord/interactions/buttons/handlers/actioncards/acd2/BetrayalAcd2ButtonHandler.java
+++ b/src/main/java/ti4/discord/interactions/buttons/handlers/actioncards/acd2/BetrayalAcd2ButtonHandler.java
@@ -4,7 +4,6 @@
 import java.util.List;
 import lombok.experimental.UtilityClass;
 import net.dv8tion.jda.api.components.buttons.Button;
-import net.dv8tion.jda.api.entities.emoji.Emoji;
 import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent;
 import org.apache.commons.lang3.function.Consumers;
 import ti4.discord.interactions.buttons.Buttons;
@@ -13,6 +12,7 @@
 import ti4.game.Player;
 import ti4.helpers.ActionCardHelper;
 import ti4.helpers.ButtonHelper;
+import ti4.helpers.FoWHelper;
 import ti4.logging.BotLogger;
 import ti4.message.MessageHelper;
 import ti4.service.emoji.CardEmojis;
@@ -27,16 +27,7 @@ public static void resolveBetrayal(Player player, Game game, ButtonInteractionEv
             if (p2 == player) {
                 continue;
             }
-            if (game.isFowMode()) {
-                buttons.add(Buttons.gray("resolveBetrayalStep2_" + p2.getFaction(), p2.getColor()));
-            } else {
-                Button button = Buttons.gray(
-                        "resolveBetrayalStep2_" + p2.getFaction(),
-                        p2.getFactionModel().getShortName());
-                String factionEmojiString = p2.getFactionEmoji();
-                button = button.withEmoji(Emoji.fromFormatted(factionEmojiString));
-                buttons.add(button);
-            }
+            buttons.add(FoWHelper.fogSafeTargetButton("resolveBetrayalStep2_" + p2.getFaction(), "gray", p2));
         }
         event.getMessage().delete().queue(Consumers.nop(), BotLogger::catchRestError);
         MessageHelper.sendMessageToChannelWithButtons(
@@ -95,7 +86,7 @@ public static void resolveBetrayalStep2(Player player, Game game, ButtonInteract
             List<Button> buttons = List.of(Buttons.green(
                     "resolveBetrayalCollect_" + player.getFaction(), "Send Random Action Card", CardEmojis.ActionCard));
             String msg = p2.getRepresentationUnfogged() + ", _Betrayal_ requires you to send 1 random action card to "
-                    + (game.isFowMode() ? "another player." : player.getFactionEmojiOrColor() + ".");
+                    + FoWHelper.factionEmojiOrAnon(game, player, "another player") + ".";
             MessageHelper.sendMessageToChannelWithButtons(p2.getCardsInfoThread(), msg, buttons);
             if (p2.isNpc()) {
                 ActionCardHelper.sendRandomACPart2(event, game, p2, player);
diff --git a/src/main/java/ti4/discord/interactions/buttons/handlers/actioncards/acd2/BlackMarketIntelAcd2ButtonHandler.java b/src/main/java/ti4/discord/interactions/buttons/handlers/actioncards/acd2/BlackMarketIntelAcd2ButtonHandler.java
index 9bbeeb4b09..2d61a154dc 100644
--- a/src/main/java/ti4/discord/interactions/buttons/handlers/actioncards/acd2/BlackMarketIntelAcd2ButtonHandler.java
+++ b/src/main/java/ti4/discord/interactions/buttons/handlers/actioncards/acd2/BlackMarketIntelAcd2ButtonHandler.java
@@ -11,6 +11,7 @@
 import ti4.game.Game;
 import ti4.game.Player;
 import ti4.helpers.ButtonHelper;
+import ti4.helpers.FoWHelper;
 import ti4.image.Mapper;
 import ti4.message.MessageHelper;
 import ti4.model.SecretObjectiveModel;
@@ -99,7 +100,7 @@ public static void blackMarketIntelGive(Player player, Game game, ButtonInteract
 
         String publicGiveMsg = player.getRepresentationNoPing()
                 + " gave a secret objective to "
-                + (game.isFowMode() ? "another player" : target.getRepresentationNoPing())
+                + FoWHelper.actorOrAnon(game, target, "another player")
                 + " using _Black Market Intel_.";
         MessageHelper.sendMessageToChannel(game.getActionsChannel(), publicGiveMsg);
 
diff --git a/src/main/java/ti4/discord/interactions/buttons/handlers/actioncards/acd2/BountyAcd2ButtonHandler.java b/src/main/java/ti4/discord/interactions/buttons/handlers/actioncards/acd2/BountyAcd2ButtonHandler.java
index 2b9c4d3110..8666859822 100644
--- a/src/main/java/ti4/discord/interactions/buttons/handlers/actioncards/acd2/BountyAcd2ButtonHandler.java
+++ b/src/main/java/ti4/discord/interactions/buttons/handlers/actioncards/acd2/BountyAcd2ButtonHandler.java
@@ -32,11 +32,7 @@ public static void resolveBounty(Player player, Game game, ButtonInteractionEven
                 continue;
             }
             String id = player.factionButtonChecker() + "bountyStep2_" + p2.getFaction();
-            if (game.isFowMode()) {
-                buttons.add(Buttons.gray(id, p2.getColor()));
-            } else {
-                buttons.add(Buttons.gray(id, p2.getColor()).withEmoji(Emoji.fromFormatted(p2.getFactionEmoji())));
-            }
+            buttons.add(Buttons.gray(id, p2.getColor()).withEmoji(Emoji.fromFormatted(p2.fogSafeEmoji())));
         }
         buttons.add(Buttons.red("deleteButtons", "Decline Capture"));
 
diff --git a/src/main/java/ti4/discord/interactions/buttons/handlers/actioncards/acd2/DefectorsAcd2ButtonHandler.java b/src/main/java/ti4/discord/interactions/buttons/handlers/actioncards/acd2/DefectorsAcd2ButtonHandler.java
index 50cbbb0a22..0e3fd27cb9 100644
--- a/src/main/java/ti4/discord/interactions/buttons/handlers/actioncards/acd2/DefectorsAcd2ButtonHandler.java
+++ b/src/main/java/ti4/discord/interactions/buttons/handlers/actioncards/acd2/DefectorsAcd2ButtonHandler.java
@@ -304,11 +304,9 @@ private static List<Button> getDefectorsTargetButtons(Player player, Game game,
         List<Button> buttons = new ArrayList<>();
         for (Player target : targets) {
             String label = game.isFowMode() ? target.getColor() : StringUtils.capitalize(target.getFaction());
-            Button button =
-                    Buttons.blue(player.factionButtonChecker() + "defectorsTarget_" + target.getFaction(), label);
-            if (!game.isFowMode()) {
-                button = button.withEmoji(Emoji.fromFormatted(target.getFactionEmoji()));
-            }
+            Button button = Buttons.blue(
+                            player.factionButtonChecker() + "defectorsTarget_" + target.getFaction(), label)
+                    .withEmoji(Emoji.fromFormatted(target.fogSafeEmoji()));
             buttons.add(button);
         }
         return buttons;
diff --git a/src/main/java/ti4/discord/interactions/buttons/handlers/actioncards/acd2/EspionageAcd2ButtonHandler.java b/src/main/java/ti4/discord/interactions/buttons/handlers/actioncards/acd2/EspionageAcd2ButtonHandler.java
index d5ad808326..0302c0968a 100644
--- a/src/main/java/ti4/discord/interactions/buttons/handlers/actioncards/acd2/EspionageAcd2ButtonHandler.java
+++ b/src/main/java/ti4/discord/interactions/buttons/handlers/actioncards/acd2/EspionageAcd2ButtonHandler.java
@@ -5,7 +5,6 @@
 import java.util.Map;
 import lombok.experimental.UtilityClass;
 import net.dv8tion.jda.api.components.buttons.Button;
-import net.dv8tion.jda.api.entities.emoji.Emoji;
 import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent;
 import ti4.discord.interactions.buttons.Buttons;
 import ti4.discord.interactions.routing.ButtonHandler;
@@ -13,6 +12,7 @@
 import ti4.game.Player;
 import ti4.helpers.ActionCardHelper;
 import ti4.helpers.ButtonHelper;
+import ti4.helpers.FoWHelper;
 import ti4.helpers.PromissoryNoteHelper;
 import ti4.image.Mapper;
 import ti4.message.MessageHelper;
@@ -28,16 +28,8 @@ public static void resolveEspionage(Player player, Game game, ButtonInteractionE
             if (target == player || target.getActionCards().isEmpty()) {
                 continue;
             }
-            if (game.isFowMode()) {
-                buttons.add(Buttons.gray(
-                        player.factionButtonChecker() + "espionageTarget_" + target.getFaction(), target.getColor()));
-            } else {
-                Button button = Buttons.gray(
-                        player.factionButtonChecker() + "espionageTarget_" + target.getFaction(),
-                        target.getFactionModel().getShortName());
-                button = button.withEmoji(Emoji.fromFormatted(target.getFactionEmoji()));
-                buttons.add(button);
-            }
+            buttons.add(FoWHelper.fogSafeTargetButton(
+                    player.factionButtonChecker() + "espionageTarget_" + target.getFaction(), "gray", target));
         }
 
         ButtonHelper.deleteMessage(event);
@@ -87,7 +79,7 @@ public static void resolveEspionageTarget(Player player, Game game, ButtonIntera
         MessageHelper.sendMessageToChannelWithButtons(
                 target.getCardsInfoThread(),
                 target.getRepresentationUnfogged() + ", "
-                        + (game.isFowMode() ? "another player" : player.getFactionEmojiOrColor())
+                        + FoWHelper.factionEmojiOrAnon(game, player, "another player")
                         + " is resolving _Espionage_ against you. You may reveal your action cards so they can take 1,"
                         + " or send them a random promissory note instead.",
                 buttons);
diff --git a/src/main/java/ti4/discord/interactions/buttons/handlers/actioncards/acd2/FalseFlagAcd2ButtonHandler.java b/src/main/java/ti4/discord/interactions/buttons/handlers/actioncards/acd2/FalseFlagAcd2ButtonHandler.java
index f26fe22b0a..8ad68c68ca 100644
--- a/src/main/java/ti4/discord/interactions/buttons/handlers/actioncards/acd2/FalseFlagAcd2ButtonHandler.java
+++ b/src/main/java/ti4/discord/interactions/buttons/handlers/actioncards/acd2/FalseFlagAcd2ButtonHandler.java
@@ -4,7 +4,6 @@
 import java.util.List;
 import lombok.experimental.UtilityClass;
 import net.dv8tion.jda.api.components.buttons.Button;
-import net.dv8tion.jda.api.entities.emoji.Emoji;
 import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent;
 import ti4.discord.interactions.buttons.Buttons;
 import ti4.discord.interactions.routing.ButtonHandler;
@@ -28,12 +27,7 @@ public static void resolveFalseFlag(Player player, Game game, ButtonInteractionE
                 continue;
             }
             String id = player.factionButtonChecker() + "falseFlagPlayer_" + p2.getFaction();
-            if (game.isFowMode()) {
-                buttons.add(Buttons.gray(id, p2.getColor()));
-            } else {
-                buttons.add(Buttons.gray(id, p2.getFactionModel().getShortName())
-                        .withEmoji(Emoji.fromFormatted(p2.getFactionEmoji())));
-            }
+            buttons.add(FoWHelper.fogSafeTargetButton(id, "gray", p2));
         }
         ButtonHelper.deleteMessage(event);
         if (buttons.isEmpty()) {
diff --git a/src/main/java/ti4/discord/interactions/buttons/handlers/actioncards/acd2/HeistAcd2ButtonHandler.java b/src/main/java/ti4/discord/interactions/buttons/handlers/actioncards/acd2/HeistAcd2ButtonHandler.java
index ac42d322be..ae2a82e446 100644
--- a/src/main/java/ti4/discord/interactions/buttons/handlers/actioncards/acd2/HeistAcd2ButtonHandler.java
+++ b/src/main/java/ti4/discord/interactions/buttons/handlers/actioncards/acd2/HeistAcd2ButtonHandler.java
@@ -27,11 +27,7 @@ public static void resolveHeist(Player player, Game game, ButtonInteractionEvent
                 continue;
             }
             String id = player.factionButtonChecker() + "heistStep2_" + p2.getFaction() + "_2";
-            if (game.isFowMode()) {
-                buttons.add(Buttons.gray(id, p2.getColor()));
-            } else {
-                buttons.add(Buttons.gray(id, p2.getColor()).withEmoji(Emoji.fromFormatted(p2.getFactionEmoji())));
-            }
+            buttons.add(Buttons.gray(id, p2.getColor()).withEmoji(Emoji.fromFormatted(p2.fogSafeEmoji())));
         }
         buttons.add(Buttons.red("deleteButtons", "Decline"));
 
diff --git a/src/main/java/ti4/discord/interactions/buttons/handlers/actioncards/acd2/IxthianGiftAcd2ButtonHandler.java b/src/main/java/ti4/discord/interactions/buttons/handlers/actioncards/acd2/IxthianGiftAcd2ButtonHandler.java
index b95d20423e..7c63924fc3 100644
--- a/src/main/java/ti4/discord/interactions/buttons/handlers/actioncards/acd2/IxthianGiftAcd2ButtonHandler.java
+++ b/src/main/java/ti4/discord/interactions/buttons/handlers/actioncards/acd2/IxthianGiftAcd2ButtonHandler.java
@@ -4,7 +4,6 @@
 import java.util.List;
 import lombok.experimental.UtilityClass;
 import net.dv8tion.jda.api.components.buttons.Button;
-import net.dv8tion.jda.api.entities.emoji.Emoji;
 import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent;
 import ti4.discord.interactions.buttons.Buttons;
 import ti4.discord.interactions.routing.ButtonHandler;
@@ -13,6 +12,7 @@
 import ti4.game.Player;
 import ti4.game.Tile;
 import ti4.helpers.ButtonHelper;
+import ti4.helpers.FoWHelper;
 import ti4.helpers.Helper;
 import ti4.message.MessageHelper;
 import ti4.service.combat.StartCombatService;
@@ -29,12 +29,7 @@ public static void resolveIxthianGift(Player player, Game game, ButtonInteractio
                 continue;
             }
             String id = player.factionButtonChecker() + "ixthianGiftPlayer_" + p2.getFaction();
-            if (game.isFowMode()) {
-                buttons.add(Buttons.gray(id, p2.getColor()));
-            } else {
-                buttons.add(Buttons.gray(id, p2.getFactionModel().getShortName())
-                        .withEmoji(Emoji.fromFormatted(p2.getFactionEmoji())));
-            }
+            buttons.add(FoWHelper.fogSafeTargetButton(id, "gray", p2));
         }
         ButtonHelper.deleteMessage(event);
         if (buttons.isEmpty()) {
diff --git a/src/main/java/ti4/discord/interactions/buttons/handlers/actioncards/acd2/JointResearchAcd2ButtonHandler.java b/src/main/java/ti4/discord/interactions/buttons/handlers/actioncards/acd2/JointResearchAcd2ButtonHandler.java
index dc3b242180..b3e03fafd9 100644
--- a/src/main/java/ti4/discord/interactions/buttons/handlers/actioncards/acd2/JointResearchAcd2ButtonHandler.java
+++ b/src/main/java/ti4/discord/interactions/buttons/handlers/actioncards/acd2/JointResearchAcd2ButtonHandler.java
@@ -4,13 +4,13 @@
 import java.util.List;
 import lombok.experimental.UtilityClass;
 import net.dv8tion.jda.api.components.buttons.Button;
-import net.dv8tion.jda.api.entities.emoji.Emoji;
 import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent;
 import ti4.discord.interactions.buttons.Buttons;
 import ti4.discord.interactions.routing.ButtonHandler;
 import ti4.game.Game;
 import ti4.game.Player;
 import ti4.helpers.ButtonHelper;
+import ti4.helpers.FoWHelper;
 import ti4.image.Mapper;
 import ti4.message.MessageHelper;
 import ti4.model.TechnologyModel;
@@ -62,12 +62,7 @@ public static void resolveJointResearchTech(
                 continue;
             }
             String id = player.factionButtonChecker() + "jointResearchGive_" + p2.getFaction() + "_" + techID;
-            if (game.isFowMode()) {
-                buttons.add(Buttons.gray(id, p2.getColor()));
-            } else {
-                buttons.add(Buttons.gray(id, p2.getFactionModel().getShortName())
-                        .withEmoji(Emoji.fromFormatted(p2.getFactionEmoji())));
-            }
+            buttons.add(FoWHelper.fogSafeTargetButton(id, "gray", p2));
         }
         if (buttons.isEmpty()) {
             MessageHelper.sendMessageToChannel(
diff --git a/src/main/java/ti4/discord/interactions/buttons/handlers/actioncards/acd2/PrisonersOfWarAcd2ButtonHandler.java b/src/main/java/ti4/discord/interactions/buttons/handlers/actioncards/acd2/PrisonersOfWarAcd2ButtonHandler.java
index ed28c82e46..b617036868 100644
--- a/src/main/java/ti4/discord/interactions/buttons/handlers/actioncards/acd2/PrisonersOfWarAcd2ButtonHandler.java
+++ b/src/main/java/ti4/discord/interactions/buttons/handlers/actioncards/acd2/PrisonersOfWarAcd2ButtonHandler.java
@@ -4,7 +4,6 @@
 import java.util.List;
 import lombok.experimental.UtilityClass;
 import net.dv8tion.jda.api.components.buttons.Button;
-import net.dv8tion.jda.api.entities.emoji.Emoji;
 import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent;
 import ti4.discord.interactions.buttons.Buttons;
 import ti4.discord.interactions.routing.ButtonHandler;
@@ -30,12 +29,7 @@ public static void resolvePrisonersOfWar(Player player, Game game, ButtonInterac
                 continue;
             }
             String id = player.factionButtonChecker() + "prisonersOfWarTarget_" + target.getFaction();
-            if (game.isFowMode()) {
-                buttons.add(Buttons.gray(id, target.getColor()));
-            } else {
-                buttons.add(Buttons.gray(id, target.getFactionModel().getShortName())
-                        .withEmoji(Emoji.fromFormatted(target.getFactionEmoji())));
-            }
+            buttons.add(FoWHelper.fogSafeTargetButton(id, "gray", target));
         }
 
         ButtonHelper.deleteMessage(event);
@@ -83,7 +77,7 @@ public static void resolvePrisonersOfWarTarget(
         MessageHelper.sendMessageToChannelWithButtons(
                 target.getCardsInfoThread(),
                 target.getRepresentationUnfogged() + ", choose which promissory note to give to "
-                        + (game.isFowMode() ? "your opponent" : player.getFactionEmojiOrColor())
+                        + FoWHelper.factionEmojiOrAnon(game, player, "your opponent")
                         + " for _Prisoners of War_.",
                 buttons);
         MessageHelper.sendMessageToChannel(
diff --git a/src/main/java/ti4/discord/interactions/buttons/handlers/actioncards/acd2/RefugeesAcd2ButtonHandler.java b/src/main/java/ti4/discord/interactions/buttons/handlers/actioncards/acd2/RefugeesAcd2ButtonHandler.java
index e95a5ccd73..f8655e5155 100644
--- a/src/main/java/ti4/discord/interactions/buttons/handlers/actioncards/acd2/RefugeesAcd2ButtonHandler.java
+++ b/src/main/java/ti4/discord/interactions/buttons/handlers/actioncards/acd2/RefugeesAcd2ButtonHandler.java
@@ -7,7 +7,6 @@
 import java.util.Set;
 import lombok.experimental.UtilityClass;
 import net.dv8tion.jda.api.components.buttons.Button;
-import net.dv8tion.jda.api.entities.emoji.Emoji;
 import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent;
 import ti4.discord.interactions.buttons.Buttons;
 import ti4.discord.interactions.routing.ButtonHandler;
@@ -17,6 +16,7 @@
 import ti4.game.UnitHolder;
 import ti4.helpers.ButtonHelper;
 import ti4.helpers.ButtonHelperAbilities;
+import ti4.helpers.FoWHelper;
 import ti4.helpers.Helper;
 import ti4.message.MessageHelper;
 import ti4.service.unit.AddUnitService;
@@ -31,15 +31,7 @@ public static void resolveRefugees(Player player, Game game, ButtonInteractionEv
             if (p2 == player || getRefugeesPlanets(game, p2).isEmpty()) {
                 continue;
             }
-            if (game.isFowMode()) {
-                buttons.add(Buttons.gray("resolveRefugeesStep2_" + p2.getFaction(), p2.getColor()));
-            } else {
-                Button button = Buttons.gray(
-                        "resolveRefugeesStep2_" + p2.getFaction(),
-                        p2.getFactionModel().getShortName());
-                String factionEmojiString = p2.getFactionEmoji();
-                buttons.add(button.withEmoji(Emoji.fromFormatted(factionEmojiString)));
-            }
+            buttons.add(FoWHelper.fogSafeTargetButton("resolveRefugeesStep2_" + p2.getFaction(), "gray", p2));
         }
         if (buttons.isEmpty()) {
             MessageHelper.sendMessageToChannel(
diff --git a/src/main/java/ti4/discord/interactions/buttons/handlers/actioncards/acd2/SyndicateAcd2ButtonHandler.java b/src/main/java/ti4/discord/interactions/buttons/handlers/actioncards/acd2/SyndicateAcd2ButtonHandler.java
index d24b69dcc8..b20377c5e5 100644
--- a/src/main/java/ti4/discord/interactions/buttons/handlers/actioncards/acd2/SyndicateAcd2ButtonHandler.java
+++ b/src/main/java/ti4/discord/interactions/buttons/handlers/actioncards/acd2/SyndicateAcd2ButtonHandler.java
@@ -15,6 +15,7 @@
 import ti4.game.Player;
 import ti4.helpers.ActionCardHelper;
 import ti4.helpers.ButtonHelper;
+import ti4.helpers.FoWHelper;
 import ti4.image.Mapper;
 import ti4.message.MessageHelper;
 
@@ -97,7 +98,7 @@ public static void resolveSyndicateAssign(Player player, Game game, ButtonIntera
         ActionCardHelper.sendActionCardInfo(game, target);
         ButtonHelper.checkACLimit(game, target);
 
-        String targetDisplay = game.isFowMode() ? "another player" : target.getFactionEmojiOrColor();
+        String targetDisplay = FoWHelper.factionEmojiOrAnon(game, target, "another player");
         MessageHelper.sendMessageToChannel(
                 player.getCorrectChannel(),
                 player.getRepresentationUnfogged() + " gave an action card to " + targetDisplay + " via _Syndicate_.");
@@ -127,7 +128,7 @@ private static void sendSyndicateAssignButtons(
                         Mapper.getActionCard(cardId).getName()))
                 .toList();
 
-        String targetDisplay = game.isFowMode() ? target.getColor() : target.getFactionEmojiOrColor();
+        String targetDisplay = FoWHelper.factionEmojiOrAnon(game, target, target.getColor());
         MessageHelper.sendMessageToChannelWithButtons(
                 player.getCorrectChannel(),
                 player.getRepresentationUnfogged() + ", choose which action card to give to " + targetDisplay
diff --git a/src/main/java/ti4/helpers/ActionCardHelper.java b/src/main/java/ti4/helpers/ActionCardHelper.java
index 7feeebe64f..06496e3ab4 100644
--- a/src/main/java/ti4/helpers/ActionCardHelper.java
+++ b/src/main/java/ti4/helpers/ActionCardHelper.java
@@ -18,7 +18,6 @@
 import net.dv8tion.jda.api.events.interaction.GenericInteractionCreateEvent;
 import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent;
 import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.lang3.StringUtils;
 import ti4.contest.replay.core.CombatReplayTrackedEvent;
 import ti4.contest.replay.service.CombatReplayService;
 import ti4.discord.interactions.buttons.Buttons;
@@ -770,7 +769,7 @@ public static String resolveActionCard(
         boolean actionCardIsCancelable = isActionCardCancelable(actionCard) && !twinned && !hasUnyieldingWill;
 
         String pingGame = actionCardIsCancelable ? game.getPing() + ", " : "";
-        String message = pingGame + (game.isFowMode() ? "someone" : player.getRepresentationNoPing());
+        String message = pingGame + FoWHelper.actorOrAnon(game, player, "someone");
         message += fromGarbozia ? " purged " : " played ";
         message += "the action card _" + actionCardTitle + "_";
         message += fromGarbozia ? " using _Dok 'N Pic's Salvage Yard_." : ".";
@@ -962,9 +961,11 @@ public static String resolveActionCard(
                 }
                 MessageHelper.sendMessageToChannelWithButtons(player.getCorrectChannel(), msg, acbuttons);
             }
-            String cancelReminder = actionCardIsCancelable ? ", after checking for Sabos" : "";
-            String introMsg = player.getRepresentation() + cancelReminder + ", please use buttons to resolve _"
-                    + actionCardTitle + "_.";
+            String cancelReminder = actionCardIsCancelable ? "after checking for Sabos, " : "";
+            // The body (everything after "<rep>, ") is kept separate so the main-channel sender can
+            // omit the representation entirely under fog instead of stripping it back out afterwards.
+            String introBody = cancelReminder + "please use buttons to resolve _" + actionCardTitle + "_.";
+            String introMsg = player.getRepresentation() + ", " + introBody;
             String targetMsg =
                     " A reminder that you should declare which %s you are targeting now, before other players choose whether they will Sabo.";
 
@@ -1008,12 +1009,12 @@ public static String resolveActionCard(
 
             if ("confounding".equals(automationID)) {
                 codedButtons.add(Buttons.green("autoresolve_manual", buttonLabel));
-                sendResolveMsgToMainChannel(introMsg, codedButtons, player, game);
+                sendResolveMsgToMainChannel(introBody, codedButtons, player, game);
             }
 
             if ("confusing".equals(automationID)) {
                 codedButtons.add(Buttons.green("autoresolve_manual", buttonLabel));
-                sendResolveMsgToMainChannel(introMsg + String.format(targetMsg, "player"), codedButtons, player, game);
+                sendResolveMsgToMainChannel(introBody + String.format(targetMsg, "player"), codedButtons, player, game);
             }
 
             if ("reveal_prototype".equals(automationID)) {
@@ -1919,7 +1920,7 @@ public static String resolveActionCard(
             }
             if ("veto".equals(automationID)) {
                 codedButtons.add(Buttons.blue(player.factionButtonChecker() + "resolveVeto", "Reveal next Agenda"));
-                sendResolveMsgToMainChannel(introMsg, codedButtons, player, game);
+                sendResolveMsgToMainChannel(introBody, codedButtons, player, game);
             }
 
             if ("f_conscription".equals(automationID)) {
@@ -2220,16 +2221,17 @@ private static void serveTwinningButtons(Game game, Player discardingPlayer, Lis
         }
     }
 
-    private static void sendResolveMsgToMainChannel(String message, List<Button> buttons, Player player, Game game) {
-        MessageHelper.sendMessageToChannelWithButtons(
-                game.getMainGameChannel(), removeRepresentationIfFOW(message, player, game), buttons);
-    }
-
-    private static String removeRepresentationIfFOW(String message, Player player, Game game) {
-        return game.isFowMode()
-                ? StringUtils.capitalize(
-                        message.replace(player.getRepresentation() + ",", "").trim())
-                : message;
+    /**
+     * Post a resolve prompt to the public main game channel. {@code body} is the message with the
+     * acting player's representation NOT included; under fog the representation is omitted entirely
+     * (body capitalized), otherwise it is prepended. Building the body without the identity — rather
+     * than stripping it out after the fact — means the fog branch cannot leak the actor's identity.
+     */
+    private static void sendResolveMsgToMainChannel(String body, List<Button> buttons, Player player, Game game) {
+        String message = game.isFowMode()
+                ? org.apache.commons.lang3.StringUtils.capitalize(body)
+                : player.getRepresentation() + ", " + body;
+        MessageHelper.sendMessageToChannelWithButtons(game.getMainGameChannel(), message, buttons);
     }
 
     public static String playAC(
diff --git a/src/main/java/ti4/helpers/AgendaHelper.java b/src/main/java/ti4/helpers/AgendaHelper.java
index 248be6b0fb..6285cfc370 100644
--- a/src/main/java/ti4/helpers/AgendaHelper.java
+++ b/src/main/java/ti4/helpers/AgendaHelper.java
@@ -2835,6 +2835,13 @@ public static void listVoteCount(Game game, MessageChannel channel) {
         MessageHelper.sendMessageToChannel(channel, getVoteCountMessage(game));
     }
 
+    /** Post the vote count to the main game channel unless the game is in fog mode. */
+    public static void listVoteCountIfUnfogged(Game game) {
+        if (!game.isFowMode()) {
+            listVoteCount(game, game.getMainGameChannel());
+        }
+    }
+
     static String getVoteCountMessage(Game game) {
         List<Player> orderList = getVotingOrder(game);
         int votes = 0;
diff --git a/src/main/java/ti4/helpers/ButtonHelperAbilities.java b/src/main/java/ti4/helpers/ButtonHelperAbilities.java
index 8f33dd764b..c3ea75173d 100644
--- a/src/main/java/ti4/helpers/ButtonHelperAbilities.java
+++ b/src/main/java/ti4/helpers/ButtonHelperAbilities.java
@@ -12,7 +12,6 @@
 import java.util.concurrent.ThreadLocalRandom;
 import net.dv8tion.jda.api.components.buttons.Button;
 import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel;
-import net.dv8tion.jda.api.entities.emoji.Emoji;
 import net.dv8tion.jda.api.events.interaction.GenericInteractionCreateEvent;
 import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent;
 import org.apache.commons.lang3.function.Consumers;
@@ -499,10 +498,7 @@ public static void bindingDebtRes(Game game, Player player, ButtonInteractionEve
         String msg = player.getFactionEmojiOrColor() + " paid 1 trade good to "
                 + vaden.getFactionEmojiOrColor()
                 + "to clear 2 debt tokens from their \"Shark Loans\" pool via the **Binding Debts** ability.";
-        MessageHelper.sendMessageToChannel(player.getCorrectChannel(), msg);
-        if (game.isFowMode()) {
-            MessageHelper.sendMessageToChannel(vaden.getCorrectChannel(), msg);
-        }
+        FoWHelper.notifyPlayerAndAffectedInFog(game, player, vaden, msg);
     }
 
     private static List<String> getTrapNames() {
@@ -582,15 +578,7 @@ public static List<Button> getGraceButtons(Game game, Player edyn, int scPlayed)
     public static void setTrapStep1(Game game, Player player) {
         List<Button> buttons = new ArrayList<>();
         for (Player p2 : game.getRealPlayers()) {
-            if (game.isFowMode()) {
-                buttons.add(Buttons.gray("setTrapStep2_" + p2.getFaction(), p2.getColor()));
-            } else {
-                Button button = Buttons.gray(
-                        "setTrapStep2_" + p2.getFaction(), p2.getFactionModel().getShortName());
-                String factionEmojiString = p2.getFactionEmoji();
-                button = button.withEmoji(Emoji.fromFormatted(factionEmojiString));
-                buttons.add(button);
-            }
+            buttons.add(FoWHelper.fogSafeTargetButton("setTrapStep2_" + p2.getFaction(), "gray", p2));
         }
         MessageHelper.sendMessageToChannelWithButtons(
                 player.getCardsInfoThread(),
@@ -928,12 +916,8 @@ public static void pillage(String buttonID, ButtonInteractionEvent event, Game g
                         + pillaged.getPillageCounter() + ".";
             }
             player.setTg(player.getTg() + 1);
-            if (game.isFowMode()) {
-                MessageHelper.sendMessageToChannel(player.getCorrectChannel(), pillagerMessage);
-                MessageHelper.sendMessageToChannel(pillaged.getCorrectChannel(), pillagedMessage);
-            } else {
-                MessageHelper.sendMessageToChannel(game.getMainGameChannel(), pillagerMessage + "\n" + pillagedMessage);
-            }
+            FoWHelper.notifyActorAndAffectedElsePublic(
+                    game, player, pillagerMessage, pillaged, pillagedMessage, pillagerMessage + "\n" + pillagedMessage);
             if (RandomHelper.isOneInX(8)) {
                 int randomJoke = ThreadLocalRandom.current().nextInt(5) + 1;
                 File audioFile = ResourceHelper.getFile("voices/mentak/", "Pillage" + randomJoke + ".mp3");
diff --git a/src/main/java/ti4/helpers/ButtonHelperActionCards.java b/src/main/java/ti4/helpers/ButtonHelperActionCards.java
index cd1f4e247c..d20a591f43 100644
--- a/src/main/java/ti4/helpers/ButtonHelperActionCards.java
+++ b/src/main/java/ti4/helpers/ButtonHelperActionCards.java
@@ -248,10 +248,7 @@ public static void resolveLuckyShotRemoval(
         String msg = (damaged ? "A damaged " : "") + unitKey.unitEmoji() + " owned by "
                 + p2.getFactionEmojiOrColor() + " in tile " + tile.getRepresentationForButtons(game, player)
                 + " was removed via the _Lucky Shot_ action card. How lucky!";
-        MessageHelper.sendMessageToChannel(player.getCorrectChannel(), msg);
-        if (game.isFowMode()) {
-            MessageHelper.sendMessageToChannel(p2.getCorrectChannel(), msg);
-        }
+        FoWHelper.notifyPlayerAndAffectedInFog(game, player, p2, msg);
         ButtonHelper.deleteMessage(event);
     }
 
@@ -535,15 +532,13 @@ public static void resolveForwardSupplyBaseStep2(
                     hacan.getCorrectChannel(), "Could not resolve target player, please resolve manually.");
             return;
         }
-        MessageHelper.sendMessageToChannel(
-                player.getCorrectChannel(),
+        FoWHelper.notifyPlayerAndAffectedInFog(
+                game,
+                player,
                 player.getRepresentationNoPing() + " gained 1 trade good due to _Forward Supply Base_ "
-                        + player.gainTG(1) + ".");
-        if (game.isFowMode()) {
-            MessageHelper.sendMessageToChannel(
-                    hacan.getCorrectChannel(),
-                    player.getFactionEmojiOrColor() + " gained 1 trade good due to _Forward Supply Base_.");
-        }
+                        + player.gainTG(1) + ".",
+                hacan,
+                player.getFactionEmojiOrColor() + " gained 1 trade good due to _Forward Supply Base_.");
         ButtonHelperAbilities.pillageCheck(player, game);
         ButtonHelperAgents.resolveArtunoCheck(player, 1);
         ButtonHelper.deleteMessage(event);
@@ -771,12 +766,7 @@ public static void resolveForwardSupplyBaseStep1(Player player, Game game, Butto
             if (p2 == player) {
                 continue;
             }
-            if (game.isFowMode()) {
-                buttons.add(Buttons.gray("forwardSupplyBaseStep2_" + p2.getFaction(), p2.getColor()));
-            } else {
-                Button button = Buttons.gray("forwardSupplyBaseStep2_" + p2.getFaction(), null, p2.getFactionEmoji());
-                buttons.add(button);
-            }
+            buttons.add(FoWHelper.fogSafeTargetButton("forwardSupplyBaseStep2_" + p2.getFaction(), "gray", p2));
         }
         ButtonHelper.deleteMessage(event);
         MessageHelper.sendMessageToChannelWithButtons(
@@ -800,16 +790,7 @@ public static void resolveReparationsStep1(Player player, Game game, ButtonInter
             if (p2 == player) {
                 continue;
             }
-            if (game.isFowMode()) {
-                buttons.add(Buttons.gray("reparationsStep2_" + p2.getFaction(), p2.getColor()));
-            } else {
-                Button button = Buttons.gray(
-                        "reparationsStep2_" + p2.getFaction(),
-                        p2.getFactionModel().getShortName());
-                String factionEmojiString = p2.getFactionEmoji();
-                button = button.withEmoji(Emoji.fromFormatted(factionEmojiString));
-                buttons.add(button);
-            }
+            buttons.add(FoWHelper.fogSafeTargetButton("reparationsStep2_" + p2.getFaction(), "gray", p2));
         }
         ButtonHelper.deleteMessage(event);
         MessageHelper.sendMessageToChannelWithButtons(
@@ -873,16 +854,7 @@ public static void resolveDiplomaticPressureStep1(Player player, Game game, Butt
             if (p2 == player) {
                 continue;
             }
-            if (game.isFowMode()) {
-                buttons.add(Buttons.gray("diplomaticPressureStep2_" + p2.getFaction(), p2.getColor()));
-            } else {
-                Button button = Buttons.gray(
-                        "diplomaticPressureStep2_" + p2.getFaction(),
-                        p2.getFactionModel().getShortName());
-                String factionEmojiString = p2.getFactionEmoji();
-                button = button.withEmoji(Emoji.fromFormatted(factionEmojiString));
-                buttons.add(button);
-            }
+            buttons.add(FoWHelper.fogSafeTargetButton("diplomaticPressureStep2_" + p2.getFaction(), "gray", p2));
         }
         ButtonHelper.deleteMessage(event);
         MessageHelper.sendMessageToChannelWithButtons(
@@ -899,16 +871,7 @@ public static void resolveReactorMeltdownStep1(Player player, Game game, ButtonI
             if (p2 == player) {
                 continue;
             }
-            if (game.isFowMode()) {
-                buttons.add(Buttons.gray("reactorMeltdownStep2_" + p2.getFaction(), p2.getColor()));
-            } else {
-                Button button = Buttons.gray(
-                        "reactorMeltdownStep2_" + p2.getFaction(),
-                        p2.getFactionModel().getShortName());
-                String factionEmojiString = p2.getFactionEmoji();
-                button = button.withEmoji(Emoji.fromFormatted(factionEmojiString));
-                buttons.add(button);
-            }
+            buttons.add(FoWHelper.fogSafeTargetButton("reactorMeltdownStep2_" + p2.getFaction(), "gray", p2));
         }
         ButtonHelper.deleteMessage(event);
         MessageHelper.sendMessageToChannelWithButtons(
@@ -1012,15 +975,7 @@ public static void resolveAssRepsStep1(Player player, Game game, ButtonInteracti
             if (p2 == player) {
                 continue;
             }
-            if (game.isFowMode()) {
-                buttons.add(Buttons.gray("assRepsStep2_" + p2.getFaction(), p2.getColor()));
-            } else {
-                Button button = Buttons.gray(
-                        "assRepsStep2_" + p2.getFaction(), p2.getFactionModel().getShortName());
-                String factionEmojiString = p2.getFactionEmoji();
-                button = button.withEmoji(Emoji.fromFormatted(factionEmojiString));
-                buttons.add(button);
-            }
+            buttons.add(FoWHelper.fogSafeTargetButton("assRepsStep2_" + p2.getFaction(), "gray", p2));
         }
         ButtonHelper.deleteMessage(event);
         MessageHelper.sendMessageToChannelWithButtons(
@@ -1037,16 +992,7 @@ public static void resolveSignalJammingStep1(
             if (p2 == player && !game.isTwilightsFallMode()) {
                 continue;
             }
-            if (game.isFowMode()) {
-                buttons.add(Buttons.gray("signalJammingStep2_" + p2.getFaction(), p2.getColor()));
-            } else {
-                Button button = Buttons.gray(
-                        "signalJammingStep2_" + p2.getFaction(),
-                        p2.getFactionModel().getShortName());
-                String factionEmojiString = p2.getFactionEmoji();
-                button = button.withEmoji(Emoji.fromFormatted(factionEmojiString));
-                buttons.add(button);
-            }
+            buttons.add(FoWHelper.fogSafeTargetButton("signalJammingStep2_" + p2.getFaction(), "gray", p2));
         }
         ButtonHelper.deleteMessage(event);
         MessageHelper.sendMessageToChannelWithButtons(
@@ -1263,16 +1209,7 @@ public static void resolveInfiltrateStep1(Player player, Game game, ButtonIntera
             if (p2 == player) {
                 continue;
             }
-            if (game.isFowMode()) {
-                buttons.add(Buttons.gray("infiltrateStep2_" + p2.getFaction(), p2.getColor()));
-            } else {
-                Button button = Buttons.gray(
-                        "infiltrateStep2_" + p2.getFaction(),
-                        p2.getFactionModel().getShortName());
-                String factionEmojiString = p2.getFactionEmoji();
-                button = button.withEmoji(Emoji.fromFormatted(factionEmojiString));
-                buttons.add(button);
-            }
+            buttons.add(FoWHelper.fogSafeTargetButton("infiltrateStep2_" + p2.getFaction(), "gray", p2));
         }
         ButtonHelper.deleteMessage(event);
         MessageHelper.sendMessageToChannelWithButtons(
@@ -1289,15 +1226,7 @@ public static void resolveSpyStep1(Player player, Game game, ButtonInteractionEv
             if (p2 == player) {
                 continue;
             }
-            if (game.isFowMode()) {
-                buttons.add(Buttons.gray("spyStep2_" + p2.getFaction(), p2.getColor()));
-            } else {
-                Button button = Buttons.gray(
-                        "spyStep2_" + p2.getFaction(), p2.getFactionModel().getShortName());
-                String factionEmojiString = p2.getFactionEmoji();
-                button = button.withEmoji(Emoji.fromFormatted(factionEmojiString));
-                buttons.add(button);
-            }
+            buttons.add(FoWHelper.fogSafeTargetButton("spyStep2_" + p2.getFaction(), "gray", p2));
         }
         ButtonHelper.deleteMessage(event);
         MessageHelper.sendMessageToChannelWithButtons(
@@ -1313,16 +1242,7 @@ public static void resolvepPsionicHammerStep1(Player player, Game game, ButtonIn
         for (Player p2 : AgendaHelper.getPlayersWithMostPoints(game)) {
             if (p2 == player) continue;
 
-            if (game.isFowMode()) {
-                buttons.add(Buttons.gray("psionicHammerStep2_" + p2.getFaction(), p2.getColorIfCanSeeStats(player)));
-            } else {
-                Button button = Buttons.gray(
-                        "psionicHammerStep2_" + p2.getFaction(),
-                        p2.getFactionModel().getShortName());
-                String factionEmojiString = p2.getFactionEmoji();
-                button = button.withEmoji(Emoji.fromFormatted(factionEmojiString));
-                buttons.add(button);
-            }
+            buttons.add(FoWHelper.fogSafeTargetButton("psionicHammerStep2_" + p2.getFaction(), "gray", p2, player));
         }
         ButtonHelper.deleteMessage(event);
 
@@ -1429,15 +1349,7 @@ public static void resolveInsubStep1(Player player, Game game, ButtonInteraction
             if (p2 == player || p2.getTacticalCC() < 1) {
                 continue;
             }
-            if (game.isFowMode()) {
-                buttons.add(Buttons.gray("insubStep2_" + p2.getFaction(), p2.getColor()));
-            } else {
-                Button button = Buttons.gray(
-                        "insubStep2_" + p2.getFaction(), p2.getFactionModel().getShortName());
-                String factionEmojiString = p2.getFactionEmoji();
-                button = button.withEmoji(Emoji.fromFormatted(factionEmojiString));
-                buttons.add(button);
-            }
+            buttons.add(FoWHelper.fogSafeTargetButton("insubStep2_" + p2.getFaction(), "gray", p2));
         }
         ButtonHelper.deleteMessage(event);
         MessageHelper.sendMessageToChannelWithButtons(
@@ -1482,15 +1394,7 @@ public static void resolveABSStep1(Player player, Game game, ButtonInteractionEv
             if (p2 == player) {
                 continue;
             }
-            if (game.isFowMode()) {
-                buttons.add(Buttons.gray("absStep2_" + p2.getFaction(), p2.getColor()));
-            } else {
-                Button button = Buttons.gray(
-                        "absStep2_" + p2.getFaction(), p2.getFactionModel().getShortName());
-                String factionEmojiString = p2.getFactionEmoji();
-                button = button.withEmoji(Emoji.fromFormatted(factionEmojiString));
-                buttons.add(button);
-            }
+            buttons.add(FoWHelper.fogSafeTargetButton("absStep2_" + p2.getFaction(), "gray", p2));
         }
         ButtonHelper.deleteMessage(event);
         MessageHelper.sendMessageToChannelWithButtons(
@@ -1507,15 +1411,7 @@ public static void resolveSalvageStep1(Player player, Game game, ButtonInteracti
             if (p2 == player) {
                 continue;
             }
-            if (game.isFowMode()) {
-                buttons.add(Buttons.gray("salvageStep2_" + p2.getFaction(), p2.getColor()));
-            } else {
-                Button button = Buttons.gray(
-                        "salvageStep2_" + p2.getFaction(), p2.getFactionModel().getShortName());
-                String factionEmojiString = p2.getFactionEmoji();
-                button = button.withEmoji(Emoji.fromFormatted(factionEmojiString));
-                buttons.add(button);
-            }
+            buttons.add(FoWHelper.fogSafeTargetButton("salvageStep2_" + p2.getFaction(), "gray", p2));
         }
         ButtonHelper.deleteMessage(event);
         MessageHelper.sendMessageToChannelWithButtons(
@@ -1596,22 +1492,16 @@ public static void resolveSalvageStep2(Player player, Game game, ButtonInteracti
                     player.getRepresentationUnfogged() + " attempted to steal commodities from "
                             + p2.getFactionEmojiOrColor() + ", but fortuitously, it turns out they didn't have any.");
         } else {
-            if (game.isFowMode()) {
-                MessageHelper.sendMessageToChannel(
-                        player.getCorrectChannel(),
-                        player.getRepresentationUnfogged() + " has stolen " + comm + " commodit"
-                                + (comm == 1 ? "y" : "ies") + " from " + p2.getFactionEmojiOrColor()
-                                + " with _Salvage_.");
-                MessageHelper.sendMessageToChannel(
-                        p2.getCorrectChannel(),
-                        p2.getRepresentationUnfogged() + ", your commodities were somehow stolen with _Salvage_.");
-            } else {
-                MessageHelper.sendMessageToChannel(
-                        player.getCorrectChannel(),
-                        player.getRepresentationUnfogged() + " has somehow managed to use _Salvage_ to steal " + comm
-                                + " commodit" + (comm == 1 ? "y" : "ies") + " from " + p2.getRepresentationUnfogged()
-                                + ".");
-            }
+            FoWHelper.notifyActorAndAffectedElsePublic(
+                    game,
+                    player,
+                    player.getRepresentationUnfogged() + " has stolen " + comm + " commodit" + (comm == 1 ? "y" : "ies")
+                            + " from " + p2.getFactionEmojiOrColor() + " with _Salvage_.",
+                    p2,
+                    p2.getRepresentationUnfogged() + ", your commodities were somehow stolen with _Salvage_.",
+                    player.getRepresentationUnfogged() + " has somehow managed to use _Salvage_ to steal " + comm
+                            + " commodit" + (comm == 1 ? "y" : "ies") + " from " + p2.getRepresentationUnfogged()
+                            + ".");
             DisasterWatchHelper.sendMessageInDisasterWatch(
                     game,
                     player.getRepresentationUnfogged() + " has stolen " + comm + " commodit" + (comm == 1 ? "y" : "ies")
@@ -1863,21 +1753,16 @@ public static void resolveSignalJammingStep4(
         Tile tile = game.getTileByPosition(pos);
         CommandCounterHelper.addCC(event, p2, tile);
         ButtonHelper.deleteMessage(event);
-        if (game.isFowMode()) {
-            MessageHelper.sendMessageToChannel(
-                    player.getCorrectChannel(),
-                    player.getRepresentationUnfogged() + ", you've _Signal Jam_'d the system: "
-                            + tile.getRepresentationForButtons(game, player) + ".");
-            MessageHelper.sendMessageToChannel(
-                    p2.getCorrectChannel(),
-                    p2.getRepresentationUnfogged() + ", you've been _Signal Jam_'d in system: "
-                            + tile.getRepresentationForButtons(game, p2) + ".");
-        } else {
-            MessageHelper.sendMessageToChannel(
-                    player.getCorrectChannel(),
-                    player.getRepresentationUnfogged() + " has _Signal Jam_'d " + p2.getRepresentationUnfogged()
-                            + " in tile " + tile.getRepresentationForButtons(game, p2) + ".");
-        }
+        FoWHelper.notifyActorAndAffectedElsePublic(
+                game,
+                player,
+                player.getRepresentationUnfogged() + ", you've _Signal Jam_'d the system: "
+                        + tile.getRepresentationForButtons(game, player) + ".",
+                p2,
+                p2.getRepresentationUnfogged() + ", you've been _Signal Jam_'d in system: "
+                        + tile.getRepresentationForButtons(game, p2) + ".",
+                player.getRepresentationUnfogged() + " has _Signal Jam_'d " + p2.getRepresentationUnfogged()
+                        + " in tile " + tile.getRepresentationForButtons(game, p2) + ".");
     }
 
     @ButtonHandler("reactorMeltdownStep2_")
@@ -1923,20 +1808,15 @@ public static void resolveReactorMeltdownStep3(
             unitHolderName = "";
         }
         RemoveUnitService.removeUnits(event, tile, game, p2.getColor(), "sd " + unitHolderName);
-        if (game.isFowMode()) {
-            MessageHelper.sendMessageToChannel(
-                    player.getCorrectChannel(),
-                    player.getRepresentationUnfogged() + ", you melted the space dock in " + tile.getRepresentation());
-            MessageHelper.sendMessageToChannel(
-                    p2.getCorrectChannel(),
-                    p2.getRepresentationUnfogged() + ", your space dock in " + tile.getRepresentation()
-                            + " has been melted.");
-        } else {
-            MessageHelper.sendMessageToChannel(
-                    player.getCorrectChannel(),
-                    player.getRepresentationUnfogged() + " has melted the space dock that used to belong to "
-                            + p2.getRepresentationUnfogged() + " in " + tile.getRepresentation() + ".");
-        }
+        FoWHelper.notifyActorAndAffectedElsePublic(
+                game,
+                player,
+                player.getRepresentationUnfogged() + ", you melted the space dock in " + tile.getRepresentation(),
+                p2,
+                p2.getRepresentationUnfogged() + ", your space dock in " + tile.getRepresentation()
+                        + " has been melted.",
+                player.getRepresentationUnfogged() + " has melted the space dock that used to belong to "
+                        + p2.getRepresentationUnfogged() + " in " + tile.getRepresentation() + ".");
         ButtonHelper.checkFleetAndCapacity(p2, game, tile);
         if (p2.hasAbility("data_recovery")) {
             ButtonHelperAbilities.dataRecovery(p2, game, event, "dataRecovery_" + player.getColor());
@@ -2455,23 +2335,18 @@ public static void resolveUnstableStep3(Player player, Game game, ButtonInteract
                 amountToKill,
                 uH,
                 false);
-        if (game.isFowMode()) {
-            MessageHelper.sendMessageToChannel(
-                    player.getCorrectChannel(),
-                    player.getRepresentationUnfogged() + " you exhausted " + planetRep + " and killed " + amountToKill
-                            + " infantry there.");
-            MessageHelper.sendMessageToChannel(
-                    p2.getCorrectChannel(),
-                    p2.getRepresentationUnfogged() + ", your planet " + planetRep + " was exhausted and " + amountToKill
-                            + " infantry were destroyed.");
-        } else {
-            MessageHelper.sendMessageToChannel(
-                    player.getCorrectChannel(),
-                    player.getRepresentationUnfogged() + " has destabilised " + planetRep + ", "
-                            + (didExhaust ? "exhausting it" : "which was already exhausted") + ", and "
-                            + (amountToKill == 0 ? "did not kill any" : "killed " + amountToKill)
-                            + " infantry belonging to " + p2.getRepresentationUnfogged() + ".");
-        }
+        FoWHelper.notifyActorAndAffectedElsePublic(
+                game,
+                player,
+                player.getRepresentationUnfogged() + " you exhausted " + planetRep + " and killed " + amountToKill
+                        + " infantry there.",
+                p2,
+                p2.getRepresentationUnfogged() + ", your planet " + planetRep + " was exhausted and " + amountToKill
+                        + " infantry were destroyed.",
+                player.getRepresentationUnfogged() + " has destabilised " + planetRep + ", "
+                        + (didExhaust ? "exhausting it" : "which was already exhausted") + ", and "
+                        + (amountToKill == 0 ? "did not kill any" : "killed " + amountToKill)
+                        + " infantry belonging to " + p2.getRepresentationUnfogged() + ".");
     }
 
     @ButtonHandler("seizeArtifactStep3_")
@@ -2482,19 +2357,14 @@ public static void resolveSeizeArtifactStep3(
         ButtonHelper.deleteMessage(event);
         p2.removeFragment(fragID);
         player.addFragment(fragID);
-        if (game.isFowMode()) {
-            MessageHelper.sendMessageToChannel(
-                    player.getCorrectChannel(),
-                    player.getRepresentationUnfogged() + ", you gained the fragment " + fragID + ".");
-            MessageHelper.sendMessageToChannel(
-                    p2.getCorrectChannel(),
-                    p2.getRepresentationUnfogged() + ", your fragment " + fragID + " was seized.");
-        } else {
-            MessageHelper.sendMessageToChannel(
-                    player.getCorrectChannel(),
-                    player.getRepresentationUnfogged() + " swiped the fragment " + fragID + " from the collection of "
-                            + p2.getRepresentationUnfogged() + ".");
-        }
+        FoWHelper.notifyActorAndAffectedElsePublic(
+                game,
+                player,
+                player.getRepresentationUnfogged() + ", you gained the fragment " + fragID + ".",
+                p2,
+                p2.getRepresentationUnfogged() + ", your fragment " + fragID + " was seized.",
+                player.getRepresentationUnfogged() + " swiped the fragment " + fragID + " from the collection of "
+                        + p2.getRepresentationUnfogged() + ".");
     }
 
     @ButtonHandler("uprisingStep3_")
@@ -2513,18 +2383,14 @@ public static void resolveUprisingStep3(Player player, Game game, ButtonInteract
                         + "->" + player.getTg() + ").");
         ButtonHelperAbilities.pillageCheck(player, game);
         ButtonHelperAgents.resolveArtunoCheck(player, resValue);
-        if (game.isFowMode()) {
-            MessageHelper.sendMessageToChannel(
-                    player.getCorrectChannel(), player.getRepresentationUnfogged() + ", you exhausted " + planetRep);
-            MessageHelper.sendMessageToChannel(
-                    p2.getCorrectChannel(),
-                    p2.getRepresentationUnfogged() + ", your planet " + planetRep + " was exhausted.");
-        } else {
-            MessageHelper.sendMessageToChannel(
-                    player.getCorrectChannel(),
-                    player.getRepresentationUnfogged() + " instigated an _Uprising_ on " + planetRep
-                            + ", exhausting it, much to the dismay of " + p2.getRepresentationUnfogged() + ".");
-        }
+        FoWHelper.notifyActorAndAffectedElsePublic(
+                game,
+                player,
+                player.getRepresentationUnfogged() + ", you exhausted " + planetRep,
+                p2,
+                p2.getRepresentationUnfogged() + ", your planet " + planetRep + " was exhausted.",
+                player.getRepresentationUnfogged() + " instigated an _Uprising_ on " + planetRep
+                        + ", exhausting it, much to the dismay of " + p2.getRepresentationUnfogged() + ".");
     }
 
     @ButtonHandler("plagueStep3_")
@@ -2577,22 +2443,17 @@ public static void resolvePlagueStep3(Player player, Game game, ButtonInteractio
                 adjective = " typical";
             }
         }
-        if (game.isFowMode()) {
-            MessageHelper.sendMessageToChannel(
-                    player.getCorrectChannel(),
-                    player.getRepresentationUnfogged() + ", you _Plague_'d " + planetRep + " and got "
-                            + StringHelper.pluralize(hits, "hit"));
-            MessageHelper.sendMessageToChannel(
-                    p2.getCorrectChannel(),
-                    p2.getRepresentationUnfogged() + ", your planet " + planetRep + " suffered a" + adjective
-                            + " _Plague_ and you lost " + hits + " infantry.");
-        } else {
-            MessageHelper.sendMessageToChannel(
-                    player.getCorrectChannel(),
-                    player.getRepresentationUnfogged() + " has released a _Plague_ upon " + planetRep + ".\n"
-                            + p2.getRepresentationUnfogged() + ", your planet " + planetRep + " suffered a"
-                            + adjective + " _Plague_ and you lost " + hits + " infantry.");
-        }
+        FoWHelper.notifyActorAndAffectedElsePublic(
+                game,
+                player,
+                player.getRepresentationUnfogged() + ", you _Plague_'d " + planetRep + " and got "
+                        + StringHelper.pluralize(hits, "hit"),
+                p2,
+                p2.getRepresentationUnfogged() + ", your planet " + planetRep + " suffered a" + adjective
+                        + " _Plague_ and you lost " + hits + " infantry.",
+                player.getRepresentationUnfogged() + " has released a _Plague_ upon " + planetRep + ".\n"
+                        + p2.getRepresentationUnfogged() + ", your planet " + planetRep + " suffered a"
+                        + adjective + " _Plague_ and you lost " + hits + " infantry.");
         DestroyUnitService.destroyUnit(event, game.getTileFromPlanet(planet), game, key, hits, uH, false);
     }
 
@@ -2668,24 +2529,19 @@ public static void resolveCrippleStep3(Player player, Game game, ButtonInteracti
                 amount += amount2;
             }
         }
-        if (game.isFowMode()) {
-            MessageHelper.sendMessageToChannel(
-                    player.getCorrectChannel(),
-                    player.getRepresentationUnfogged() + ", you crippled " + planetRep
-                            + (amount > 0 ? " and killed " + amount + " PDS." : ". There were no PDS to kill."));
-            MessageHelper.sendMessageToChannel(
-                    p2.getCorrectChannel(),
-                    p2.getRepresentationUnfogged() + ", your planet " + planetRep + " was crippled"
-                            + (amount > 0 ? " killing " + amount + " of your PDS." : ". There were no PDS to kill."));
-        } else {
-            MessageHelper.sendMessageToChannel(
-                    player.getCorrectChannel(),
-                    player.getRepresentationUnfogged() + ", you crippled " + planetRep + " owned by "
-                            + p2.getRepresentationUnfogged()
-                            + (amount > 0
-                                    ? " and killed " + amount + " PDS."
-                                    : ". There were no " + p2.getRepresentationUnfogged() + " PDS to kill."));
-        }
+        FoWHelper.notifyActorAndAffectedElsePublic(
+                game,
+                player,
+                player.getRepresentationUnfogged() + ", you crippled " + planetRep
+                        + (amount > 0 ? " and killed " + amount + " PDS." : ". There were no PDS to kill."),
+                p2,
+                p2.getRepresentationUnfogged() + ", your planet " + planetRep + " was crippled"
+                        + (amount > 0 ? " killing " + amount + " of your PDS." : ". There were no PDS to kill."),
+                player.getRepresentationUnfogged() + ", you crippled " + planetRep + " owned by "
+                        + p2.getRepresentationUnfogged()
+                        + (amount > 0
+                                ? " and killed " + amount + " PDS."
+                                : ". There were no " + p2.getRepresentationUnfogged() + " PDS to kill."));
     }
 
     @ButtonHandler("infiltrateStep3_")
@@ -2703,19 +2559,14 @@ public static void resolveReparationsStep3(
         String planet = buttonID.split("_")[2];
         String planetRep = Helper.getPlanetRepresentation(planet, game);
         p2.exhaustPlanet(planet);
-        if (game.isFowMode()) {
-            MessageHelper.sendMessageToChannel(
-                    player.getCorrectChannel(),
-                    player.getRepresentationUnfogged() + ", you exhausted " + planetRep + ".");
-            MessageHelper.sendMessageToChannel(
-                    p2.getCorrectChannel(),
-                    p2.getRepresentationUnfogged() + ", your planet " + planetRep + " was exhausted.");
-        } else {
-            MessageHelper.sendMessageToChannel(
-                    player.getCorrectChannel(),
-                    player.getRepresentationUnfogged() + ", you exhausted " + planetRep + " belonging to "
-                            + p2.getRepresentationUnfogged() + ".");
-        }
+        FoWHelper.notifyActorAndAffectedElsePublic(
+                game,
+                player,
+                player.getRepresentationUnfogged() + ", you exhausted " + planetRep + ".",
+                p2,
+                p2.getRepresentationUnfogged() + ", your planet " + planetRep + " was exhausted.",
+                player.getRepresentationUnfogged() + ", you exhausted " + planetRep + " belonging to "
+                        + p2.getRepresentationUnfogged() + ".");
         ButtonHelper.deleteMessage(event);
     }
 
diff --git a/src/main/java/ti4/helpers/ButtonHelperAgents.java b/src/main/java/ti4/helpers/ButtonHelperAgents.java
index 47e0ee284c..d3c78478e1 100644
--- a/src/main/java/ti4/helpers/ButtonHelperAgents.java
+++ b/src/main/java/ti4/helpers/ButtonHelperAgents.java
@@ -1781,7 +1781,7 @@ public static void resolveLanefirAgent(Player player, Game game, ButtonInteracti
                     MessageHelper.sendMessageToChannel(
                             event.getChannel(),
                             "Planet has been readied because of Quaxdol Junitas, the Florzen Commander.");
-                    if (!game.isFowMode()) AgendaHelper.listVoteCount(game, game.getMainGameChannel());
+                    AgendaHelper.listVoteCountIfUnfogged(game);
                 }
                 if (game.playerHasLeaderUnlockedOrAlliance(player, "lanefircommander")) {
                     UnitKey infKey = Mapper.getUnitKey("gf", player.getColor());
@@ -1827,7 +1827,7 @@ public static void resolveLanefirAgent(Player player, Game game, ButtonInteracti
                     MessageHelper.sendMessageToChannel(
                             event.getChannel(),
                             "Planet has been readied because of Quaxdol Junitas, the Florzen Commander.");
-                    if (!game.isFowMode()) AgendaHelper.listVoteCount(game, game.getMainGameChannel());
+                    AgendaHelper.listVoteCountIfUnfogged(game);
                 }
                 if (game.playerHasLeaderUnlockedOrAlliance(player, "lanefircommander")) {
                     UnitKey infKey = Mapper.getUnitKey("gf", player.getColor());
@@ -2199,11 +2199,8 @@ private static void resolveVadenAgentStep2(
                 + "Yudri Sukhov, the Vaden" + (player.hasUnexhaustedLeader("yssarilagent") ? "/Yssaril" : "")
                 + " agent.";
 
-        MessageHelper.sendMessageToChannel(player.getCorrectChannel(), msg);
-        if (game.isFowMode() && vaden != player) {
-            msg = player.getFactionEmojiOrColor() + " has finished resolving";
-            MessageHelper.sendMessageToChannel(vaden.getCorrectChannel(), msg);
-        }
+        FoWHelper.notifyPlayerAndAffectedInFog(
+                game, player, msg, vaden, player.getFactionEmojiOrColor() + " has finished resolving");
     }
 
     private static void resolveKortaliAgentStep2(Player bentor, Game game, String buttonID) {
@@ -2224,10 +2221,7 @@ private static void resolveKortaliAgentStep2(Player bentor, Game game, String bu
                 + (bentor.hasUnexhaustedLeader("yssarilagent") ? "Clever Clever " : "")
                 + "Queen Lucreia, the Kortali" + (player.hasUnexhaustedLeader("yssarilagent") ? "/Yssaril" : "")
                 + " agent.";
-        MessageHelper.sendMessageToChannel(player.getCorrectChannel(), msg);
-        if (game.isFowMode() && bentor != player) {
-            MessageHelper.sendMessageToChannel(bentor.getCorrectChannel(), msg);
-        }
+        FoWHelper.notifyPlayerAndAffectedInFog(game, player, bentor, msg);
     }
 
     private static void resolveZealotsAgentStep2(Player zealots, Game game, String buttonID) {
@@ -2290,10 +2284,7 @@ private static void resolveNokarAgentStep2(
                 + "Sal Sparrow, the Nokar" + (player.hasUnexhaustedLeader("yssarilagent") ? "/Yssaril" : "")
                 + " agent. "
                 + "A transaction may be done with transaction buttons.";
-        MessageHelper.sendMessageToChannel(player.getCorrectChannel(), msg);
-        if (game.isFowMode() && bentor != player) {
-            MessageHelper.sendMessageToChannel(bentor.getCorrectChannel(), msg);
-        }
+        FoWHelper.notifyPlayerAndAffectedInFog(game, player, bentor, msg);
     }
 
     private static void resolveZelianAgentStep2(
@@ -2321,10 +2312,7 @@ private static void resolveZelianAgentStep2(
                 + tile.getRepresentationForButtons(game, player)
                 + " due to " + (bentor.hasUnexhaustedLeader("yssarilagent") ? "Clever Clever " : "")
                 + "Zelian A, the Zelian" + (bentor.hasUnexhaustedLeader("yssarilagent") ? "/Yssaril" : "") + " agent.";
-        MessageHelper.sendMessageToChannel(player.getCorrectChannel(), msg);
-        if (game.isFowMode() && bentor != player) {
-            MessageHelper.sendMessageToChannel(bentor.getCorrectChannel(), msg);
-        }
+        FoWHelper.notifyPlayerAndAffectedInFog(game, player, bentor, msg);
 
         if (event instanceof ButtonInteractionEvent event2) {
             if (event2.getButton().getLabel().contains("Yourself")) {
@@ -2350,10 +2338,7 @@ private static void resolveKyroAgentStep2(Player kyro, Game game, ButtonInteract
         player.setCommodities(player.getCommodities() + player.getCommoditiesTotal());
         ButtonHelper.resolveMinisterOfCommerceCheck(game, player, event);
         cabalAgentInitiation(game, player);
-        MessageHelper.sendMessageToChannel(player.getCorrectChannel(), msg);
-        if (game.isFowMode() && kyro != player) {
-            MessageHelper.sendMessageToChannel(kyro.getCorrectChannel(), msg);
-        }
+        FoWHelper.notifyPlayerAndAffectedInFog(game, player, kyro, msg);
 
         int infAmount = player.getCommoditiesTotal() - 1;
         List<Button> buttons = new ArrayList<>(
@@ -2463,11 +2448,8 @@ private static void resolveBentorAgentStep2(
                 + "C.O.O. Mgur, the Bentor" + (bentor.hasUnexhaustedLeader("yssarilagent") ? "/Yssaril" : "")
                 + " agent.";
 
-        MessageHelper.sendMessageToChannel(player.getCorrectChannel(), msg);
-        if (game.isFowMode() && bentor != player) {
-            msg = player.getRepresentation() + " has finished resolving.";
-            MessageHelper.sendMessageToChannel(bentor.getCorrectChannel(), msg);
-        }
+        FoWHelper.notifyPlayerAndAffectedInFog(
+                game, player, msg, bentor, player.getRepresentation() + " has finished resolving.");
     }
 
     private static void fogAllianceAgentStep1(Game game, Player player) {
diff --git a/src/main/java/ti4/helpers/ButtonHelperFactionSpecific.java b/src/main/java/ti4/helpers/ButtonHelperFactionSpecific.java
index 182d18df92..be69e982b6 100644
--- a/src/main/java/ti4/helpers/ButtonHelperFactionSpecific.java
+++ b/src/main/java/ti4/helpers/ButtonHelperFactionSpecific.java
@@ -815,16 +815,8 @@ public static void resolveEdynAgendaStuffStep2(
             if (p2 == player) {
                 continue;
             }
-            if (game.isFowMode()) {
-                buttons.add(Buttons.gray("edynAgendaStuffStep3_" + p2.getFaction() + "_" + pos, p2.getColor()));
-            } else {
-                Button button = Buttons.gray(
-                        "edynAgendaStuffStep3_" + p2.getFaction() + "_" + pos,
-                        p2.getFactionModel().getShortName());
-                String factionEmojiString = p2.getFactionEmoji();
-                button = button.withEmoji(Emoji.fromFormatted(factionEmojiString));
-                buttons.add(button);
-            }
+            buttons.add(
+                    FoWHelper.fogSafeTargetButton("edynAgendaStuffStep3_" + p2.getFaction() + "_" + pos, "gray", p2));
         }
         event.getMessage().delete().queue(Consumers.nop(), BotLogger::catchRestError);
         MessageHelper.sendMessageToChannelWithButtons(
@@ -1239,21 +1231,16 @@ public static void resolveStymiePlayerStep2(
         Tile tile = game.getTileByPosition(pos);
         CommandCounterHelper.addCC(event, p2, tile);
         event.getMessage().delete().queue(Consumers.nop(), BotLogger::catchRestError);
-        if (game.isFowMode()) {
-            MessageHelper.sendMessageToChannel(
-                    player.getCorrectChannel(),
-                    player.getRepresentationUnfogged() + ", you _Stymie_'d the system: "
-                            + tile.getRepresentationForButtons(game, player) + ".");
-            MessageHelper.sendMessageToChannel(
-                    p2.getCorrectChannel(),
-                    p2.getRepresentationUnfogged() + ", you were _Stymie_'d in system: "
-                            + tile.getRepresentationForButtons(game, p2) + ".");
-        } else {
-            MessageHelper.sendMessageToChannel(
-                    player.getCorrectChannel(),
-                    player.getRepresentationUnfogged() + " has _Stymie_'d " + p2.getRepresentationUnfogged()
-                            + " in the system: " + tile.getRepresentationForButtons(game, player) + ".");
-        }
+        FoWHelper.notifyActorAndAffectedElsePublic(
+                game,
+                player,
+                player.getRepresentationUnfogged() + ", you _Stymie_'d the system: "
+                        + tile.getRepresentationForButtons(game, player) + ".",
+                p2,
+                p2.getRepresentationUnfogged() + ", you were _Stymie_'d in system: "
+                        + tile.getRepresentationForButtons(game, p2) + ".",
+                player.getRepresentationUnfogged() + " has _Stymie_'d " + p2.getRepresentationUnfogged()
+                        + " in the system: " + tile.getRepresentationForButtons(game, player) + ".");
     }
 
     public static void offerASNButtonsStep1(Game game, Player player, String warfareOrTactical) {
@@ -1758,10 +1745,7 @@ public static void resolveProductionBiomesStep2(
         player.setTg(oldTg + 2);
         String message = player.getRepresentation() + " gained 2 trade goods due to " + FactionEmojis.Hacan
                 + "_Production Biomes_ (" + oldTg + "->" + player.getTg() + ").";
-        MessageHelper.sendMessageToChannel(player.getCorrectChannel(), message);
-        if (game.isFowMode()) {
-            MessageHelper.sendMessageToChannel(hacan.getCorrectChannel(), message);
-        }
+        FoWHelper.notifyPlayerAndAffectedInFog(game, player, hacan, message);
         ButtonHelperAbilities.pillageCheck(player, game);
         ButtonHelperAgents.resolveArtunoCheck(player, 2);
         event.getMessage().delete().queue(Consumers.nop(), BotLogger::catchRestError);
@@ -1792,16 +1776,7 @@ public static void resolveProductionBiomesStep1(Player hacan, Game game, Generic
             if (p2 == hacan) {
                 continue;
             }
-            if (game.isFowMode()) {
-                buttons.add(Buttons.gray("productionBiomes_" + p2.getFaction(), p2.getColor()));
-            } else {
-                Button button = Buttons.gray(
-                        "productionBiomes_" + p2.getFaction(),
-                        p2.getFactionModel().getShortName());
-                String factionEmojiString = p2.getFactionEmoji();
-                button = button.withEmoji(Emoji.fromFormatted(factionEmojiString));
-                buttons.add(button);
-            }
+            buttons.add(FoWHelper.fogSafeTargetButton("productionBiomes_" + p2.getFaction(), "gray", p2));
         }
         MessageHelper.sendMessageToChannelWithButtons(
                 hacan.getCorrectChannel(),
@@ -1843,33 +1818,15 @@ public static List<Button> getSwapSCButtons(Game game, String type, Player hacan
                 continue;
             }
             if (p2.getSCs().size() > 1) {
-                if (game.isFowMode()) {
-                    buttons.add(Buttons.gray("selectBeforeSwapSCs_" + p2.getFaction() + "_" + type, p2.getColor()));
-                } else {
-                    Button button = Buttons.gray(
-                            "selectBeforeSwapSCs_" + p2.getFaction() + "_" + type,
-                            p2.getFactionModel().getShortName());
-                    String factionEmojiString = p2.getFactionEmoji();
-                    button = button.withEmoji(Emoji.fromFormatted(factionEmojiString));
-                    buttons.add(button);
-                }
+                buttons.add(FoWHelper.fogSafeTargetButton(
+                        "selectBeforeSwapSCs_" + p2.getFaction() + "_" + type, "gray", p2));
             } else {
-                if (game.isFowMode()) {
-                    buttons.add(Buttons.gray(
-                            "swapSCs_" + p2.getFaction() + "_" + type + "_"
-                                    + p2.getSCs().toArray()[0] + "_"
-                                    + hacan.getSCs().toArray()[0],
-                            p2.getColor()));
-                } else {
-                    Button button = Buttons.gray(
-                            "swapSCs_" + p2.getFaction() + "_" + type + "_"
-                                    + p2.getSCs().toArray()[0] + "_"
-                                    + hacan.getSCs().toArray()[0],
-                            p2.getFactionModel().getShortName());
-                    String factionEmojiString = p2.getFactionEmoji();
-                    button = button.withEmoji(Emoji.fromFormatted(factionEmojiString));
-                    buttons.add(button);
-                }
+                buttons.add(FoWHelper.fogSafeTargetButton(
+                        "swapSCs_" + p2.getFaction() + "_" + type + "_"
+                                + p2.getSCs().toArray()[0] + "_"
+                                + hacan.getSCs().toArray()[0],
+                        "gray",
+                        p2));
             }
         }
         return buttons;
@@ -2422,26 +2379,21 @@ public static void resolveVadenSCDebt(Player player, int sc, Game game, GenericI
             if (p2.getSCs().contains(sc) && p2 != player && p2.hasAbility("fine_print")) {
                 SendDebtService.sendDebt(player, p2, 1, Constants.VADEN_DEBT_POOL);
                 CommanderUnlockCheckService.checkPlayer(p2, "vaden");
-                if (game.isFowMode()) {
-                    MessageHelper.sendMessageToChannel(
-                            player.getCorrectChannel(),
-                            player.getRepresentationUnfogged() + ", you sent 1 debt token to "
-                                    + p2.getFactionEmojiOrColor()
-                                    + ", for their \"Shark Loans\" pool, due to their **Fine Print** ability.");
-                    MessageHelper.sendMessageToChannel(
-                            p2.getCorrectChannel(),
-                            p2.getRepresentationUnfogged() + ", you collected 1 debt token from "
-                                    + player.getFactionEmojiOrColor()
-                                    + ", for your \"Shark Loans\" pool, due to your **Fine Print** ability."
-                                    + " This is technically optional, done automatically for convenience.");
-                } else {
-                    MessageHelper.sendMessageToChannel(
-                            p2.getCorrectChannel(),
-                            p2.getRepresentationUnfogged() + ", you collected 1 debt token from "
-                                    + player.getRepresentationUnfogged()
-                                    + ", for your \"Shark Loans\" pool, due to your **Fine Print** ability."
-                                    + " This is technically optional, done automatically for convenience.");
-                }
+                FoWHelper.notifyActorAndAffectedElsePublic(
+                        game,
+                        player,
+                        player.getRepresentationUnfogged() + ", you sent 1 debt token to "
+                                + p2.getFactionEmojiOrColor()
+                                + ", for their \"Shark Loans\" pool, due to their **Fine Print** ability.",
+                        p2,
+                        p2.getRepresentationUnfogged() + ", you collected 1 debt token from "
+                                + player.getFactionEmojiOrColor()
+                                + ", for your \"Shark Loans\" pool, due to your **Fine Print** ability."
+                                + " This is technically optional, done automatically for convenience.",
+                        p2.getRepresentationUnfogged() + ", you collected 1 debt token from "
+                                + player.getRepresentationUnfogged()
+                                + ", for your \"Shark Loans\" pool, due to your **Fine Print** ability."
+                                + " This is technically optional, done automatically for convenience.");
                 break;
             }
         }
diff --git a/src/main/java/ti4/helpers/ButtonHelperHeroes.java b/src/main/java/ti4/helpers/ButtonHelperHeroes.java
index fd3d43a3f7..a2b4059651 100644
--- a/src/main/java/ti4/helpers/ButtonHelperHeroes.java
+++ b/src/main/java/ti4/helpers/ButtonHelperHeroes.java
@@ -288,16 +288,7 @@ public static void resolveGledgeHero(Player player, Game game) {
     public static void resolveKhraskHero(Player player, Game game) {
         List<Button> buttons = new ArrayList<>();
         for (Player p2 : game.getRealPlayers()) {
-            if (game.isFowMode()) {
-                buttons.add(Buttons.gray("khraskHeroStep2_" + p2.getFaction(), p2.getColor()));
-            } else {
-                Button button = Buttons.gray(
-                        "khraskHeroStep2_" + p2.getFaction(),
-                        p2.getFactionModel().getShortName());
-                String factionEmojiString = p2.getFactionEmoji();
-                button = button.withEmoji(Emoji.fromFormatted(factionEmojiString));
-                buttons.add(button);
-            }
+            buttons.add(FoWHelper.fogSafeTargetButton("khraskHeroStep2_" + p2.getFaction(), "gray", p2));
         }
         MessageHelper.sendMessageToChannelWithButtons(
                 player.getCorrectChannel(),
@@ -547,16 +538,8 @@ public static void resolveAxisHeroStep2(Player player, Game game, ButtonInteract
             if (p2 == player) {
                 continue;
             }
-            if (game.isFowMode()) {
-                buttons.add(Buttons.gray("axisHeroStep3_" + shipOrder + "_" + p2.getFaction(), p2.getColor()));
-            } else {
-                Button button = Buttons.gray(
-                        "axisHeroStep3_" + shipOrder + "_" + p2.getFaction(),
-                        p2.getFactionModel().getShortName());
-                String factionEmojiString = p2.getFactionEmoji();
-                button = button.withEmoji(Emoji.fromFormatted(factionEmojiString));
-                buttons.add(button);
-            }
+            buttons.add(
+                    FoWHelper.fogSafeTargetButton("axisHeroStep3_" + shipOrder + "_" + p2.getFaction(), "gray", p2));
         }
         ButtonHelper.deleteButtonAndDeleteMessageIfEmpty(event);
         MessageHelper.sendMessageToChannelWithButtons(player.getCorrectChannel(), message, buttons);
@@ -1779,10 +1762,7 @@ public static void sendVadenHeroSomething(Player player, Game game, String butto
                         player.getCardsInfoThread(), message, stuffToTransButtons);
             }
         }
-        MessageHelper.sendMessageToChannel(player.getCorrectChannel(), msg);
-        if (game.isFowMode()) {
-            MessageHelper.sendMessageToChannel(vaden.getCorrectChannel(), msg);
-        }
+        FoWHelper.notifyPlayerAndAffectedInFog(game, player, vaden, msg);
     }
 
     public static void killShipsSardakkHero(Player player, Game game, ButtonInteractionEvent event) {
diff --git a/src/main/java/ti4/helpers/ButtonHelperTwilightsFallActionCards.java b/src/main/java/ti4/helpers/ButtonHelperTwilightsFallActionCards.java
index fa5f887a00..e672871d11 100644
--- a/src/main/java/ti4/helpers/ButtonHelperTwilightsFallActionCards.java
+++ b/src/main/java/ti4/helpers/ButtonHelperTwilightsFallActionCards.java
@@ -178,7 +178,9 @@ public static void manipulateStep1_(ButtonInteractionEvent event, Game game, Str
                 continue;
             }
             buttons.add(Buttons.green(
-                    "manipulateStep2_" + cardID + "_" + p2.getFaction(), p2.getUserName(), p2.fogSafeEmoji()));
+                    "manipulateStep2_" + cardID + "_" + p2.getFaction(),
+                    p2.getFactionNameOrColor(),
+                    p2.fogSafeEmoji()));
         }
         MessageHelper.sendMessageToChannel(
                 game.isVeiledHeartMode() ? player.getCardsInfoThread() : player.getCorrectChannel(),
@@ -385,7 +387,7 @@ private static void coerceStep2(Game game, Player player, ButtonInteractionEvent
                     p2.factionButtonChecker() + "coerceStep3_" + player.getFaction() + "_" + ability, tech.getName()));
         }
         String msg = p2.getRepresentationUnfogged() + ", please choose the ability you wish to give to "
-                + (game.isFowMode() ? player.getColorIfCanSeeStats(p2) : player.getRepresentationNoPing()) + ".";
+                + FoWHelper.identityOrColorIfCanSeeStats(game, player, p2, player.getRepresentationNoPing()) + ".";
         MessageChannel channel = p2.getCorrectChannel();
         if (game.isVeiledHeartMode()) {
             MessageHelper.sendMessageToChannel(
@@ -416,7 +418,7 @@ public static void coerceStep3(Game game, Player player, ButtonInteractionEvent
         player.removeTech(ability1);
         p2.addTech(ability1);
         String msg = player.getRepresentation() + " has lost _" + tech1.getName() + "_ to "
-                + (game.isFowMode() ? p2.getColorIfCanSeeStats(player) : p2.getFactionNameOrColor()) + ".";
+                + FoWHelper.identityOrColorIfCanSeeStats(game, p2, player, p2.getFactionNameOrColor()) + ".";
         String msg2 = p2.getRepresentation() + ", you gained _" + tech1.getName() + "_ from "
                 + player.getFactionNameOrColor() + ".";
         MessageHelper.sendMessageToChannel(p2.getCorrectChannel(), msg2);
@@ -565,7 +567,7 @@ public static void transposeStep4(Game game, Player player, ButtonInteractionEve
                 + tech2.getName() + "_ via a _Transpose_ with " + p2.getFactionNameOrColor() + ".";
         String msg2 = p2.getRepresentationUnfogged() + ", you exchanged _" + tech2.getName() + "_ for _"
                 + tech1.getName() + "_ via a _Transpose_ with "
-                + (game.isFowMode() ? player.getColorIfCanSeeStats(p2) : player.getFactionNameOrColor()) + ".";
+                + FoWHelper.identityOrColorIfCanSeeStats(game, player, p2, player.getFactionNameOrColor()) + ".";
         MessageHelper.sendMessageToChannel(p2.getCorrectChannel(), msg2);
         MessageHelper.sendMessageToChannel(player.getCorrectChannel(), msg);
 
diff --git a/src/main/java/ti4/helpers/FoWHelper.java b/src/main/java/ti4/helpers/FoWHelper.java
index a4d411e00b..1444db6a4d 100644
--- a/src/main/java/ti4/helpers/FoWHelper.java
+++ b/src/main/java/ti4/helpers/FoWHelper.java
@@ -14,10 +14,12 @@
 import net.dv8tion.jda.api.components.buttons.Button;
 import net.dv8tion.jda.api.entities.channel.Channel;
 import net.dv8tion.jda.api.entities.channel.concrete.ThreadChannel;
+import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel;
 import net.dv8tion.jda.api.events.interaction.GenericInteractionCreateEvent;
 import net.dv8tion.jda.api.events.interaction.command.GenericCommandInteractionEvent;
 import org.jetbrains.annotations.NotNull;
 import software.amazon.awssdk.utils.StringUtils;
+import ti4.discord.interactions.buttons.Buttons;
 import ti4.discord.interactions.buttons.handlers.faction.homebrew.beans.DreamButtonHandler;
 import ti4.game.Game;
 import ti4.game.Planet;
@@ -83,6 +85,181 @@ public static boolean isPrivateGame(
         return false;
     }
 
+    /**
+     * Identity-token substitution for the acting player in a broadcast message. Unfogged, returns the
+     * player's standard non-pinging representation; fogged, returns {@code fogPhrase} verbatim — the
+     * caller-supplied placeholder (e.g. {@code ""} to drop the actor, {@code "someone"},
+     * {@code "another player"}, {@code "Player"}). Centralizes the canonical
+     * {@code game.isFowMode() ? "<phrase>" : player.getRepresentationNoPing()} pattern (Form 1) so the
+     * fog-anonymization rule lives in one place (and can later be made per-viewer without touching
+     * every call site).
+     *
+     * <p>Note: this is only for call sites whose unfogged rendering is the standard representation.
+     * Sites that reveal a Discord username or a bare faction emoji when unfogged (e.g.
+     * ActionCardHelper.showAll, or the explore-discovery announcements) do not fit this method and
+     * must be handled separately.
+     */
+    public static String actorOrAnon(Game game, Player player, String fogPhrase) {
+        return game.isFowMode() ? fogPhrase : player.getRepresentationNoPing();
+    }
+
+    /**
+     * Identity substitution for a message that unfogged shows the player's compact
+     * faction-emoji-or-color representation. Unfogged returns {@code getFactionEmojiOrColor()};
+     * fogged returns {@code fogPhrase} verbatim (which the caller chooses — a generic word, or the
+     * player's raw color where the site deliberately reveals color under fog).
+     *
+     * <p>Centralizes the {@code game.isFowMode() ? "<phrase>" : player.getFactionEmojiOrColor()}
+     * message pattern (the single seam for a future per-viewer upgrade).
+     */
+    public static String factionEmojiOrAnon(Game game, Player player, String fogPhrase) {
+        return game.isFowMode() ? fogPhrase : player.getFactionEmojiOrColor();
+    }
+
+    /**
+     * Per-viewer identity substitution. When fogged, returns {@code target.getColorIfCanSeeStats(viewer)}
+     * — the target's color, or {@code "???"} when {@code viewer} is not allowed to see the target's
+     * stats (alliance / promissory-note aware) — otherwise returns {@code unfoggedRendering}. The
+     * unfogged rendering is supplied by the caller because it varies (representation, faction name,
+     * etc.); this centralizes the *fog* half (the per-viewer visibility rule).
+     */
+    public static String identityOrColorIfCanSeeStats(
+            Game game, Player target, Player viewer, String unfoggedRendering) {
+        return game.isFowMode() ? target.getColorIfCanSeeStats(viewer) : unfoggedRendering;
+    }
+
+    /**
+     * Channel-selection rule for public "announcement" messages: when not fogged and the
+     * interaction did not already happen in the Actions channel, route to the public Actions
+     * channel; otherwise keep the message local to the interaction's own channel. Extracted from
+     * the repeated {@code !game.isFowMode() && event.getChannel() != game.getActionsChannel()}
+     * shape in ExploreService.
+     */
+    public static MessageChannel actionsChannelOrLocal(Game game, GenericInteractionCreateEvent event) {
+        return shouldAnnouncePublicly(game, event) ? game.getActionsChannel() : event.getMessageChannel();
+    }
+
+    /**
+     * The shared routing rule behind {@link #actionsChannelOrLocal} and {@link #announcePublicOrLocal}:
+     * announce to the public Actions channel only when the game is not fogged and the interaction did
+     * not already happen in that channel. In a fog game this is always false (the acting player pressed
+     * the button from their own private channel), so the message stays local.
+     */
+    private static boolean shouldAnnouncePublicly(Game game, GenericInteractionCreateEvent event) {
+        return !game.isFowMode() && event.getChannel() != game.getActionsChannel();
+    }
+
+    /**
+     * Announce an event publicly when appropriate, else keep it local. When not fogged and the
+     * interaction did not already happen in the Actions channel, sends {@code publicMessage} to the
+     * public Actions channel; otherwise sends {@code localMessage} to the interaction's own channel.
+     * Use this when the public and local wording differ (e.g. a faction-emoji-prefixed public
+     * announcement vs. a plain local one); when both messages are identical, use
+     * {@link #actionsChannelOrLocal} with a single send instead.
+     */
+    public static void announcePublicOrLocal(
+            Game game, GenericInteractionCreateEvent event, String publicMessage, String localMessage) {
+        if (shouldAnnouncePublicly(game, event)) {
+            MessageHelper.sendMessageToChannel(game.getActionsChannel(), publicMessage);
+        } else {
+            MessageHelper.sendMessageToChannel(event.getMessageChannel(), localMessage);
+        }
+    }
+
+    /**
+     * Build a target-selection button whose label/emoji does not leak {@code target}'s identity
+     * under fog-of-war. Standardizes the drifted hand-rolled idioms (Form 10): unfogged uses the
+     * faction short-name label plus faction emoji; fogged uses the capitalized color name plus the
+     * neutral color-chip emoji (via {@link Player#fogSafeEmoji()}). {@code style} is one of "gray"
+     * (default), "green", "red", "blue".
+     *
+     * <p>This is a deliberate behavior normalization: the pre-existing hand-rolled blocks used the
+     * raw lowercase color (e.g. "red") in the fog branch, whereas this uses the capitalized color
+     * name (e.g. "Red") via {@link Player#getFactionNameOrColor()}. The emoji comes from
+     * {@code fogSafeEmoji()}, so it shows the faction emoji when unfogged and the color-chip emoji
+     * when fogged — the same convention as the Twilight's Fall action-card buttons.
+     */
+    public static Button fogSafeTargetButton(String buttonId, String style, Player target) {
+        boolean fogged = target.getGame().isFowMode();
+        String label = fogged
+                ? target.getFactionNameOrColor()
+                : target.getFactionModel().getShortName();
+        return styledButton(style, buttonId, label, target.fogSafeEmoji());
+    }
+
+    /**
+     * Per-viewer variant of {@link #fogSafeTargetButton(String, String, Player)}: fogged uses
+     * {@code target.getColorIfCanSeeStats(viewer)} (the target's color, or {@code "???"} when
+     * {@code viewer} may not see the target's stats) with no emoji, so it never leaks color to a
+     * viewer who shouldn't see it; unfogged uses the faction short-name plus faction emoji, as usual.
+     * For target buttons that must respect per-viewer visibility (e.g. Psionic Hammer), not just the
+     * game-wide fog flag.
+     */
+    public static Button fogSafeTargetButton(String buttonId, String style, Player target, Player viewer) {
+        boolean fogged = target.getGame().isFowMode();
+        String label = fogged
+                ? target.getColorIfCanSeeStats(viewer)
+                : target.getFactionModel().getShortName();
+        String emoji = fogged ? null : target.getFactionEmoji();
+        return styledButton(style, buttonId, label, emoji);
+    }
+
+    /** Dispatch a {@link Buttons} factory by {@code style} ("gray" default, "green", "red", "blue"). */
+    private static Button styledButton(String style, String buttonId, String label, String emoji) {
+        return switch (style == null ? "gray" : style) {
+            case "green" -> Buttons.green(buttonId, label, emoji);
+            case "red" -> Buttons.red(buttonId, label, emoji);
+            case "blue" -> Buttons.blue(buttonId, label, emoji);
+            default -> Buttons.gray(buttonId, label, emoji);
+        };
+    }
+
+    /**
+     * Two-party fog notification: send {@code message} to {@code primary}'s channel, and — only in
+     * fog, and only when {@code affected} is a different player — also to {@code affected}'s channel.
+     * In non-fog games {@code getCorrectChannel()} is the shared main channel, so one send already
+     * reaches everyone; the extra fog send routes to the affected player's private channel. Replaces
+     * the recurring {@code send(primary…); if (fowMode && affected != primary) send(affected…);}.
+     */
+    public static void notifyPlayerAndAffectedInFog(Game game, Player primary, Player affected, String message) {
+        notifyPlayerAndAffectedInFog(game, primary, message, affected, message);
+    }
+
+    /**
+     * As {@link #notifyPlayerAndAffectedInFog(Game, Player, Player, String)}, but sends a distinct
+     * (usually anonymized) message to the affected player.
+     */
+    public static void notifyPlayerAndAffectedInFog(
+            Game game, Player primary, String primaryMessage, Player affected, String affectedMessage) {
+        MessageHelper.sendMessageToChannel(primary.getCorrectChannel(), primaryMessage);
+        if (game.isFowMode() && affected != primary) {
+            MessageHelper.sendMessageToChannel(affected.getCorrectChannel(), affectedMessage);
+        }
+    }
+
+    /**
+     * Fog-aware three-way resolution message. When fogged, sends a private second-person message to
+     * each of the two involved players ({@code actorFogMessage} to {@code actor},
+     * {@code affectedFogMessage} to {@code affected}); when not fogged, sends a single third-person
+     * {@code publicMessage} to the actor's channel (which is the shared main channel, so everyone
+     * sees it). Replaces the recurring
+     * {@code if (fowMode) { send(actor, …); send(affected, …); } else { send(actor, publicMsg); }}.
+     */
+    public static void notifyActorAndAffectedElsePublic(
+            Game game,
+            Player actor,
+            String actorFogMessage,
+            Player affected,
+            String affectedFogMessage,
+            String publicMessage) {
+        if (game.isFowMode()) {
+            MessageHelper.sendMessageToChannel(actor.getCorrectChannel(), actorFogMessage);
+            MessageHelper.sendMessageToChannel(affected.getCorrectChannel(), affectedFogMessage);
+        } else {
+            MessageHelper.sendMessageToChannel(actor.getCorrectChannel(), publicMessage);
+        }
+    }
+
     public static boolean canSeeStatsOfFaction(Game game, String faction, Player viewingPlayer) {
         for (Player player : game.getRealPlayers()) {
             if (faction.equalsIgnoreCase(player.getFaction())) {
diff --git a/src/main/java/ti4/helpers/thundersedge/TeHelperActionCards.java b/src/main/java/ti4/helpers/thundersedge/TeHelperActionCards.java
index 3e637ecacf..8321cb4c86 100644
--- a/src/main/java/ti4/helpers/thundersedge/TeHelperActionCards.java
+++ b/src/main/java/ti4/helpers/thundersedge/TeHelperActionCards.java
@@ -6,7 +6,6 @@
 import java.util.function.Predicate;
 import lombok.experimental.UtilityClass;
 import net.dv8tion.jda.api.components.buttons.Button;
-import net.dv8tion.jda.api.entities.emoji.Emoji;
 import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent;
 import org.apache.commons.lang3.function.Consumers;
 import ti4.discord.interactions.buttons.Buttons;
@@ -23,6 +22,7 @@
 import ti4.helpers.ButtonHelperCommanders;
 import ti4.helpers.ButtonHelperHeroes;
 import ti4.helpers.CommandCounterHelper;
+import ti4.helpers.FoWHelper;
 import ti4.helpers.Helper;
 import ti4.helpers.NewStuffHelper;
 import ti4.helpers.RegexHelper;
@@ -142,17 +142,8 @@ private static void lieInWait(Game game, Player player, ButtonInteractionEvent e
             if (p2 == player || p2.getAcCount() == 0) {
                 continue;
             }
-            if (game.isFowMode()) {
-                buttons.add(
-                        Buttons.gray(player.factionButtonChecker() + "getACFrom_" + p2.getFaction(), p2.getColor()));
-            } else {
-                Button button = Buttons.gray(
-                        player.factionButtonChecker() + "getACFrom_" + p2.getFaction(),
-                        p2.getFactionModel().getShortName());
-                String factionEmojiString = p2.getFactionEmoji();
-                button = button.withEmoji(Emoji.fromFormatted(factionEmojiString));
-                buttons.add(button);
-            }
+            buttons.add(FoWHelper.fogSafeTargetButton(
+                    player.factionButtonChecker() + "getACFrom_" + p2.getFaction(), "gray", p2));
         }
         String message = player.getRepresentationUnfogged()
                 + ", please tell the bot which two of your neighbors did the transaction.";
diff --git a/src/main/java/ti4/helpers/thundersedge/TeHelperAgents.java b/src/main/java/ti4/helpers/thundersedge/TeHelperAgents.java
index ddbfdf58d3..e6fbb04c11 100644
--- a/src/main/java/ti4/helpers/thundersedge/TeHelperAgents.java
+++ b/src/main/java/ti4/helpers/thundersedge/TeHelperAgents.java
@@ -20,6 +20,7 @@
 import ti4.game.UnitHolder;
 import ti4.helpers.ActionCardHelper;
 import ti4.helpers.ButtonHelper;
+import ti4.helpers.FoWHelper;
 import ti4.helpers.RegexHelper;
 import ti4.helpers.Units;
 import ti4.helpers.Units.UnitKey;
@@ -113,7 +114,7 @@ private static void handleRalNelAgentPart2(
                 if (game.isFowMode())
                     MessageHelper.sendMessageToChannel(
                             p2.getCorrectChannel(),
-                            (game.isFowMode() ? player.getColorIfCanSeeStats(p2) : player.getRepresentation())
+                            FoWHelper.identityOrColorIfCanSeeStats(game, player, p2, player.getRepresentation())
                                     + " sent an action card to " + p2.getRepresentation(true, true) + ".");
             } else {
                 MessageHelper.sendMessageToChannel(player.getCorrectChannel(), "Error, player2 is null");
diff --git a/src/main/java/ti4/helpers/thundersedge/TeHelperCommanders.java b/src/main/java/ti4/helpers/thundersedge/TeHelperCommanders.java
index de21106d4b..6a995ccfda 100644
--- a/src/main/java/ti4/helpers/thundersedge/TeHelperCommanders.java
+++ b/src/main/java/ti4/helpers/thundersedge/TeHelperCommanders.java
@@ -53,7 +53,7 @@ public static void useDwsTechDiscount(Game game, Player player, ButtonInteractio
 
         // Notify the DWS commander holder that their discount was used
         String message = dws.getRepresentation(true, true) + " ";
-        message += game.isFowMode() ? player.getColorIfCanSeeStats(dws) : player.getRepresentation(true, false);
+        message += FoWHelper.identityOrColorIfCanSeeStats(game, player, dws, player.getRepresentation(true, false));
         message += " has used Aello to get a discount on researching.";
         message += " Use these buttons to gain or convert 1 commodity.";
         message += "\n-# You have (" + dws.getCommoditiesRepresentation() + ") commodities.";
diff --git a/src/main/java/ti4/service/actioncard/SabotageService.java b/src/main/java/ti4/service/actioncard/SabotageService.java
index 250ac6c855..e2aae90957 100644
--- a/src/main/java/ti4/service/actioncard/SabotageService.java
+++ b/src/main/java/ti4/service/actioncard/SabotageService.java
@@ -8,6 +8,7 @@
 import ti4.game.Game;
 import ti4.game.Player;
 import ti4.helpers.ActionCardHelper;
+import ti4.helpers.FoWHelper;
 import ti4.helpers.Helper;
 import ti4.helpers.Units;
 import ti4.image.Mapper;
@@ -128,7 +129,7 @@ public static String noSaboReason(Game game, Player player) {
             return "All _Sabotages_ are in the discard.";
         }
 
-        String playerName = game.isFowMode() ? "Player" : player.getRepresentationNoPing();
+        String playerName = FoWHelper.actorOrAnon(game, player, "Player");
         if (game.playerHasLeaderUnlockedOrAlliance(player, "bastioncommander")) {
             LeaderModel nipAndTuck = Mapper.getLeader("bastioncommander");
             return playerName + " has access to the Last Bastion commander, " + nipAndTuck.getNameRepresentation()
diff --git a/src/main/java/ti4/service/explore/ExploreService.java b/src/main/java/ti4/service/explore/ExploreService.java
index 7aaba2b390..3f7a74d5d8 100644
--- a/src/main/java/ti4/service/explore/ExploreService.java
+++ b/src/main/java/ti4/service/explore/ExploreService.java
@@ -110,11 +110,7 @@ public void explorePlanet(
                     Please use `/explore draw_and_discard trait` then `/explore use explore_card_id` to manually resolve this exploration.\
 
                     -# (NB: Player chooses a trait, reveals two of that trait and one of each other; reveal four cards total.)""";
-                if (!game.isFowMode() && event.getChannel() != game.getActionsChannel()) {
-                    MessageHelper.sendMessageToChannel(game.getActionsChannel(), reportMessage);
-                } else {
-                    MessageHelper.sendMessageToChannel(event.getMessageChannel(), reportMessage);
-                }
+                MessageHelper.sendMessageToChannel(FoWHelper.actionsChannelOrLocal(game, event), reportMessage);
                 return;
             }
             String cardIDC = game.drawExplore("CULTURAL");
@@ -177,11 +173,7 @@ public void explorePlanet(
                     + "Bozgarbia ability and found " + indefiniteArticleC + "_" + exploreNameC + "_, "
                     + indefiniteArticleH + "_" + exploreNameH + "_ and " + indefiniteArticleI + "_" + exploreNameI
                     + "_.";
-            if (!game.isFowMode() && event.getChannel() != game.getActionsChannel()) {
-                MessageHelper.sendMessageToChannel(game.getActionsChannel(), reportMessage);
-            } else {
-                MessageHelper.sendMessageToChannel(event.getMessageChannel(), reportMessage);
-            }
+            MessageHelper.sendMessageToChannel(FoWHelper.actionsChannelOrLocal(game, event), reportMessage);
 
             Button resolveExploreC = Buttons.green(
                     "resolve_explore_" + cardIDC + "_" + planetName + "_distantSuns", exploreModelC.getName());
@@ -289,11 +281,7 @@ public void explorePlanet(
                         reportMessage += " Auto-resolving.";
                     }
 
-                    if (!game.isFowMode() && event.getChannel() != game.getActionsChannel()) {
-                        MessageHelper.sendMessageToChannel(game.getActionsChannel(), reportMessage);
-                    } else {
-                        MessageHelper.sendMessageToChannel(event.getMessageChannel(), reportMessage);
-                    }
+                    MessageHelper.sendMessageToChannel(FoWHelper.actionsChannelOrLocal(game, event), reportMessage);
 
                     if (exploreName1.equals(exploreName2)) {
                         resolveExploreAuto(event, player, cardID1, planetName, game);
@@ -364,13 +352,11 @@ public void explorePlanet(
                     + (player.hasUnexhaustedLeader("yssarilagent") ? "Clever Clever " : "")
                     + "Vassa Hagi, the Lanefir" + (player.hasUnexhaustedLeader("yssarilagent") ? "/Yssaril" : "")
                     + " agent, and thus may decline this exploration to draw another one instead.";
-            if (!game.isFowMode() && event.getChannel() != game.getActionsChannel()) {
-                String pF = player.getFactionEmoji();
-                MessageHelper.sendMessageToChannel(
-                        game.getActionsChannel(), pF + " found a " + name1 + " on " + planetName);
-            } else {
-                MessageHelper.sendMessageToChannel(event.getMessageChannel(), "Found a " + name1 + " on " + planetName);
-            }
+            FoWHelper.announcePublicOrLocal(
+                    game,
+                    event,
+                    player.getFactionEmoji() + " found a " + name1 + " on " + planetName,
+                    "Found a " + name1 + " on " + planetName);
             ExploreModel exploreModel1 = Mapper.getExplore(cardID);
             List<MessageEmbed> embeds = List.of(exploreModel1.getRepresentationEmbed());
             MessageHelper.sendMessageToChannelWithEmbedsAndButtons(event.getMessageChannel(), message, embeds, buttons);
@@ -386,14 +372,11 @@ public void explorePlanet(
             List<Button> buttons = List.of(resolveExplore1, resolveExplore2);
             String message = player.getRepresentationUnfogged()
                     + " You have Augers Breakthrough, and thus may decline this exploration to draw 1 action card instead.";
-            if (!game.isFowMode() && event.getChannel() != game.getActionsChannel()) {
-                String pF = player.getFactionEmoji();
-                MessageHelper.sendMessageToChannel(
-                        game.getActionsChannel(), pF + " found a " + name1 + " on " + planetName + ".");
-            } else {
-                MessageHelper.sendMessageToChannel(
-                        event.getMessageChannel(), "Found a " + name1 + " on " + planetName + ".");
-            }
+            FoWHelper.announcePublicOrLocal(
+                    game,
+                    event,
+                    player.getFactionEmoji() + " found a " + name1 + " on " + planetName + ".",
+                    "Found a " + name1 + " on " + planetName + ".");
             ExploreModel exploreModel1 = Mapper.getExplore(cardID);
             List<MessageEmbed> embeds = List.of(exploreModel1.getRepresentationEmbed());
             MessageHelper.sendMessageToChannelWithEmbedsAndButtons(event.getMessageChannel(), message, embeds, buttons);
@@ -409,14 +392,11 @@ public void explorePlanet(
             List<Button> buttons = List.of(resolveExplore1, resolveExplore2);
             String message = player.getRepresentationUnfogged()
                     + " You have _Scanlink Drone Network_, and thus may decline this exploration to gain 1 trade good.";
-            if (!game.isFowMode() && event.getChannel() != game.getActionsChannel()) {
-                String pF = player.getFactionEmoji();
-                MessageHelper.sendMessageToChannel(
-                        game.getActionsChannel(), pF + " found a " + name1 + " on " + planetName + ".");
-            } else {
-                MessageHelper.sendMessageToChannel(
-                        event.getMessageChannel(), "Found a " + name1 + " on " + planetName + ".");
-            }
+            FoWHelper.announcePublicOrLocal(
+                    game,
+                    event,
+                    player.getFactionEmoji() + " found a " + name1 + " on " + planetName + ".",
+                    "Found a " + name1 + " on " + planetName + ".");
             ExploreModel exploreModel1 = Mapper.getExplore(cardID);
             List<MessageEmbed> embeds = List.of(exploreModel1.getRepresentationEmbed());
             MessageHelper.sendMessageToChannelWithEmbedsAndButtons(event.getMessageChannel(), message, embeds, buttons);
@@ -432,14 +412,11 @@ public void explorePlanet(
             List<Button> buttons = List.of(resolveExplore1, resolveExplore2);
             String message = player.getRepresentationUnfogged()
                     + " You have _Discovery_, and thus may decline this exploration to gain 1 trade good.";
-            if (!game.isFowMode() && event.getChannel() != game.getActionsChannel()) {
-                String pF = player.getFactionEmoji();
-                MessageHelper.sendMessageToChannel(
-                        game.getActionsChannel(), pF + " found a " + name1 + " on " + planetName + ".");
-            } else {
-                MessageHelper.sendMessageToChannel(
-                        event.getMessageChannel(), "Found a " + name1 + " on " + planetName + ".");
-            }
+            FoWHelper.announcePublicOrLocal(
+                    game,
+                    event,
+                    player.getFactionEmoji() + " found a " + name1 + " on " + planetName + ".",
+                    "Found a " + name1 + " on " + planetName + ".");
             ExploreModel exploreModel1 = Mapper.getExplore(cardID);
             List<MessageEmbed> embeds = List.of(exploreModel1.getRepresentationEmbed());
             MessageHelper.sendMessageToChannelWithEmbedsAndButtons(event.getMessageChannel(), message, embeds, buttons);
@@ -488,7 +465,7 @@ public void explorePlanet(
             MessageHelper.sendMessageToChannel(
                     (MessageChannel) event.getChannel(),
                     planetName + " has been readied because of Quaxdol Junitas, the Florzen Commander.");
-            if (!game.isFowMode()) AgendaHelper.listVoteCount(game, game.getMainGameChannel());
+            AgendaHelper.listVoteCountIfUnfogged(game);
         }
         if (game.playerHasLeaderUnlockedOrAlliance(player, "lanefircommander")) {
             Units.UnitKey infKey = Mapper.getUnitKey("gf", player.getColor());
diff --git a/src/test/java/ti4/helpers/FoWHelperTest.java b/src/test/java/ti4/helpers/FoWHelperTest.java
new file mode 100644
index 0000000000..aad9e5aa4d
--- /dev/null
+++ b/src/test/java/ti4/helpers/FoWHelperTest.java
@@ -0,0 +1,165 @@
+package ti4.helpers;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.nullable;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import net.dv8tion.jda.api.JDA;
+import net.dv8tion.jda.api.components.buttons.Button;
+import net.dv8tion.jda.api.components.buttons.ButtonStyle;
+import net.dv8tion.jda.api.entities.channel.concrete.TextChannel;
+import net.dv8tion.jda.api.entities.channel.unions.MessageChannelUnion;
+import net.dv8tion.jda.api.events.interaction.GenericInteractionCreateEvent;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import ti4.discord.JdaService;
+import ti4.game.Game;
+import ti4.game.Player;
+import ti4.testUtils.BaseTi4Test;
+
+/**
+ * Characterization tests for the Phase 1a fog-of-war helper primitives added to {@link FoWHelper}:
+ * {@code actorOrAnon}, {@code actionsChannelOrLocal}, {@code fogSafeTargetButton}, and the per-viewer
+ * overloads. Each asserts the primitive reproduces the exact behavior extracted
+ * from the real call sites it will eventually replace, for both fogged and unfogged games. These are
+ * permanent regression guards, not migration scaffolding — see the project fog-guard unification plan.
+ */
+class FoWHelperTest extends BaseTi4Test {
+
+    private Game game;
+    private Player player;
+
+    @BeforeEach
+    void setUp() {
+        // A fresh JDA mock (other test classes null out / restub the shared one in their teardown).
+        JdaService.testingMode = true;
+        JdaService.jda = mock(JDA.class);
+
+        game = new Game();
+        game.setName("test-game");
+        player = game.addPlayer("test-user-id", "winnu");
+        player.setFaction("winnu");
+        player.setColor("red");
+    }
+
+    // ---- actorOrAnon (Form 1) --------------------------------------------------------------
+
+    @Test
+    void actorOrAnon_fogged_returnsSuppliedFogPhrase() {
+        game.setFowMode(true);
+        assertThat(FoWHelper.actorOrAnon(game, player, "someone")).isEqualTo("someone");
+        assertThat(FoWHelper.actorOrAnon(game, player, "Someone")).isEqualTo("Someone");
+        assertThat(FoWHelper.actorOrAnon(game, player, "")).isEmpty();
+    }
+
+    @Test
+    void actorOrAnon_unfogged_returnsRepresentationNoPing_forEveryFogPhrase() {
+        game.setFowMode(false);
+        String expected = player.getRepresentationNoPing();
+        assertThat(FoWHelper.actorOrAnon(game, player, "")).isEqualTo(expected);
+        assertThat(FoWHelper.actorOrAnon(game, player, "someone")).isEqualTo(expected);
+        assertThat(FoWHelper.actorOrAnon(game, player, "Someone")).isEqualTo(expected);
+    }
+
+    /** Exactly the inline expression at ActionCardHelper.java:772, for both fog states. */
+    @Test
+    void actorOrAnon_reproducesActionCardHelperLine772() {
+        game.setFowMode(true);
+        assertThat(FoWHelper.actorOrAnon(game, player, "someone")).isEqualTo("someone");
+        game.setFowMode(false);
+        assertThat(FoWHelper.actorOrAnon(game, player, "someone")).isEqualTo(player.getRepresentationNoPing());
+    }
+
+    // ---- actionsChannelOrLocal (Form 12 channel half) --------------------------------------
+
+    @Test
+    void actionsChannelOrLocal_fogged_returnsLocalInteractionChannel() {
+        game.setFowMode(true);
+        var event = mock(GenericInteractionCreateEvent.class);
+        MessageChannelUnion local = mock(MessageChannelUnion.class);
+        when(event.getMessageChannel()).thenReturn(local);
+        assertThat(FoWHelper.actionsChannelOrLocal(game, event)).isSameAs(local);
+    }
+
+    @Test
+    void actionsChannelOrLocal_unfogged_differentChannel_returnsActionsChannel() {
+        game.setFowMode(false);
+        TextChannel actions = mock(TextChannel.class);
+        when(JdaService.jda.getTextChannelById(nullable(String.class))).thenReturn(actions);
+        var event = mock(GenericInteractionCreateEvent.class);
+        when(event.getChannel()).thenReturn(null); // null != actions -> route to actions channel
+        assertThat(FoWHelper.actionsChannelOrLocal(game, event)).isSameAs(actions);
+    }
+
+    // ---- fogSafeTargetButton (Form 10) -----------------------------------------------------
+
+    @Test
+    void fogSafeTargetButton_unfogged_usesFactionShortNameAndEmoji() {
+        game.setFowMode(false);
+        Button button = FoWHelper.fogSafeTargetButton("target_" + player.getFaction(), "gray", player);
+        assertThat(button.getLabel()).isEqualTo(player.getFactionModel().getShortName());
+        assertThat(button.getEmoji()).isNotNull();
+    }
+
+    @Test
+    void fogSafeTargetButton_fogged_usesColorNameAndColorChipEmoji() {
+        game.setFowMode(true);
+        Button button = FoWHelper.fogSafeTargetButton("target_" + player.getFaction(), "gray", player);
+        assertThat(button.getLabel()).isEqualTo(player.getFactionNameOrColor());
+        // Fogged: neutral color-chip emoji (fogSafeEmoji), NOT the identity-revealing faction emoji.
+        assertThat(button.getEmoji()).isNotNull();
+        assertThat(button.getEmoji().getFormatted()).isEqualTo(player.fogSafeEmoji());
+    }
+
+    @Test
+    void fogSafeTargetButton_styleSelectsButtonColor() {
+        game.setFowMode(false);
+        assertThat(FoWHelper.fogSafeTargetButton("id", "green", player).getStyle())
+                .isEqualTo(ButtonStyle.SUCCESS);
+        assertThat(FoWHelper.fogSafeTargetButton("id", "red", player).getStyle())
+                .isEqualTo(ButtonStyle.DANGER);
+        assertThat(FoWHelper.fogSafeTargetButton("id", null, player).getStyle()).isEqualTo(ButtonStyle.SECONDARY);
+    }
+
+    // ---- per-viewer overloads (Form F) -----------------------------------------------------
+
+    @Test
+    void identityOrColorIfCanSeeStats_fogged_returnsPerViewerColor() {
+        game.setFowMode(true);
+        Player viewer = game.addPlayer("viewer-id", "hacan");
+        viewer.setFaction("hacan");
+        viewer.setColor("blue");
+        // Matches getColorIfCanSeeStats exactly (color if the viewer may see stats, else "???").
+        assertThat(FoWHelper.identityOrColorIfCanSeeStats(game, player, viewer, "UNFOGGED"))
+                .isEqualTo(player.getColorIfCanSeeStats(viewer));
+    }
+
+    @Test
+    void identityOrColorIfCanSeeStats_unfogged_returnsSuppliedRendering() {
+        game.setFowMode(false);
+        Player viewer = game.addPlayer("viewer-id", "hacan");
+        assertThat(FoWHelper.identityOrColorIfCanSeeStats(game, player, viewer, "UNFOGGED"))
+                .isEqualTo("UNFOGGED");
+    }
+
+    @Test
+    void fogSafeTargetButton_perViewer_fogged_usesColorIfCanSeeStatsAndNoEmoji() {
+        game.setFowMode(true);
+        Player viewer = game.addPlayer("viewer-id", "hacan");
+        viewer.setFaction("hacan");
+        viewer.setColor("blue");
+        Button button = FoWHelper.fogSafeTargetButton("target_" + player.getFaction(), "gray", player, viewer);
+        assertThat(button.getLabel()).isEqualTo(player.getColorIfCanSeeStats(viewer));
+        assertThat(button.getEmoji()).isNull();
+    }
+
+    @Test
+    void fogSafeTargetButton_perViewer_unfogged_usesShortNameAndEmoji() {
+        game.setFowMode(false);
+        Player viewer = game.addPlayer("viewer-id", "hacan");
+        Button button = FoWHelper.fogSafeTargetButton("target_" + player.getFaction(), "gray", player, viewer);
+        assertThat(button.getLabel()).isEqualTo(player.getFactionModel().getShortName());
+        assertThat(button.getEmoji()).isNotNull();
+    }
+}

From 7077997641620eedafa1cae395fd612e6dd18ad5 Mon Sep 17 00:00:00 2001
From: Stabar-ti <stabarrabats@gmail.com>
Date: Sun, 26 Jul 2026 00:40:57 +0200
Subject: [PATCH 2/5] regression fixes

---
 .../ti4/helpers/ButtonHelperAbilities.java    |  8 +++--
 .../helpers/ButtonHelperFactionSpecific.java  | 35 +++++++++++--------
 src/main/java/ti4/helpers/FoWHelper.java      | 10 ++++--
 3 files changed, 34 insertions(+), 19 deletions(-)

diff --git a/src/main/java/ti4/helpers/ButtonHelperAbilities.java b/src/main/java/ti4/helpers/ButtonHelperAbilities.java
index c3ea75173d..7afafff507 100644
--- a/src/main/java/ti4/helpers/ButtonHelperAbilities.java
+++ b/src/main/java/ti4/helpers/ButtonHelperAbilities.java
@@ -916,8 +916,12 @@ public static void pillage(String buttonID, ButtonInteractionEvent event, Game g
                         + pillaged.getPillageCounter() + ".";
             }
             player.setTg(player.getTg() + 1);
-            FoWHelper.notifyActorAndAffectedElsePublic(
-                    game, player, pillagerMessage, pillaged, pillagedMessage, pillagerMessage + "\n" + pillagedMessage);
+            if (game.isFowMode()) {
+                MessageHelper.sendMessageToChannel(player.getCorrectChannel(), pillagerMessage);
+                MessageHelper.sendMessageToChannel(pillaged.getCorrectChannel(), pillagedMessage);
+            } else {
+                MessageHelper.sendMessageToChannel(game.getMainGameChannel(), pillagerMessage + "\n" + pillagedMessage);
+            }
             if (RandomHelper.isOneInX(8)) {
                 int randomJoke = ThreadLocalRandom.current().nextInt(5) + 1;
                 File audioFile = ResourceHelper.getFile("voices/mentak/", "Pillage" + randomJoke + ".mp3");
diff --git a/src/main/java/ti4/helpers/ButtonHelperFactionSpecific.java b/src/main/java/ti4/helpers/ButtonHelperFactionSpecific.java
index be69e982b6..cd0cfe82d6 100644
--- a/src/main/java/ti4/helpers/ButtonHelperFactionSpecific.java
+++ b/src/main/java/ti4/helpers/ButtonHelperFactionSpecific.java
@@ -2379,21 +2379,26 @@ public static void resolveVadenSCDebt(Player player, int sc, Game game, GenericI
             if (p2.getSCs().contains(sc) && p2 != player && p2.hasAbility("fine_print")) {
                 SendDebtService.sendDebt(player, p2, 1, Constants.VADEN_DEBT_POOL);
                 CommanderUnlockCheckService.checkPlayer(p2, "vaden");
-                FoWHelper.notifyActorAndAffectedElsePublic(
-                        game,
-                        player,
-                        player.getRepresentationUnfogged() + ", you sent 1 debt token to "
-                                + p2.getFactionEmojiOrColor()
-                                + ", for their \"Shark Loans\" pool, due to their **Fine Print** ability.",
-                        p2,
-                        p2.getRepresentationUnfogged() + ", you collected 1 debt token from "
-                                + player.getFactionEmojiOrColor()
-                                + ", for your \"Shark Loans\" pool, due to your **Fine Print** ability."
-                                + " This is technically optional, done automatically for convenience.",
-                        p2.getRepresentationUnfogged() + ", you collected 1 debt token from "
-                                + player.getRepresentationUnfogged()
-                                + ", for your \"Shark Loans\" pool, due to your **Fine Print** ability."
-                                + " This is technically optional, done automatically for convenience.");
+                if (game.isFowMode()) {
+                    MessageHelper.sendMessageToChannel(
+                            player.getCorrectChannel(),
+                            player.getRepresentationUnfogged() + ", you sent 1 debt token to "
+                                    + p2.getFactionEmojiOrColor()
+                                    + ", for their \"Shark Loans\" pool, due to their **Fine Print** ability.");
+                    MessageHelper.sendMessageToChannel(
+                            p2.getCorrectChannel(),
+                            p2.getRepresentationUnfogged() + ", you collected 1 debt token from "
+                                    + player.getFactionEmojiOrColor()
+                                    + ", for your \"Shark Loans\" pool, due to your **Fine Print** ability."
+                                    + " This is technically optional, done automatically for convenience.");
+                } else {
+                    MessageHelper.sendMessageToChannel(
+                            p2.getCorrectChannel(),
+                            p2.getRepresentationUnfogged() + ", you collected 1 debt token from "
+                                    + player.getRepresentationUnfogged()
+                                    + ", for your \"Shark Loans\" pool, due to your **Fine Print** ability."
+                                    + " This is technically optional, done automatically for convenience.");
+                }
                 break;
             }
         }
diff --git a/src/main/java/ti4/helpers/FoWHelper.java b/src/main/java/ti4/helpers/FoWHelper.java
index 1444db6a4d..7fee2536b2 100644
--- a/src/main/java/ti4/helpers/FoWHelper.java
+++ b/src/main/java/ti4/helpers/FoWHelper.java
@@ -241,9 +241,15 @@ public static void notifyPlayerAndAffectedInFog(
      * Fog-aware three-way resolution message. When fogged, sends a private second-person message to
      * each of the two involved players ({@code actorFogMessage} to {@code actor},
      * {@code affectedFogMessage} to {@code affected}); when not fogged, sends a single third-person
-     * {@code publicMessage} to the actor's channel (which is the shared main channel, so everyone
-     * sees it). Replaces the recurring
+     * {@code publicMessage} to <b>the actor's channel</b>. Replaces the recurring
      * {@code if (fowMode) { send(actor, …); send(affected, …); } else { send(actor, publicMsg); }}.
+     *
+     * <p><b>Only use this when the original non-fog message went to the actor's channel.</b> The
+     * non-fog send targets {@code actor.getCorrectChannel()}, which is NOT necessarily the main game
+     * channel — in a non-fog game where players have private channels, {@code getCorrectChannel()}
+     * resolves to the actor's private channel (see {@link Player#getCorrectChannel()}). If the site's
+     * non-fog message must reach the <i>affected</i> player or the public main channel instead, keep
+     * explicit routing; this helper would misdeliver it to the actor.
      */
     public static void notifyActorAndAffectedElsePublic(
             Game game,

From 6ddf82c9eff78a37e79bbc28eed051951ac063f3 Mon Sep 17 00:00:00 2001
From: Stabar-ti <stabarrabats@gmail.com>
Date: Sun, 26 Jul 2026 01:15:27 +0200
Subject: [PATCH 3/5] Update FowHelper

---
 src/main/java/ti4/helpers/FoWHelper.java | 146 ++++++++++++-----------
 1 file changed, 76 insertions(+), 70 deletions(-)

diff --git a/src/main/java/ti4/helpers/FoWHelper.java b/src/main/java/ti4/helpers/FoWHelper.java
index 7fee2536b2..7dcf48a06e 100644
--- a/src/main/java/ti4/helpers/FoWHelper.java
+++ b/src/main/java/ti4/helpers/FoWHelper.java
@@ -86,42 +86,43 @@ public static boolean isPrivateGame(
     }
 
     /**
-     * Identity-token substitution for the acting player in a broadcast message. Unfogged, returns the
-     * player's standard non-pinging representation; fogged, returns {@code fogPhrase} verbatim — the
-     * caller-supplied placeholder (e.g. {@code ""} to drop the actor, {@code "someone"},
-     * {@code "another player"}, {@code "Player"}). Centralizes the canonical
-     * {@code game.isFowMode() ? "<phrase>" : player.getRepresentationNoPing()} pattern (Form 1) so the
-     * fog-anonymization rule lives in one place (and can later be made per-viewer without touching
-     * every call site).
+     * Shows who did something in a normal game, but hides it under fog. Returns the player's plain
+     * (non-pinging) name when the game isn't fogged, or {@code fogPhrase} when it is — you pass the
+     * placeholder to show instead: {@code "someone"}, {@code "another player"}, or {@code ""} to drop
+     * the actor entirely. Replaces the hand-written
+     * {@code game.isFowMode() ? "someone" : player.getRepresentationNoPing()} so the hide-the-actor
+     * rule lives in one place.
      *
-     * <p>Note: this is only for call sites whose unfogged rendering is the standard representation.
-     * Sites that reveal a Discord username or a bare faction emoji when unfogged (e.g.
-     * ActionCardHelper.showAll, or the explore-discovery announcements) do not fit this method and
-     * must be handled separately.
+     * <p>Only use this where the visible (non-fog) text is the player's normal representation. It does
+     * not fit sites that show something else when unfogged — a Discord username (e.g.
+     * {@code ActionCardHelper.showAll}) or a bare faction emoji (the explore-discovery lines); handle
+     * those directly.
      */
     public static String actorOrAnon(Game game, Player player, String fogPhrase) {
         return game.isFowMode() ? fogPhrase : player.getRepresentationNoPing();
     }
 
     /**
-     * Identity substitution for a message that unfogged shows the player's compact
-     * faction-emoji-or-color representation. Unfogged returns {@code getFactionEmojiOrColor()};
-     * fogged returns {@code fogPhrase} verbatim (which the caller chooses — a generic word, or the
-     * player's raw color where the site deliberately reveals color under fog).
-     *
-     * <p>Centralizes the {@code game.isFowMode() ? "<phrase>" : player.getFactionEmojiOrColor()}
-     * message pattern (the single seam for a future per-viewer upgrade).
+     * Like {@link #actorOrAnon}, but the visible (non-fog) form is the player's compact faction
+     * emoji/color ({@code getFactionEmojiOrColor()}) instead of their full name. Under fog it returns
+     * {@code fogPhrase} — usually a generic word, or the player's raw color for sites that
+     * deliberately reveal color in fog. Replaces
+     * {@code game.isFowMode() ? "<phrase>" : player.getFactionEmojiOrColor()}.
      */
     public static String factionEmojiOrAnon(Game game, Player player, String fogPhrase) {
         return game.isFowMode() ? fogPhrase : player.getFactionEmojiOrColor();
     }
 
     /**
-     * Per-viewer identity substitution. When fogged, returns {@code target.getColorIfCanSeeStats(viewer)}
-     * — the target's color, or {@code "???"} when {@code viewer} is not allowed to see the target's
-     * stats (alliance / promissory-note aware) — otherwise returns {@code unfoggedRendering}. The
-     * unfogged rendering is supplied by the caller because it varies (representation, faction name,
-     * etc.); this centralizes the *fog* half (the per-viewer visibility rule).
+     * Hides identity per-viewer — finer-grained than the game-wide fog flag. Under fog it returns what
+     * {@code viewer} is actually allowed to see about {@code target}: the target's color, or
+     * {@code "???"} if the viewer can't see the target's stats (this respects alliances and promissory
+     * notes, via {@code target.getColorIfCanSeeStats(viewer)}). When not fogged it returns
+     * {@code unfoggedRendering}, which you supply because it varies by site (full representation,
+     * faction name, etc.).
+     *
+     * <p>Use this instead of a plain {@code isFowMode()} check when a message should reveal different
+     * things to different players.
      */
     public static String identityOrColorIfCanSeeStats(
             Game game, Player target, Player viewer, String unfoggedRendering) {
@@ -129,33 +130,38 @@ public static String identityOrColorIfCanSeeStats(
     }
 
     /**
-     * Channel-selection rule for public "announcement" messages: when not fogged and the
-     * interaction did not already happen in the Actions channel, route to the public Actions
-     * channel; otherwise keep the message local to the interaction's own channel. Extracted from
-     * the repeated {@code !game.isFowMode() && event.getChannel() != game.getActionsChannel()}
-     * shape in ExploreService.
+     * Picks where a public "X happened" announcement should go. In a normal game, if the player isn't
+     * already acting in the shared Actions channel, returns that Actions channel so everyone sees it.
+     * Under fog (or when they're already in the Actions channel) returns the channel the interaction
+     * came from, keeping the message local. Send one message to whatever this returns.
+     *
+     * <p>If the public and local versions need different wording, use {@link #announcePublicOrLocal}
+     * instead. Extracted from the repeated
+     * {@code !game.isFowMode() && event.getChannel() != game.getActionsChannel()} shape in
+     * {@code ExploreService}.
      */
     public static MessageChannel actionsChannelOrLocal(Game game, GenericInteractionCreateEvent event) {
         return shouldAnnouncePublicly(game, event) ? game.getActionsChannel() : event.getMessageChannel();
     }
 
     /**
-     * The shared routing rule behind {@link #actionsChannelOrLocal} and {@link #announcePublicOrLocal}:
-     * announce to the public Actions channel only when the game is not fogged and the interaction did
-     * not already happen in that channel. In a fog game this is always false (the acting player pressed
-     * the button from their own private channel), so the message stays local.
+     * The shared decision behind {@link #actionsChannelOrLocal} and {@link #announcePublicOrLocal}:
+     * announce in the public Actions channel only in a non-fog game where the interaction didn't
+     * already happen there. Always false under fog — the player pressed the button from their own
+     * private channel, so the announcement stays with them.
      */
     private static boolean shouldAnnouncePublicly(Game game, GenericInteractionCreateEvent event) {
         return !game.isFowMode() && event.getChannel() != game.getActionsChannel();
     }
 
     /**
-     * Announce an event publicly when appropriate, else keep it local. When not fogged and the
-     * interaction did not already happen in the Actions channel, sends {@code publicMessage} to the
-     * public Actions channel; otherwise sends {@code localMessage} to the interaction's own channel.
-     * Use this when the public and local wording differ (e.g. a faction-emoji-prefixed public
-     * announcement vs. a plain local one); when both messages are identical, use
-     * {@link #actionsChannelOrLocal} with a single send instead.
+     * Sends an announcement to the right place with the right wording. In a non-fog game not already
+     * in the Actions channel, posts {@code publicMessage} to the public Actions channel; otherwise
+     * posts {@code localMessage} to the interaction's own channel.
+     *
+     * <p>Use this when the public and local versions read differently — e.g. the public one is
+     * prefixed with the finder's faction emoji and the local one is a plain sentence. When both
+     * messages are identical, use {@link #actionsChannelOrLocal} with a single send instead.
      */
     public static void announcePublicOrLocal(
             Game game, GenericInteractionCreateEvent event, String publicMessage, String localMessage) {
@@ -167,17 +173,16 @@ public static void announcePublicOrLocal(
     }
 
     /**
-     * Build a target-selection button whose label/emoji does not leak {@code target}'s identity
-     * under fog-of-war. Standardizes the drifted hand-rolled idioms (Form 10): unfogged uses the
-     * faction short-name label plus faction emoji; fogged uses the capitalized color name plus the
-     * neutral color-chip emoji (via {@link Player#fogSafeEmoji()}). {@code style} is one of "gray"
-     * (default), "green", "red", "blue".
+     * Builds a "pick a player" button whose label and icon never reveal who the target is under fog.
+     * Normal game: the target's faction short-name plus faction emoji. Fog game: the capitalized color
+     * name (e.g. "Red", via {@link Player#getFactionNameOrColor()}) plus a neutral color-chip icon —
+     * color only, never the faction. {@code style} sets the button color: "gray" (default), "green",
+     * "red", or "blue".
      *
-     * <p>This is a deliberate behavior normalization: the pre-existing hand-rolled blocks used the
-     * raw lowercase color (e.g. "red") in the fog branch, whereas this uses the capitalized color
-     * name (e.g. "Red") via {@link Player#getFactionNameOrColor()}. The emoji comes from
-     * {@code fogSafeEmoji()}, so it shows the faction emoji when unfogged and the color-chip emoji
-     * when fogged — the same convention as the Twilight's Fall action-card buttons.
+     * <p>This replaces several hand-rolled button blocks that had drifted apart (some showed a raw
+     * lowercase color, some varied the non-fog label). The icon comes from
+     * {@link Player#fogSafeEmoji()} — faction emoji when clear, color chip when fogged — matching the
+     * Twilight's Fall action-card buttons.
      */
     public static Button fogSafeTargetButton(String buttonId, String style, Player target) {
         boolean fogged = target.getGame().isFowMode();
@@ -188,12 +193,12 @@ public static Button fogSafeTargetButton(String buttonId, String style, Player t
     }
 
     /**
-     * Per-viewer variant of {@link #fogSafeTargetButton(String, String, Player)}: fogged uses
-     * {@code target.getColorIfCanSeeStats(viewer)} (the target's color, or {@code "???"} when
-     * {@code viewer} may not see the target's stats) with no emoji, so it never leaks color to a
-     * viewer who shouldn't see it; unfogged uses the faction short-name plus faction emoji, as usual.
-     * For target buttons that must respect per-viewer visibility (e.g. Psionic Hammer), not just the
-     * game-wide fog flag.
+     * Per-viewer version of {@link #fogSafeTargetButton(String, String, Player)}, for buttons that
+     * must respect what one specific {@code viewer} is allowed to see (e.g. Psionic Hammer) rather
+     * than just the game-wide fog flag. Under fog the label is
+     * {@code target.getColorIfCanSeeStats(viewer)} — the target's color, or {@code "???"} if this
+     * viewer isn't allowed to see them — with no icon, so it can't leak color to someone who shouldn't
+     * see it. In a normal game it's the faction short-name plus faction emoji, as usual.
      */
     public static Button fogSafeTargetButton(String buttonId, String style, Player target, Player viewer) {
         boolean fogged = target.getGame().isFowMode();
@@ -215,19 +220,20 @@ private static Button styledButton(String style, String buttonId, String label,
     }
 
     /**
-     * Two-party fog notification: send {@code message} to {@code primary}'s channel, and — only in
-     * fog, and only when {@code affected} is a different player — also to {@code affected}'s channel.
-     * In non-fog games {@code getCorrectChannel()} is the shared main channel, so one send already
-     * reaches everyone; the extra fog send routes to the affected player's private channel. Replaces
-     * the recurring {@code send(primary…); if (fowMode && affected != primary) send(affected…);}.
+     * Tells both the acting player and an affected player about something, with fog handled. Always
+     * sends {@code message} to {@code primary}'s channel. Under fog — where each player is in their
+     * own private channel — it also sends the same message to {@code affected}'s channel (unless
+     * {@code affected} is {@code primary}) so they aren't left out. In a normal game that second send
+     * is skipped, matching the original {@code send(primary…); if (fowMode && affected != primary)
+     * send(affected…);} pattern.
      */
     public static void notifyPlayerAndAffectedInFog(Game game, Player primary, Player affected, String message) {
         notifyPlayerAndAffectedInFog(game, primary, message, affected, message);
     }
 
     /**
-     * As {@link #notifyPlayerAndAffectedInFog(Game, Player, Player, String)}, but sends a distinct
-     * (usually anonymized) message to the affected player.
+     * Same as {@link #notifyPlayerAndAffectedInFog(Game, Player, Player, String)}, but lets the
+     * affected player get a different (usually anonymized) message than the acting player.
      */
     public static void notifyPlayerAndAffectedInFog(
             Game game, Player primary, String primaryMessage, Player affected, String affectedMessage) {
@@ -238,18 +244,18 @@ public static void notifyPlayerAndAffectedInFog(
     }
 
     /**
-     * Fog-aware three-way resolution message. When fogged, sends a private second-person message to
-     * each of the two involved players ({@code actorFogMessage} to {@code actor},
-     * {@code affectedFogMessage} to {@code affected}); when not fogged, sends a single third-person
-     * {@code publicMessage} to <b>the actor's channel</b>. Replaces the recurring
+     * Announces a two-player interaction, with fog handled. Under fog, sends a private "you did X"
+     * message to the {@code actor} and a private "X happened to you" message to the {@code affected}
+     * player. In a normal game, sends a single third-person {@code publicMessage} to the actor's
+     * channel. Replaces
      * {@code if (fowMode) { send(actor, …); send(affected, …); } else { send(actor, publicMsg); }}.
      *
      * <p><b>Only use this when the original non-fog message went to the actor's channel.</b> The
-     * non-fog send targets {@code actor.getCorrectChannel()}, which is NOT necessarily the main game
-     * channel — in a non-fog game where players have private channels, {@code getCorrectChannel()}
-     * resolves to the actor's private channel (see {@link Player#getCorrectChannel()}). If the site's
-     * non-fog message must reach the <i>affected</i> player or the public main channel instead, keep
-     * explicit routing; this helper would misdeliver it to the actor.
+     * non-fog send goes to {@code actor.getCorrectChannel()}, which is not always the public main
+     * channel — in a normal game where players have private channels,
+     * {@link Player#getCorrectChannel()} returns the actor's private channel. If the non-fog message
+     * instead needs to reach the {@code affected} player or the public main channel, keep explicit
+     * routing — this helper would send it to the wrong place.
      */
     public static void notifyActorAndAffectedElsePublic(
             Game game,

From 059a81a9e1d56bdaa1428bd1f4f3055662d1ac70 Mon Sep 17 00:00:00 2001
From: Stabar-ti <stabarrabats@gmail.com>
Date: Sun, 26 Jul 2026 01:22:04 +0200
Subject: [PATCH 4/5] Update FoWHelperTest.java

---
 src/test/java/ti4/helpers/FoWHelperTest.java | 105 ++++---------------
 1 file changed, 21 insertions(+), 84 deletions(-)

diff --git a/src/test/java/ti4/helpers/FoWHelperTest.java b/src/test/java/ti4/helpers/FoWHelperTest.java
index aad9e5aa4d..6f61a1126b 100644
--- a/src/test/java/ti4/helpers/FoWHelperTest.java
+++ b/src/test/java/ti4/helpers/FoWHelperTest.java
@@ -1,16 +1,10 @@
 package ti4.helpers;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.ArgumentMatchers.nullable;
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
 
 import net.dv8tion.jda.api.JDA;
 import net.dv8tion.jda.api.components.buttons.Button;
-import net.dv8tion.jda.api.components.buttons.ButtonStyle;
-import net.dv8tion.jda.api.entities.channel.concrete.TextChannel;
-import net.dv8tion.jda.api.entities.channel.unions.MessageChannelUnion;
-import net.dv8tion.jda.api.events.interaction.GenericInteractionCreateEvent;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import ti4.discord.JdaService;
@@ -19,11 +13,16 @@
 import ti4.testUtils.BaseTi4Test;
 
 /**
- * Characterization tests for the Phase 1a fog-of-war helper primitives added to {@link FoWHelper}:
- * {@code actorOrAnon}, {@code actionsChannelOrLocal}, {@code fogSafeTargetButton}, and the per-viewer
- * overloads. Each asserts the primitive reproduces the exact behavior extracted
- * from the real call sites it will eventually replace, for both fogged and unfogged games. These are
- * permanent regression guards, not migration scaffolding — see the project fog-guard unification plan.
+ * Focused regression guards for the fog-of-war identity rules in {@link FoWHelper}. These cover the
+ * two behaviors that actually matter and that a live fog game makes hard to eyeball: {@code actorOrAnon}
+ * hides the acting player's name under fog (and shows it otherwise), and {@code fogSafeTargetButton}
+ * (both overloads) renders a neutral color chip / {@code "???"} under fog instead of the
+ * identity-revealing faction name and emoji. Each keeps a fog + non-fog pair so the branch itself is
+ * exercised, not just one side.
+ *
+ * <p>Deliberately NOT tested here: trivial one-line ternaries and JDA-mock-heavy channel-routing —
+ * code review covers those, and no helper unit test can catch the real failure mode we've hit (picking
+ * the wrong helper, or the wrong recipient, at a call site).
  */
 class FoWHelperTest extends BaseTi4Test {
 
@@ -43,56 +42,24 @@ void setUp() {
         player.setColor("red");
     }
 
-    // ---- actorOrAnon (Form 1) --------------------------------------------------------------
+    // ---- actorOrAnon: hide the actor under fog ---------------------------------------------
 
     @Test
     void actorOrAnon_fogged_returnsSuppliedFogPhrase() {
         game.setFowMode(true);
         assertThat(FoWHelper.actorOrAnon(game, player, "someone")).isEqualTo("someone");
-        assertThat(FoWHelper.actorOrAnon(game, player, "Someone")).isEqualTo("Someone");
         assertThat(FoWHelper.actorOrAnon(game, player, "")).isEmpty();
     }
 
     @Test
-    void actorOrAnon_unfogged_returnsRepresentationNoPing_forEveryFogPhrase() {
+    void actorOrAnon_unfogged_returnsRepresentationNoPing_regardlessOfFogPhrase() {
         game.setFowMode(false);
         String expected = player.getRepresentationNoPing();
-        assertThat(FoWHelper.actorOrAnon(game, player, "")).isEqualTo(expected);
         assertThat(FoWHelper.actorOrAnon(game, player, "someone")).isEqualTo(expected);
-        assertThat(FoWHelper.actorOrAnon(game, player, "Someone")).isEqualTo(expected);
-    }
-
-    /** Exactly the inline expression at ActionCardHelper.java:772, for both fog states. */
-    @Test
-    void actorOrAnon_reproducesActionCardHelperLine772() {
-        game.setFowMode(true);
-        assertThat(FoWHelper.actorOrAnon(game, player, "someone")).isEqualTo("someone");
-        game.setFowMode(false);
-        assertThat(FoWHelper.actorOrAnon(game, player, "someone")).isEqualTo(player.getRepresentationNoPing());
-    }
-
-    // ---- actionsChannelOrLocal (Form 12 channel half) --------------------------------------
-
-    @Test
-    void actionsChannelOrLocal_fogged_returnsLocalInteractionChannel() {
-        game.setFowMode(true);
-        var event = mock(GenericInteractionCreateEvent.class);
-        MessageChannelUnion local = mock(MessageChannelUnion.class);
-        when(event.getMessageChannel()).thenReturn(local);
-        assertThat(FoWHelper.actionsChannelOrLocal(game, event)).isSameAs(local);
-    }
-
-    @Test
-    void actionsChannelOrLocal_unfogged_differentChannel_returnsActionsChannel() {
-        game.setFowMode(false);
-        TextChannel actions = mock(TextChannel.class);
-        when(JdaService.jda.getTextChannelById(nullable(String.class))).thenReturn(actions);
-        var event = mock(GenericInteractionCreateEvent.class);
-        when(event.getChannel()).thenReturn(null); // null != actions -> route to actions channel
-        assertThat(FoWHelper.actionsChannelOrLocal(game, event)).isSameAs(actions);
+        assertThat(FoWHelper.actorOrAnon(game, player, "")).isEqualTo(expected);
     }
 
-    // ---- fogSafeTargetButton (Form 10) -----------------------------------------------------
+    // ---- fogSafeTargetButton: never leak faction identity in the button ---------------------
 
     @Test
     void fogSafeTargetButton_unfogged_usesFactionShortNameAndEmoji() {
@@ -103,44 +70,22 @@ void fogSafeTargetButton_unfogged_usesFactionShortNameAndEmoji() {
     }
 
     @Test
-    void fogSafeTargetButton_fogged_usesColorNameAndColorChipEmoji() {
+    void fogSafeTargetButton_fogged_usesColorNameAndColorChipEmoji_notFactionIdentity() {
         game.setFowMode(true);
         Button button = FoWHelper.fogSafeTargetButton("target_" + player.getFaction(), "gray", player);
         assertThat(button.getLabel()).isEqualTo(player.getFactionNameOrColor());
-        // Fogged: neutral color-chip emoji (fogSafeEmoji), NOT the identity-revealing faction emoji.
+        // The leak that matters: the icon must be the neutral color chip, NOT the faction emoji.
         assertThat(button.getEmoji()).isNotNull();
         assertThat(button.getEmoji().getFormatted()).isEqualTo(player.fogSafeEmoji());
     }
 
     @Test
-    void fogSafeTargetButton_styleSelectsButtonColor() {
-        game.setFowMode(false);
-        assertThat(FoWHelper.fogSafeTargetButton("id", "green", player).getStyle())
-                .isEqualTo(ButtonStyle.SUCCESS);
-        assertThat(FoWHelper.fogSafeTargetButton("id", "red", player).getStyle())
-                .isEqualTo(ButtonStyle.DANGER);
-        assertThat(FoWHelper.fogSafeTargetButton("id", null, player).getStyle()).isEqualTo(ButtonStyle.SECONDARY);
-    }
-
-    // ---- per-viewer overloads (Form F) -----------------------------------------------------
-
-    @Test
-    void identityOrColorIfCanSeeStats_fogged_returnsPerViewerColor() {
-        game.setFowMode(true);
-        Player viewer = game.addPlayer("viewer-id", "hacan");
-        viewer.setFaction("hacan");
-        viewer.setColor("blue");
-        // Matches getColorIfCanSeeStats exactly (color if the viewer may see stats, else "???").
-        assertThat(FoWHelper.identityOrColorIfCanSeeStats(game, player, viewer, "UNFOGGED"))
-                .isEqualTo(player.getColorIfCanSeeStats(viewer));
-    }
-
-    @Test
-    void identityOrColorIfCanSeeStats_unfogged_returnsSuppliedRendering() {
+    void fogSafeTargetButton_perViewer_unfogged_usesShortNameAndEmoji() {
         game.setFowMode(false);
         Player viewer = game.addPlayer("viewer-id", "hacan");
-        assertThat(FoWHelper.identityOrColorIfCanSeeStats(game, player, viewer, "UNFOGGED"))
-                .isEqualTo("UNFOGGED");
+        Button button = FoWHelper.fogSafeTargetButton("target_" + player.getFaction(), "gray", player, viewer);
+        assertThat(button.getLabel()).isEqualTo(player.getFactionModel().getShortName());
+        assertThat(button.getEmoji()).isNotNull();
     }
 
     @Test
@@ -151,15 +96,7 @@ void fogSafeTargetButton_perViewer_fogged_usesColorIfCanSeeStatsAndNoEmoji() {
         viewer.setColor("blue");
         Button button = FoWHelper.fogSafeTargetButton("target_" + player.getFaction(), "gray", player, viewer);
         assertThat(button.getLabel()).isEqualTo(player.getColorIfCanSeeStats(viewer));
+        // Per-viewer button drops the icon entirely so it can't leak color to someone who can't see it.
         assertThat(button.getEmoji()).isNull();
     }
-
-    @Test
-    void fogSafeTargetButton_perViewer_unfogged_usesShortNameAndEmoji() {
-        game.setFowMode(false);
-        Player viewer = game.addPlayer("viewer-id", "hacan");
-        Button button = FoWHelper.fogSafeTargetButton("target_" + player.getFaction(), "gray", player, viewer);
-        assertThat(button.getLabel()).isEqualTo(player.getFactionModel().getShortName());
-        assertThat(button.getEmoji()).isNotNull();
-    }
 }

From 9a3f84bae4f71d7b5fb259bef7672fdff34689dc Mon Sep 17 00:00:00 2001
From: Stabar-ti <stabarrabats@gmail.com>
Date: Mon, 27 Jul 2026 11:18:40 +0200
Subject: [PATCH 5/5] redundent spotless error fix

---
 src/main/java/ti4/helpers/ButtonHelperAgents.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/java/ti4/helpers/ButtonHelperAgents.java b/src/main/java/ti4/helpers/ButtonHelperAgents.java
index d3c78478e1..f3170acc56 100644
--- a/src/main/java/ti4/helpers/ButtonHelperAgents.java
+++ b/src/main/java/ti4/helpers/ButtonHelperAgents.java
@@ -2335,12 +2335,13 @@ private static void resolveKyroAgentStep2(Player kyro, Game game, ButtonInteract
         String msg = player.getFactionEmojiOrColor() + " replenished commodities due to "
                 + (kyro.hasUnexhaustedLeader("yssarilagent") ? "Clever Clever " : "") + "Tox, the Kyro"
                 + (kyro.hasUnexhaustedLeader("yssarilagent") ? "/Yssaril" : "") + " agent.";
-        player.setCommodities(player.getCommodities() + player.getCommoditiesTotal());
+        int commoditiesTotal = player.getCommoditiesTotal();
+        player.setCommodities(player.getCommodities() + commoditiesTotal);
         ButtonHelper.resolveMinisterOfCommerceCheck(game, player, event);
         cabalAgentInitiation(game, player);
         FoWHelper.notifyPlayerAndAffectedInFog(game, player, kyro, msg);
 
-        int infAmount = player.getCommoditiesTotal() - 1;
+        int infAmount = commoditiesTotal - 1;
         List<Button> buttons = new ArrayList<>(
                 Helper.getPlanetPlaceUnitButtons(kyro, game, infAmount + "gf", "placeOneNDone_skipbuild"));
         String message = kyro.getRepresentationUnfogged() + ", please choose the planet you wish to drop " + infAmount