From fbb6758cc82a9a4a21698bf7548ee9415a3deeb8 Mon Sep 17 00:00:00 2001 From: ChomeNS <95471003+ChomeNS@users.noreply.github.com> Date: Sun, 16 Jul 2023 14:39:02 +0700 Subject: [PATCH] improve (mabe) --- .../chomens_bot/plugins/LoggerPlugin.java | 29 +++++++++---------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/src/main/java/land/chipmunk/chayapak/chomens_bot/plugins/LoggerPlugin.java b/src/main/java/land/chipmunk/chayapak/chomens_bot/plugins/LoggerPlugin.java index abec66ab..c1eee260 100644 --- a/src/main/java/land/chipmunk/chayapak/chomens_bot/plugins/LoggerPlugin.java +++ b/src/main/java/land/chipmunk/chayapak/chomens_bot/plugins/LoggerPlugin.java @@ -74,24 +74,20 @@ public class LoggerPlugin extends ChatPlugin.Listener { return ComponentUtilities.stringifyAnsi(message); } - public void log (String _message) { + public void log (String message) { log(message, true, logToConsole); } + public void log (String _message, boolean logToFile, boolean logToConsole) { final String message = prefix(Component.text("Log").color(NamedTextColor.GOLD), _message); if (logToConsole) bot.console.reader.printAbove(message); + else if (logToFile) { + final String formattedMessage = String.format( + "[%s] %s", + bot.host + ":" + bot.port, + _message + ); - - final String formattedMessage = String.format( - "[%s] %s", - bot.host + ":" + bot.port, - _message - ); - - FileLoggerUtilities.log( - formattedMessage.replaceAll( // use replaceAll for regexes, use replace for normal string - "\u001B\\[[;\\d]*[ -/]*[@-~]", - "" - ) - ); + FileLoggerUtilities.log(formattedMessage); + } } public void info (String _message) { @@ -108,7 +104,10 @@ public class LoggerPlugin extends ChatPlugin.Listener { @Override public void systemMessageReceived(Component component) { + final String stringMessage = ComponentUtilities.stringify(component); final String ansiMessage = ComponentUtilities.stringifyAnsi(component); - log(ansiMessage); + + log(ansiMessage, false, true); + log(stringMessage, true, false); } }