From f660a7b8a4212b9b49bc57f9ae5be1da8fce3e27 Mon Sep 17 00:00:00 2001 From: KingRainbow44 Date: Sat, 26 Aug 2023 21:14:36 -0400 Subject: [PATCH] Ensure sensitive information isn't shown without permission --- .../command/commands/InfoCommand.java | 38 +++++++++++++------ 1 file changed, 27 insertions(+), 11 deletions(-) diff --git a/src/main/java/emu/grasscutter/command/commands/InfoCommand.java b/src/main/java/emu/grasscutter/command/commands/InfoCommand.java index 41a0e9896..88dc785df 100644 --- a/src/main/java/emu/grasscutter/command/commands/InfoCommand.java +++ b/src/main/java/emu/grasscutter/command/commands/InfoCommand.java @@ -29,24 +29,40 @@ public final class InfoCommand implements CommandHandler { var questingEnabled = gameOptions.gameOptions.questing.enabled; var scriptsEnabled = gameOptions.enableScriptInBigWorld; - // TODO: Send to remote server (Grasscutter API) and send dump link. CommandHandler.sendMessage(sender, """ - Credits - - Slushy Team (akio, azzu, Areha11Fz, tamil) - - Yuki (resource minifying & packaging) - - Dimbreath (dumping most resources) + Created by Meledy + - currently maintained by KingRainbow44 + - formerly maintained by Birdulon + Other Credits + - Slushy Team (akio, azzu, Areha11Fz, tamil; protocol) + - Yuki (resource minifying & packaging) + - Dimbreath (dumping most resources)"""); + // TODO: Send to remote server (Grasscutter API) and send dump link. + if ( + sender == null + || sender.getAccount() + .hasPermission("grasscutter.command.troubleshoot") + || playerCount == 1 + ) { + CommandHandler.sendMessage(sender, """ Server Information Revision: %s Player Count: %d Questing Enabled: %s Scripts Enabled: %s Operating System: %s - Resource Information: %s""" - .formatted( - build, playerCount, questingEnabled, scriptsEnabled, - System.getProperty("os.name"), resourceInfo.toString() - ) - ); + Resource Information: %s + + discord.gg/T5vZU6UyeG""" + .formatted( + build, playerCount, questingEnabled, scriptsEnabled, + System.getProperty("os.name"), resourceInfo.toString() + ) + ); + } else { + CommandHandler.sendMessage(sender, """ + Grasscutter Discord: discord.gg/T5vZU6UyeG"""); + } } }