From bb1fc6da4add414b105945442e540e6df326864a Mon Sep 17 00:00:00 2001 From: Pingex Date: Thu, 26 May 2016 13:07:40 +0200 Subject: [PATCH] Can choose whether a command output should be displayed as code (ie. "```") or not. --- src/main/java/net/pingex/discordbot/Command.java | 5 +++++ src/main/java/net/pingex/discordbot/CommandDispatcher.java | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/pingex/discordbot/Command.java b/src/main/java/net/pingex/discordbot/Command.java index 329e465..4031ecb 100644 --- a/src/main/java/net/pingex/discordbot/Command.java +++ b/src/main/java/net/pingex/discordbot/Command.java @@ -33,4 +33,9 @@ public @interface Command * Arguments that are required, or not. `true` for a required field, `false` for a not required one. */ boolean[] required() default {}; + + /** + * Should the output be embraced with "```" ? + */ + boolean codeOutput() default true; } diff --git a/src/main/java/net/pingex/discordbot/CommandDispatcher.java b/src/main/java/net/pingex/discordbot/CommandDispatcher.java index 9a3664c..f32bdc2 100644 --- a/src/main/java/net/pingex/discordbot/CommandDispatcher.java +++ b/src/main/java/net/pingex/discordbot/CommandDispatcher.java @@ -154,7 +154,7 @@ class CommandDispatcher try { String ans = (String) commandList.get(finalFullCommand).invoke(finalParsedArray); - if(ans != null) event.getMessage().getChannel().sendMessage("```\n" + ans + "\n```"); + if(ans != null) event.getMessage().getChannel().sendMessage(commandList.get(finalFullCommand).getMethod().getAnnotation(Command.class).codeOutput() ? "```\n" + ans + "\n```" : ans); } catch (IllegalArgumentException | IllegalAccessException e) { logger.severe("Couldn't call target method (" + e.getClass().getName() + "): " + e.getMessage());