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

Merge pull request #203 from BigBotNetwork/greg-dev

Browse source 
Greg dev
This commit is contained in:
Skidder 2019-12-13 13:33:53 +01:00 • committed by GitHub
commit 5903f9efb0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 53 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -59,16 +59,16 @@ public class EvalCommand implements Command {
out = engine.eval(script);
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)
.setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.owner.eval.success.title"))
.addField(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.owner.eval.success.input"), "```java\n\n" + script + "```", false)
.addField(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.owner.eval.success.output"), "```java\n\n" + out.toString() + "```", false)
.addField(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.owner.eval.success.timing"), System.currentTimeMillis()-startExec + " milliseconds", false)
.build()).queue();
} catch (Exception ex) {
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)
.setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.owner.eval.success.title"))
.addField(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "error"), "```java\n\n" + ex.getMessage() + "```", false)
.addField(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.owner.eval.success.timing"), System.currentTimeMillis()-startExec + " milliseconds", false)
.build()).queue();
}
@ -92,11 +92,11 @@ public class EvalCommand implements Command {
@Override
public String description() {
return "Execute the given code";
return MessageEditor.handle("en", "commands.owner.eval.help.description");
}
@Override
public String usage() {
return "<Code to execute>";
return MessageEditor.handle("en", "commands.owner.eval.help.usage");
}
}

8
src/main/java/com/bbn/hadder/commands/owner/GuildLeaveCommand.java
View file

@ -18,8 +18,8 @@ public class GuildLeaveCommand implements Command {
Guild guild = event.getJDA().getGuildById(args[0]);
guild.leave().queue();
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO)
.setTitle("Successfully left")
.setDescription("I successfully left " + guild.getName())
.setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.owner.guildleave.success.title"))
.setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.owner.guildleave.success.description", guild.getName()))
.build()).queue();
} else {
event.getHelpCommand().sendHelp(this, event);
@ -36,11 +36,11 @@ public class GuildLeaveCommand implements Command {
@Override
public String description() {
return "Quit from a guild";
return MessageEditor.handle("en", "commands.owner.guildleave.help.description");
}
@Override
public String usage() {
return "<Guild-ID>";
return MessageEditor.handle("en", "guildid");
}
}

2
src/main/java/com/bbn/hadder/commands/owner/RebootCommand.java
View file

@ -27,7 +27,7 @@ public class RebootCommand implements Command {
@Override
public String description() {
return "Restart the bot";
return MessageEditor.handle("en", "commands.owner.reboot.help.description");
}
@Override

2
src/main/java/com/bbn/hadder/commands/owner/ShutdownCommand.java
View file

@ -29,7 +29,7 @@ public class ShutdownCommand implements Command {
@Override
public String description() {
return "Shuts the Bot down";
return MessageEditor.handle("en", "commands.owner.shutdown.help.description");
}
@Override

5
src/main/java/com/bbn/hadder/commands/owner/TestCommand.java
View file

@ -2,6 +2,7 @@ package com.bbn.hadder.commands.owner;
import com.bbn.hadder.commands.Command;
import com.bbn.hadder.commands.CommandEvent;
import com.bbn.hadder.utils.MessageEditor;
/*
* @author Skidder / GregTCLTK
@ -11,7 +12,7 @@ public class TestCommand implements Command {
@Override
public void executed(String[] args, CommandEvent event) {
event.getTextChannel().sendMessage("TEST my friends").queue();
event.getTextChannel().sendMessage(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.owner.test.success")).queue();
}
@Override
@ -21,7 +22,7 @@ public class TestCommand implements Command {
@Override
public String description() {
return "Just a little Test Command";
return MessageEditor.handle("en", "commands.owner.test.help.description");
}
@Override

8
src/main/java/com/bbn/hadder/commands/settings/LanguageCommand.java
View file

@ -44,8 +44,8 @@ public class LanguageCommand implements Command {
public void setLanguage(String language_code, String language , CommandEvent event) {
event.getRethink().setLanguage(event.getAuthor().getId(), language_code);
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO)
.setTitle("Language set")
.setDescription(language + " is your new language now.")
.setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.settings.language.success.title"))
.setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.settings.language.success.description", language))
.build()).queue();
}
@ -56,11 +56,11 @@ public class LanguageCommand implements Command {
@Override
public String description() {
return "Sets the new primary language for a user.";
return MessageEditor.handle("en", "commands.settings.language.help.description");
}
@Override
public String usage() {
return "<Language code>";
return MessageEditor.handle("en", "commands.settings.language.help.usage");
}
}

9
src/main/java/com/bbn/hadder/commands/settings/PrefixCommand.java
View file

@ -14,7 +14,10 @@ public class PrefixCommand implements Command {
public void executed(String[] args, CommandEvent event) {
if (args.length == 1) {
event.getRethink().setUserPrefix(args[0], event.getAuthor().getId());
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO).setTitle("✅ Successfully set ✅").setDescription("I successfully set the new prefix for you to " + args[0]).build()).queue();
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO)
.setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.settings.prefix.success.title"))
.setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.settings.prefix.success.description", args[0]))
.build()).queue();
} else {
event.getHelpCommand().sendHelp(this, event);
}
@ -27,11 +30,11 @@ public class PrefixCommand implements Command {
@Override
public String description() {
return "Sets a new Prefix";
return MessageEditor.handle("en", "commands.settings.prefix.help.description");
}
@Override
public String usage() {
return "<New Prefix>";
return MessageEditor.handle("en", "prefix");
}
}

25
src/main/resources/Translations/Translations_en.properties
View file

@ -12,9 +12,11 @@ searchterm = <SearchTerm>
username = <Username>
number = <Number>
guildprefix = <New Guild-Prefix>
prefix = <New Prefix>
vc-name/id = <VoiceChannelID|VoiceChannelName>
user+nickname = <@user> <New Nickname>
region = <region>
guildid = <Guild-ID>
error = Error
none = None
@ -190,3 +192,26 @@ commands.nsfw.randomporn.help.description = Shows a completely random porn gif.
commands.nsfw.solo.help.description = Shows a random solo gif.
commands.nsfw.spank.help.description = Shows a random spank gif.
commands.nsfw.trans.help.description = Shows a random trans picture.
commands.owner.eval.success.title = Eval Command
commands.owner.eval.success.input = Input
commands.owner.eval.success.output = Output
commands.owner.eval.success.timing = Timing
commands.owner.eval.help.description = Execute the given code
commands.owner.eval.help.usage = <Code to execute>
commands.owner.guildleave.success.title = Successfully left
commands.owner.guildleave.success.description = I successfully left %extra%.
commands.owner.guildleave.help.description = Quit from a guild
commands.owner.reboot.help.description = Restart the bot
commands.owner.shutdown.success.title = Shutdown
commands.owner.shutdown.help.description = Shuts the Bot down
commands.owner.test.success = TEST my friends
commands.owner.test.help.description = Just a little Test Command
commands.settings.language.success.title = Language set
commands.settings.language.success.description = %extra% is your new language now.
commands.settings.language.help.description = Sets the new primary language for a user.
commands.settings.language.help.usage = <Language code>
commands.settings.prefix.success.title = %extra% Successfully set %extra%
commands.settings.prefix.success.description = I successfully set the new prefix for you to %extra%.
commands.settings.prefix.help.description = Sets a new Prefix