Add emoji prefix for different alerts

Signed-off-by: applenick <[email protected]>

pom.xml

@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>tc.oc.occ</groupId>
 	<artifactId>Bolty</artifactId>
-	<version>1.0.0-SNAPSHOT</version>
+	<version>1.0.2-SNAPSHOT</version>
 	<name>Bolty</name>
 	<description>A minecraft to discord java plugin for Bolt</description>
 

src/main/java/tc/oc/occ/bolt/BotConfig.java

@@ -18,6 +18,11 @@ public class BotConfig {
 	private String reportFormat;
 	private String relayFormat;
 
+	private String reportPrefix;
+	private String autoKillPrefix;
+	private String matrixPrefix;
+	private String commandPrefix;
+
 	public BotConfig(Configuration config) {
 		reload(config);
 	}
@@ -35,6 +40,11 @@ public void reload(Configuration config) {
 
 		this.reportFormat = config.getString("report-format");
 		this.relayFormat = config.getString("relay-format");
+
+		this.reportPrefix = config.getString("prefix.report");
+		this.autoKillPrefix = config.getString("prefix.autokill");
+		this.matrixPrefix = config.getString("prefix.matrix");
+		this.commandPrefix = config.getString("prefix.command");
 	}
 
 	public boolean isEnabled() {
@@ -76,4 +86,20 @@ public String getRelayFormat() {
 	private String replaceServerName(String format) {
 		return format.replace("%server%", getServerName());
 	}
+
+	public String getReportPrefix() {
+		return reportPrefix;
+	}
+
+	public String getAutoKillPrefix() {
+		return autoKillPrefix;
+	}
+
+	public String getMatrixPrefix() {
+		return matrixPrefix;
+	}
+
+	public String getCommandPrefix() {
+		return commandPrefix;
+	}
 }

src/main/java/tc/oc/occ/bolt/BotListener.java

@@ -5,11 +5,13 @@
 
 import net.climaxmc.autokiller.events.AutoKillCheatEvent;
 import tc.oc.morpheus.NotifyCommandEvent;
+import tc.oc.occ.bolt.DiscordBot.RelayType;
 import tc.oc.pgm.community.events.PlayerReportEvent;
 
 public class BotListener implements Listener {
 
 	private final DiscordBot bot;
+
 	public BotListener(DiscordBot bot) {
 		this.bot = bot;
 	}
@@ -21,12 +23,12 @@ public void onPlayerReport(PlayerReportEvent event) {
 
 	@EventHandler
 	public void onAutoKillerViolation(AutoKillCheatEvent event) {
-		bot.sendRelay(event.getAlert());
+		bot.sendRelay(event.getAlert(), RelayType.AUTOKILL);
 	}
 
 	@EventHandler
 	public void onMorpheusNotify(NotifyCommandEvent event) {
-		bot.sendRelay(event.getCommand());
+		bot.sendRelay(event.getCommand(), RelayType.MATRIX);
 	}
 
 }

src/main/java/tc/oc/occ/bolt/DiscordBot.java

@@ -19,6 +19,10 @@ public DiscordBot(BotConfig config, Logger logger) {
 		this.logger = logger;
 		reload();
 	}
+
+	public BotConfig getConfig() {
+		return config;
+	}
 
 	public void enable() {
 		if(config.isEnabled()) {
@@ -70,13 +74,13 @@ public void sendReport(PlayerReportEvent event) {
 				.replace("%reporter%", reporter)
 				.replace("%reported%", reported)
 				.replace("%reason%", reason);
-		sendMessage(formatted);
+		sendMessage(config.getReportPrefix() + formatted);		
 	}
 
-	public void sendRelay(String message) {
+	public void sendRelay(String message, RelayType type) {
 		if(!config.isRelayCommand()) return;
 		String formatted = config.getRelayFormat().replace("%message%", message);
-		sendMessage(formatted);
+		sendMessage(getPrefix(type) + formatted);
 	}
 
 	public void reload() {
@@ -92,5 +96,22 @@ private String format(String text) {
 		text = ChatColor.stripColor(text);
 		return text;
 	}
+
+	public String getPrefix(RelayType type) {
+		switch(type) {
+		case AUTOKILL:
+			return config.getAutoKillPrefix();
+		case MATRIX:
+			return config.getMatrixPrefix();
+		default:
+			return config.getCommandPrefix();
+		}
+	}
+
+	public static enum RelayType {
+		AUTOKILL,
+		MATRIX,
+		COMMAND;
+	}
 
 }

src/main/java/tc/oc/occ/bolt/commands/BotCommands.java

@@ -8,6 +8,7 @@
 import co.aikar.commands.annotation.Dependency;
 import co.aikar.commands.annotation.Syntax;
 import tc.oc.occ.bolt.DiscordBot;
+import tc.oc.occ.bolt.DiscordBot.RelayType;
 
 public class BotCommands extends BaseCommand {
 
@@ -17,7 +18,7 @@ public class BotCommands extends BaseCommand {
 	@Syntax("[message] - Message to relay to discord")
 	@CommandPermission("bolt.bot")
 	public void relay(CommandSender sender, String message) {
-		bot.sendRelay(message);
+		bot.sendRelay(message, RelayType.COMMAND);
 	}
 
 }

src/main/resources/config.yml

@@ -19,11 +19,18 @@ types:
 # %reporter% - Player who issued report
 # %reported% - Player who has been reported
 # %reason%   - Reason for report
-report-format: "[%server%] %reporter% reported %reported%: %reason%"
+report-format: "[%server%] **%reporter% reported %reported%: %reason%**"
 
 # Relay - Command based (Used for AutoKiller and via /relay)
 #
 # Variables
 # %server%   - Server Name
 # %message%  - Message provided
-relay-format: "[%server%] %message%"
+relay-format: "[%server%] %message%"
+
+# Prefix - Emojis used as a prefix for different message types
+prefix:
+  report: ":loudspeaker: "
+  autokill: ":mouse_three_button: "
+  matrix: ":warning: "
+  command: ""