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

A lot of better code

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/com/bbn/hadder/commands/misc/ScreenShareCommand.java
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();
}
}
} else {
e.getHelpCommand().sendHelp(this, e);
}
} else e.getHelpCommand().sendHelp(this, e);
}
@Override

4
src/main/java/com/bbn/hadder/commands/moderation/BanCommand.java
View file

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

4
src/main/java/com/bbn/hadder/commands/moderation/ClearCommand.java
View file

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

4
src/main/java/com/bbn/hadder/commands/moderation/InviteDetectCommand.java
View file

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

4
src/main/java/com/bbn/hadder/commands/moderation/KickCommand.java
View file

@ -54,8 +54,6 @@ public class KickCommand implements Command {
} else {
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) {
for (int i = 0; i < e.getMessage().getMentionedMembers().size(); 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();
}
} else e.getHelpCommand().sendHelp(this, e);
}
@Override

10
src/main/java/com/bbn/hadder/commands/moderation/NickCommand.java
View file

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

6
src/main/java/com/bbn/hadder/commands/moderation/PrefixCommand.java
View file

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

4
src/main/java/com/bbn/hadder/commands/moderation/RoleCommand.java
View file

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

6
src/main/java/com/bbn/hadder/commands/moderation/StarboardCommand.java
View file

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

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

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

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

@ -41,9 +41,7 @@ public class GuildLeaveCommand implements Command {
} 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();
}
} else {
e.getHelpCommand().sendHelp(this, e);
}
} else e.getHelpCommand().sendHelp(this, e);
}
@Override

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

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

4
src/main/java/com/bbn/hadder/commands/settings/UserPrefixCommand.java
View file

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

2
src/main/resources/Translations/Translations_en.properties
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.description = `%extra%` is your new language now.
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.help.description = Sets a new prefix.