A lot of better code

This commit is contained in:
GregTCLTK 2020-02-20 20:58:15 +01:00
parent 40d6a6ab95
commit 4a7d6ea2d1
No known key found for this signature in database
GPG key ID: A91BADE5C070FF67
14 changed files with 18 additions and 46 deletions

View file

@ -74,9 +74,7 @@ public class ScreenShareCommand implements Command {
.setDescription("http://discordapp.com/channels/" + e.getGuild().getId() + "/" + vcs.get(0).getId() + "/").build()).queue(); .setDescription("http://discordapp.com/channels/" + e.getGuild().getId() + "/" + vcs.get(0).getId() + "/").build()).queue();
} }
} }
} else { } else e.getHelpCommand().sendHelp(this, e);
e.getHelpCommand().sendHelp(this, e);
}
} }
@Override @Override

View file

@ -58,8 +58,6 @@ public class BanCommand implements Command {
"commands.moderation.ban.error.title", "commands.moderation.ban.error.title",
"commands.moderation.ban.yourself.error.description").build()).queue(); "commands.moderation.ban.yourself.error.description").build()).queue();
} }
} else if (e.getMessage().getMentionedMembers().size() == 0) {
e.getHelpCommand().sendHelp(this, e);
} else if (e.getMessage().getMentionedMembers().size() > 1) { } else if (e.getMessage().getMentionedMembers().size() > 1) {
for (int i = 0; i < e.getMessage().getMentionedMembers().size(); i++) { for (int i = 0; i < e.getMessage().getMentionedMembers().size(); i++) {
Member member = e.getMessage().getMentionedMembers().get(i); Member member = e.getMessage().getMentionedMembers().get(i);
@ -89,7 +87,7 @@ public class BanCommand implements Command {
"", "",
"commands.moderation.ban.massban.success.description", "commands.moderation.ban.massban.success.description",
String.valueOf(e.getMessage().getMentionedMembers().size())).build()).queue(); String.valueOf(e.getMessage().getMentionedMembers().size())).build()).queue();
} } else e.getHelpCommand().sendHelp(this, e);
} }
@Override @Override

View file

@ -92,9 +92,7 @@ public class ClearCommand implements Command {
} else { } else {
e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue(); e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue();
} }
} else { } else e.getHelpCommand().sendHelp(this, e);
e.getHelpCommand().sendHelp(this, e);
}
} }
@Override @Override

View file

@ -69,9 +69,7 @@ public class InviteDetectCommand implements Command {
default: default:
e.getHelpCommand().sendHelp(this, e); e.getHelpCommand().sendHelp(this, e);
} }
} else { } else e.getHelpCommand().sendHelp(this, e);
e.getHelpCommand().sendHelp(this, e);
}
} }
@Override @Override

View file

@ -54,8 +54,6 @@ public class KickCommand implements Command {
} else { } else {
e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, "commands.moderation.kick.error.title", "commands.moderation.kick.yourself.error.description").build()).queue(); e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, "commands.moderation.kick.error.title", "commands.moderation.kick.yourself.error.description").build()).queue();
} }
} else if (e.getMessage().getMentionedMembers().size() == 0) {
e.getHelpCommand().sendHelp(this, e);
} else if (e.getMessage().getMentionedMembers().size() > 1) { } else if (e.getMessage().getMentionedMembers().size() > 1) {
for (int i = 0; i < e.getMessage().getMentionedMembers().size(); i++) { for (int i = 0; i < e.getMessage().getMentionedMembers().size(); i++) {
Member member = e.getMessage().getMentionedMembers().get(i); Member member = e.getMessage().getMentionedMembers().get(i);
@ -74,7 +72,7 @@ public class KickCommand implements Command {
} }
} }
e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, "commands.moderation.kick.success.title", "", "commands.moderation.kick.masskick.success.description", String.valueOf(e.getMessage().getMentionedMembers().size())).build()).queue(); e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, "commands.moderation.kick.success.title", "", "commands.moderation.kick.masskick.success.description", String.valueOf(e.getMessage().getMentionedMembers().size())).build()).queue();
} } else e.getHelpCommand().sendHelp(this, e);
} }
@Override @Override

View file

@ -54,9 +54,7 @@ public class NickCommand implements Command {
"commands.moderation.nick.success.description", e.getMessage().getMentionedMembers().get(0).getUser().getAsTag() "commands.moderation.nick.success.description", e.getMessage().getMentionedMembers().get(0).getUser().getAsTag()
).build()).queue(); ).build()).queue();
} }
} else { } else e.getHelpCommand().sendHelp(this, e);
e.getHelpCommand().sendHelp(this, e);
}
} else { } else {
e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue(); e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue();
} }
@ -81,9 +79,7 @@ public class NickCommand implements Command {
).build()).queue(); ).build()).queue();
} }
} }
} else if (e.getMessage().getMentionedMembers().size() == 0) { } else if (e.getMessage().getMentionedUsers().size() > 1) {
e.getHelpCommand().sendHelp(this, e);
} else {
for (int i = 0; i < e.getMessage().getMentionedMembers().size(); i++) { for (int i = 0; i < e.getMessage().getMentionedMembers().size(); i++) {
Member member = e.getMessage().getMentionedMembers().get(i); Member member = e.getMessage().getMentionedMembers().get(i);
if (!e.getJDA().getSelfUser().getId().equals(member.getId())) { if (!e.getJDA().getSelfUser().getId().equals(member.getId())) {
@ -99,7 +95,7 @@ public class NickCommand implements Command {
"", "",
"commands.moderation.nick.myself.success.description", String.valueOf(e.getMessage().getMentionedMembers().size()) "commands.moderation.nick.myself.success.description", String.valueOf(e.getMessage().getMentionedMembers().size())
).build()).queue(); ).build()).queue();
} } else e.getHelpCommand().sendHelp(this, e);
} else { } else {
e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue(); e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue();
} }

View file

@ -34,7 +34,7 @@ public class PrefixCommand implements Command {
e.getTextChannel().sendMessage(e.getMessageEditor().getMessage( e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(
MessageEditor.MessageType.INFO, MessageEditor.MessageType.INFO,
"commands.moderation.prefix.success.title", "commands.moderation.prefix.success.title",
"", "",
"commands.moderation.prefix.success.description", "commands.moderation.prefix.success.description",
args[0]).build() args[0]).build()
).queue(); ).queue();
@ -45,9 +45,7 @@ public class PrefixCommand implements Command {
"", "",
"commands.moderation.prefix.error.description").build()).queue(); "commands.moderation.prefix.error.description").build()).queue();
} }
} else { } else e.getHelpCommand().sendHelp(this, e);
e.getHelpCommand().sendHelp(this, e);
}
} }
@Override @Override

View file

@ -95,9 +95,7 @@ public class RoleCommand implements Command {
} else { } else {
e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue(); e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue();
} }
} else { } else e.getHelpCommand().sendHelp(this, e);
e.getHelpCommand().sendHelp(this, e);
}
} }
@Override @Override

View file

@ -39,12 +39,10 @@ public class StarboardCommand implements Command {
if (channel!=null) { if (channel!=null) {
e.getRethinkServer().setStarboard(channel.getId()); e.getRethinkServer().setStarboard(channel.getId());
} }
} else { } else e.getHelpCommand().sendHelp(this, e);
e.getHelpCommand().sendHelp(this, e);
}
} }
if (args.length==2) { if (args.length == 2) {
e.getRethinkServer().setNeededStars(args[1]); e.getRethinkServer().setNeededStars(args[1]);
} }

View file

@ -96,9 +96,7 @@ public class EvalCommand implements Command {
}, 0, TimeUnit.MILLISECONDS); }, 0, TimeUnit.MILLISECONDS);
} else { } else e.getHelpCommand().sendHelp(this, e);
e.getHelpCommand().sendHelp(this, e);
}
} }
@Override @Override

View file

@ -41,9 +41,7 @@ public class GuildLeaveCommand implements Command {
} catch (Exception ex) { } catch (Exception ex) {
e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, "commands.owner.guildleave.error.title", "", "commands.owner.guildleave.help.description", guild.getName()).build()).queue(); e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, "commands.owner.guildleave.error.title", "", "commands.owner.guildleave.help.description", guild.getName()).build()).queue();
} }
} else { } else e.getHelpCommand().sendHelp(this, e);
e.getHelpCommand().sendHelp(this, e);
}
} }
@Override @Override

View file

@ -54,9 +54,7 @@ public class LanguageCommand implements Command {
.build()).queue(); .build()).queue();
break; break;
} }
} else { } else e.getHelpCommand().sendHelp(this, e);
e.getHelpCommand().sendHelp(this, e);
}
} }
public void setLanguage(String language_code, String language, CommandEvent e) { public void setLanguage(String language_code, String language, CommandEvent e) {

View file

@ -32,9 +32,7 @@ public class UserPrefixCommand implements Command {
.build()) .build())
.queue(); .queue();
e.getRethinkUser().push(); e.getRethinkUser().push();
} else { } else e.getHelpCommand().sendHelp(this, e);
e.getHelpCommand().sendHelp(this, e);
}
} }
@Override @Override

View file

@ -323,6 +323,6 @@ commands.owner.blacklist.help.description = Blacklist a user for specific comman
commands.settings.language.success.title = Language set commands.settings.language.success.title = Language set
commands.settings.language.success.description = `%extra%` is your new language now. 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.description = Sets the new primary language for a user.
commands.settings.prefix.success.title = %extra% Successfully set %extra% commands.settings.prefix.success.title = Successfully set prefix
commands.settings.prefix.success.description = I successfully set the new prefix for you to `%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. commands.settings.prefix.help.description = Sets a new prefix.