From 1bde79cd6f0f3a21ac08ad2316be37a8e23143b3 Mon Sep 17 00:00:00 2001
From: nossr50 <nossr50@gmail.com>
Date: Wed, 10 Feb 2021 10:05:42 -0800
Subject: [PATCH] add toggle for sending chat messages to console Fixes #4415

---
 Changelog.txt                                               | 1 +
 .../java/com/gmail/nossr50/chat/mailer/AdminChatMailer.java | 3 ++-
 .../com/gmail/nossr50/chat/message/PartyChatMessage.java    | 4 +++-
 src/main/java/com/gmail/nossr50/config/ChatConfig.java      | 6 ++++++
 src/main/resources/chat.yml                                 | 2 ++
 5 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/Changelog.txt b/Changelog.txt
index 97bff3199..23ac1bb42 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -1,4 +1,5 @@
 Version 2.1.175
+    Added a setting to chat.yml to toggle sending party or admin chat messages to console
     Added a set of "mastery" subskills meant for end game progression
     Added the mastery subskill 'Mother Lode' to Mining
     Added the mastery subskill 'Clean Cuts' to Woodcutting
diff --git a/src/main/java/com/gmail/nossr50/chat/mailer/AdminChatMailer.java b/src/main/java/com/gmail/nossr50/chat/mailer/AdminChatMailer.java
index de922e56a..8498e518f 100644
--- a/src/main/java/com/gmail/nossr50/chat/mailer/AdminChatMailer.java
+++ b/src/main/java/com/gmail/nossr50/chat/mailer/AdminChatMailer.java
@@ -3,6 +3,7 @@ package com.gmail.nossr50.chat.mailer;
 import com.gmail.nossr50.chat.author.Author;
 import com.gmail.nossr50.chat.message.AdminChatMessage;
 import com.gmail.nossr50.chat.message.ChatMessage;
+import com.gmail.nossr50.config.ChatConfig;
 import com.gmail.nossr50.datatypes.chat.ChatChannel;
 import com.gmail.nossr50.events.chat.McMMOAdminChatEvent;
 import com.gmail.nossr50.events.chat.McMMOChatEvent;
@@ -44,7 +45,7 @@ public class AdminChatMailer extends AbstractChatMailer {
     public @NotNull Predicate<CommandSender> predicate() {
         return (commandSender) -> commandSender.isOp()
                 || commandSender.hasPermission(MCMMO_CHAT_ADMINCHAT_PERMISSION)
-                || commandSender instanceof ConsoleCommandSender;
+                || (ChatConfig.getInstance().isConsoleIncludedInAudience(ChatChannel.ADMIN) && commandSender instanceof ConsoleCommandSender);
     }
 
     /**
diff --git a/src/main/java/com/gmail/nossr50/chat/message/PartyChatMessage.java b/src/main/java/com/gmail/nossr50/chat/message/PartyChatMessage.java
index 4c143ec69..756c3d457 100644
--- a/src/main/java/com/gmail/nossr50/chat/message/PartyChatMessage.java
+++ b/src/main/java/com/gmail/nossr50/chat/message/PartyChatMessage.java
@@ -1,6 +1,7 @@
 package com.gmail.nossr50.chat.message;
 
 import com.gmail.nossr50.chat.author.Author;
+import com.gmail.nossr50.config.ChatConfig;
 import com.gmail.nossr50.datatypes.chat.ChatChannel;
 import com.gmail.nossr50.datatypes.party.Party;
 import com.gmail.nossr50.datatypes.player.McMMOPlayer;
@@ -51,7 +52,8 @@ public class PartyChatMessage extends AbstractChatMessage {
         messagePartyChatSpies(spyMessage);
 
         //Console message
-        mcMMO.p.getChatManager().sendConsoleMessage(author, spyMessage);
+        if(ChatConfig.getInstance().isConsoleIncludedInAudience(ChatChannel.PARTY))
+            mcMMO.p.getChatManager().sendConsoleMessage(author, spyMessage);
     }
 
     /**
diff --git a/src/main/java/com/gmail/nossr50/config/ChatConfig.java b/src/main/java/com/gmail/nossr50/config/ChatConfig.java
index 1440194fc..884ca4721 100644
--- a/src/main/java/com/gmail/nossr50/config/ChatConfig.java
+++ b/src/main/java/com/gmail/nossr50/config/ChatConfig.java
@@ -49,6 +49,12 @@ public class ChatConfig extends AutoUpdateConfigLoader {
         return config.getBoolean(key, true);
     }
 
+    public boolean isConsoleIncludedInAudience(@NotNull ChatChannel chatChannel) {
+        String key = "Chat.Channels." + StringUtils.getCapitalized(chatChannel.toString()) + ".Send_To_Console";
+        return config.getBoolean(key, true);
+    }
+
+
     public boolean isSpyingAutomatic() {
         return config.getBoolean("Chat.Channels.Party.Spies.Automatically_Enable_Spying", false);
     }
diff --git a/src/main/resources/chat.yml b/src/main/resources/chat.yml
index 6fa5ecf88..ab93387b7 100644
--- a/src/main/resources/chat.yml
+++ b/src/main/resources/chat.yml
@@ -8,10 +8,12 @@ Chat:
             Enable: true
             # Whether or not to use the current display name of a player
             Use_Display_Names: true
+            Send_To_Console: true
             Spies:
                 # Whether or not players with the chat spy permission join the server with chat spying toggled on
                 Automatically_Enable_Spying: false
         Admin:
+            Send_To_Console: true
             # Enable or disable admin chat
             Enable: true
             # Whether or not to use the current display name of a player