greg6775/Hadder
1
0
Fork 0
Code Issues 9 Pull requests 5 Projects Releases 54 Packages Wiki Activity Actions

Eval Command fix

Browse source
This commit is contained in:
GregTCLTK 2019-12-02 08:43:48 +01:00
parent 40e4215d60
commit 79c6e5ddee
No known key found for this signature in database
GPG key ID: A91BADE5C070FF67
1 changed files with 15 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/main/java/com/bbn/hadder/commands/owner/EvalCommand.java
View file

@ -8,14 +8,12 @@ import com.bbn.hadder.Hadder;
import com.bbn.hadder.commands.Command; import com.bbn.hadder.commands.Command;
import com.bbn.hadder.commands.CommandEvent; import com.bbn.hadder.commands.CommandEvent;
import com.bbn.hadder.utils.MessageEditor; import com.bbn.hadder.utils.MessageEditor;
import net.dv8tion.jda.api.EmbedBuilder;
import javax.script.ScriptEngine; import javax.script.ScriptEngine;
import javax.script.ScriptEngineManager; import javax.script.ScriptEngineManager;
import javax.script.ScriptException; import javax.script.ScriptException;
import java.util.concurrent.Executors; import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
public class EvalCommand implements Command { public class EvalCommand implements Command {
@ -46,11 +44,10 @@ public class EvalCommand implements Command {
ScheduledExecutorService service = Executors.newScheduledThreadPool(1); ScheduledExecutorService service = Executors.newScheduledThreadPool(1);
ScheduledFuture<?> future = service.schedule(() -> { service.schedule(() -> {
long startExec = System.currentTimeMillis(); long startExec = System.currentTimeMillis();
Object out = null; Object out;
EmbedBuilder builder = new EmbedBuilder();
try { try {
String script = ""; String script = "";
@ -58,17 +55,22 @@ public class EvalCommand implements Command {
args[i] = args[i].replace("```java", "").replace("```", ""); args[i] = args[i].replace("```java", "").replace("```", "");
script += i == args.length-1 ? args[i]:args[i]+" "; script += i == args.length-1 ? args[i]:args[i]+" ";
} }
builder.addField("Input", "```java\n\n" + script + "```", false);
out = engine.eval(script); out = engine.eval(script);
builder.addField("Output", "```java\n\n" + out.toString() + "```", false);
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO)
.setTitle("Eval Command")
.addField("Input", "```java\n\n" + script + "```", false)
.addField("Output", "```java\n\n" + out.toString() + "```", false)
.addField("Timing", System.currentTimeMillis()-startExec + " milliseconds", false)
.build()).queue();
} catch (Exception ex) { } catch (Exception ex) {
builder.addField("Error", "```java\n\n" + ex.getMessage() + "```", false); event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO)
} .setTitle("Eval Command")
.addField("Error", "```java\n\n" + ex.getMessage() + "```", false)
.addField("Timing", System.currentTimeMillis()-startExec + " milliseconds", false)
.build()).queue();
builder.addField("Timing", System.currentTimeMillis()-startExec + " milliseconds", false); }
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO).setTitle("Eval Command").build()).queue();
service.shutdownNow(); service.shutdownNow();
@ -89,7 +91,7 @@ public class EvalCommand implements Command {
@Override @Override
public String description() { public String description() {
return "You know what a eval command is ;)"; return "Execute the given code";
} }
@Override @Override