diff --git a/src/main/java/com/bbn/hadder/commands/misc/GitHubCommand.java b/src/main/java/com/bbn/hadder/commands/misc/GitHubCommand.java index 42fa95d..906798e 100644 --- a/src/main/java/com/bbn/hadder/commands/misc/GitHubCommand.java +++ b/src/main/java/com/bbn/hadder/commands/misc/GitHubCommand.java @@ -67,12 +67,15 @@ public class GitHubCommand implements Command { event.getTextChannel().sendMessage( event.getMessageEditor().getMessage( MessageEditor.MessageType.ERROR, - "", + "commands.misc.github.api.error.title", "commands.misc.github.api.error.description") .build() ).queue(); } catch (JSONException e) { - event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.WARNING, "","commands.misc.github.user.error.description").build()).queue(); + event.getTextChannel().sendMessage(event.getMessageEditor().getMessage( + MessageEditor.MessageType.ERROR, + "commands.misc.github.user.error.title", + "commands.misc.github.user.error.description").build()).queue(); } } } else { @@ -99,7 +102,7 @@ public class GitHubCommand implements Command { @Override public String usage() { - return "[GH-name]"; + return "[GH name]"; } @Override diff --git a/src/main/java/com/bbn/hadder/commands/misc/ScreenShareCommand.java b/src/main/java/com/bbn/hadder/commands/misc/ScreenShareCommand.java index 07381f7..6692306 100644 --- a/src/main/java/com/bbn/hadder/commands/misc/ScreenShareCommand.java +++ b/src/main/java/com/bbn/hadder/commands/misc/ScreenShareCommand.java @@ -16,21 +16,15 @@ public class ScreenShareCommand implements Command { @Override public void executed(String[] args, CommandEvent event) { if (args.length>0) { - if (args[0].matches("[0-9]*")&&args.length==1) { - for (VoiceChannel vc : event.getGuild().getVoiceChannels()) { - try { - if (vc.getIdLong() == Long.parseLong(args[0])) { - event.getChannel().sendMessage(event.getMessageEditor().getMessage( - MessageEditor.MessageType.INFO, - "commands.misc.screenshare.success.title", "") - .setDescription("http://discordapp.com/channels/" + event.getGuild().getId() + "/" + vc.getId() + "/").build()).queue(); - return; - } - } catch (NumberFormatException e) { - event.getChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, "commands.misc.screenshare.id.error.title", "commands.misc.screenshare.id.error.description").build()).queue(); - event.getHelpCommand().sendHelp(this, event); - return; - } + if (args[0].matches("[0-9]*") && args.length==1 && args[0].length() == 18) { + if (event.getGuild().getVoiceChannelById(args[0]) != null) { + event.getChannel().sendMessage(event.getMessageEditor().getMessage( + MessageEditor.MessageType.INFO, + "commands.misc.screenshare.success.title", "") + .setDescription("http://discordapp.com/channels/" + event.getGuild().getId() + "/" + args[0] + "/").build()).queue(); + } else { + event.getChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, "commands.misc.screenshare.id.error.title", "commands.misc.screenshare.id.error.description").build()).queue(); + event.getHelpCommand().sendHelp(this, event); } } else { List vcs = event.getGuild().getVoiceChannelsByName(String.join(" ", args), true); @@ -48,7 +42,6 @@ public class ScreenShareCommand implements Command { event.getChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, "commands.misc.screenshare.success.title", "") .setDescription("http://discordapp.com/channels/" + event.getGuild().getId() + "/" + vcs.get(i).getId() + "/").build()).queue(); } else { - event.getChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, "commands.misc.screenshare.number.error.title", "").build()).queue(); event.getHelpCommand().sendHelp(this, event); } diff --git a/src/main/java/com/bbn/hadder/commands/moderation/InviteDetectCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/InviteDetectCommand.java index 7dd147b..fb3c7a1 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/InviteDetectCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/InviteDetectCommand.java @@ -52,6 +52,8 @@ public class InviteDetectCommand implements Command { .build()).queue(); } break; + default: + event.getHelpCommand().sendHelp(this, event); } } else { event.getHelpCommand().sendHelp(this, event); diff --git a/src/main/java/com/bbn/hadder/commands/moderation/RegionChangeCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/RegionChangeCommand.java index f6bd71b..95f7fff 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/RegionChangeCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/RegionChangeCommand.java @@ -18,7 +18,7 @@ public class RegionChangeCommand implements Command { @Override public void executed(String[] args, CommandEvent event) { if (args.length == 1) { - if (event.getMember().hasPermission(Permission.MANAGE_SERVER) || event.getConfig().getOwners().toString().contains(event.getAuthor().getId())) { + if (event.getGuild().getSelfMember().hasPermission(Permission.MANAGE_SERVER)) { switch (args[0].toLowerCase()) { case "amsterdam": setRegion(Region.AMSTERDAM, "Amsterdam", event); @@ -74,7 +74,7 @@ public class RegionChangeCommand implements Command { case "us-south": setRegion(Region.US_SOUTH, "US South", event); break; - case "list": + default: event.getTextChannel().sendMessage( event.getMessageEditor().getMessage( MessageEditor.MessageType.INFO, diff --git a/src/main/java/com/bbn/hadder/commands/moderation/RoleCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/RoleCommand.java index 7dedf44..b5049ec 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/RoleCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/RoleCommand.java @@ -15,10 +15,8 @@ public class RoleCommand implements Command { @Override public void executed(String[] args, CommandEvent event) { if (args.length > 0) { - if (event.getMember().hasPermission(Permission.MANAGE_ROLES)) { - - String action = args[0].toLowerCase(); - switch (action) { + if (event.getGuild().getSelfMember().hasPermission(Permission.MANAGE_ROLES)) { + switch (args[0].toLowerCase()) { case "add": if (event.getMessage().getMentionedMembers().size() > 0 && event.getMessage().getMentionedRoles().size() > 0) { for (Member member : event.getMessage().getMentionedMembers()) { @@ -66,7 +64,7 @@ public class RoleCommand implements Command { event.getMessageEditor().getMessage( MessageEditor.MessageType.INFO, "commands.moderation.role.remove.success.title", - "✅", + "", "", "commands.moderation.role.remove.success.description", String.valueOf(event.getMessage().getMentionedRoles().size()), @@ -74,6 +72,9 @@ public class RoleCommand implements Command { .build()).queue(); } break; + default: + event.getHelpCommand().sendHelp(this, event); + break; } } else { event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue(); diff --git a/src/main/java/com/bbn/hadder/commands/music/QueueCommand.java b/src/main/java/com/bbn/hadder/commands/music/QueueCommand.java index dea68a1..cb96e27 100644 --- a/src/main/java/com/bbn/hadder/commands/music/QueueCommand.java +++ b/src/main/java/com/bbn/hadder/commands/music/QueueCommand.java @@ -28,7 +28,8 @@ public class QueueCommand implements Command { } event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, "commands.music.queue.success.title", "", - "commands.music.queue.success.description", builder.toString()).build()).queue(); + "commands.music.queue.success.description", builder.toString()) + .build()).queue(); } } diff --git a/src/main/java/com/bbn/hadder/utils/MessageEditor.java b/src/main/java/com/bbn/hadder/utils/MessageEditor.java index 81b94c2..47fc105 100644 --- a/src/main/java/com/bbn/hadder/utils/MessageEditor.java +++ b/src/main/java/com/bbn/hadder/utils/MessageEditor.java @@ -113,8 +113,6 @@ public class MessageEditor { return this.handle(rethink.getLanguage(user.getId()), string, extra, extra_two); } - - private String handle(String language_code, String string, String extra, String extra_two) { Locale locale = new Locale(language_code); ResourceBundle resourceBundle = ResourceBundle.getBundle("Translations/Translations", locale); diff --git a/src/main/resources/Translations/Translations_en.properties b/src/main/resources/Translations/Translations_en.properties index 2b77714..f958c88 100644 --- a/src/main/resources/Translations/Translations_en.properties +++ b/src/main/resources/Translations/Translations_en.properties @@ -70,8 +70,10 @@ commands.misc.github.success.repositories = Public repositories commands.misc.github.success.gists = Public gists commands.misc.github.success.followers = Followers commands.misc.github.success.following = Following +commands.misc.github.api.error.title = API error commands.misc.github.api.error.description = The GitHub API might be down at the moment\! -commands.misc.github.user.error.description = This user does not exist\! +commands.misc.github.user.error.title = User doesn't exist +commands.misc.github.user.error.description = I can not find a user named like this\! commands.misc.github.connect.title = Connect your GH account commands.misc.github.connect.description = [Please connect your GitHub account here]%extra% commands.misc.github.help.description = Displays information about a GitHub user profile. @@ -243,7 +245,6 @@ 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 = commands.owner.guildleave.success.title = Successfully left commands.owner.guildleave.success.description = I successfully left %extra%. commands.owner.guildleave.error.title = Can not leave @@ -258,7 +259,6 @@ 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 = 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.