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

Coldfix #183

Merged
greg6775 merged 10 commits from greg-dev into master 2019-12-09 08:15:07 +01:00
Conversation 0 Commits 10 Files changed 22 +26 -26
16 changed files with 26 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit ab752205e0 - Show all commits

2
src/main/java/com/bbn/hadder/commands/fun/AvatarCommand.java
View file

@ -35,7 +35,7 @@ public class AvatarCommand implements Command {
.setFooter(member.getUser().getAsTag())
.build()).queue();
} else {
event.getHelpCommand().sendHelp(this , event.getRethink(), event.getAuthor(), event.getTextChannel());
event.getHelpCommand().sendHelp(this, event);
}
}

2
src/main/java/com/bbn/hadder/commands/fun/GifCommand.java
View file

@ -39,7 +39,7 @@ public class GifCommand implements Command {
} catch (Exception e) {
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.ERROR).setTitle("Error").setDescription("Please try again with another term.").build()).queue();
}
} else event.getHelpCommand().sendHelp(this, event.getRethink(), event.getAuthor(), event.getTextChannel());
} else event.getHelpCommand().sendHelp(this, event);
}
@Override

10
src/main/java/com/bbn/hadder/commands/general/HelpCommand.java
View file

@ -48,7 +48,7 @@ public class HelpCommand implements Command {
for (Command cmd : event.getCommandHandler().getCommandList()) {
for (String label : cmd.labels()) {
if (label.equalsIgnoreCase(args[0])) {
sendHelp(cmd, event.getRethink(), event.getAuthor(), event.getTextChannel());
sendHelp(cmd, event);
}
}
}
@ -58,15 +58,15 @@ public class HelpCommand implements Command {
}
}
public void sendHelp(Command cmd, Rethink rethink, User author, TextChannel channel) {
public void sendHelp(Command cmd, CommandEvent event) {
if (!cmd.getClass().getPackageName().endsWith("owner") || (cmd.getClass().getPackageName().endsWith("owner") &&
(author.getId().equals("477141528981012511") || author.getId().equals("261083609148948488")))) {
(event.getAuthor().getId().equals("477141528981012511") || event.getAuthor().getId().equals("261083609148948488")))) {
EmbedBuilder eb = new EmbedBuilder();
String name = cmd.labels()[0];
eb.setDescription(cmd.description()).setTitle(name.replaceFirst(String.valueOf(name.charAt(0)), String.valueOf(name.charAt(0)).toUpperCase()));
eb.addField("Usage", rethink.getUserPrefix(author.getId()) + cmd.labels()[0] + " " + cmd.usage(), false);
eb.addField("Usage", event.getRethink().getUserPrefix(event.getAuthor().getId()) + cmd.labels()[0] + " " + cmd.usage(), false);
new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO);
channel.sendMessage(eb.build()).queue();
event.getChannel().sendMessage(eb.build()).queue();
}
}

10
src/main/java/com/bbn/hadder/commands/misc/ScreenShareCommand.java
View file

@ -27,7 +27,7 @@ public class ScreenShareCommand implements Command {
event.getChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.ERROR)
.setTitle("Wait, that's illegal")
.setDescription("This ID is invalid. \nMaybe you entered a wrong ID? \n\nNote: Make sure the Voice Channel is on this Guild.").build()).queue();
event.getHelpCommand().sendHelp(this, event.getRethink(), event.getAuthor(), event.getTextChannel());
event.getHelpCommand().sendHelp(this, event);
return;
}
}
@ -53,20 +53,20 @@ public class ScreenShareCommand implements Command {
event.getChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.ERROR)
.setTitle("You specified a wrong number!").build()).queue();
event.getHelpCommand().sendHelp(this, event.getRethink(), event.getAuthor(), event.getTextChannel());
event.getHelpCommand().sendHelp(this, event);
}
} catch (NumberFormatException e) {
event.getChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.ERROR)
.setTitle("Wait, that's illegal")
.setDescription("This isn't a Number.").build()).queue();
event.getHelpCommand().sendHelp(this, event.getRethink(), event.getAuthor(), event.getTextChannel());
event.getHelpCommand().sendHelp(this, event);
}
}, event.getJDA(), event.getAuthor());
} else if (vcs.size()==0) {
event.getChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.ERROR)
.setTitle("Hol' up")
.setDescription("There is no Voice Channel named like this. \n\nNote: Make sure the Voice Channel is on this Guild.").build()).queue();
event.getHelpCommand().sendHelp(this, event.getRethink(), event.getAuthor(), event.getTextChannel());
event.getHelpCommand().sendHelp(this, event);
} else {
event.getChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO)
.setTitle("Here's your Url to share your Screen")
@ -74,7 +74,7 @@ public class ScreenShareCommand implements Command {
}
}
} else {
event.getHelpCommand().sendHelp(this, event.getRethink(), event.getAuthor(), event.getTextChannel());
event.getHelpCommand().sendHelp(this, event);
}
}

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

@ -32,7 +32,7 @@ public class BanCommand implements Command {
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING).setTitle("Not possible").setDescription("You can't ban yourself!").build()).queue();
}
} else if (event.getMessage().getMentionedMembers().size() == 0) {
event.getHelpCommand().sendHelp(this, event.getRethink(), event.getAuthor(), event.getTextChannel());
event.getHelpCommand().sendHelp(this, event);
} else if (event.getMessage().getMentionedMembers().size() > 1) {
for (int i = 0; i < event.getMessage().getMentionedMembers().size(); i++) {
Member member = event.getMessage().getMentionedMembers().get(i);

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

@ -40,7 +40,7 @@ public class ClearCommand implements Command {
}
msg.delete().queue();
} catch (NumberFormatException e) {
event.getHelpCommand().sendHelp(this, event.getRethink(), event.getAuthor(), event.getTextChannel());
event.getHelpCommand().sendHelp(this, event);
}
} else {
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue();
@ -49,7 +49,7 @@ public class ClearCommand implements Command {
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_PERMISSION).build()).queue();
}
} else {
event.getHelpCommand().sendHelp(this, event.getRethink(), event.getAuthor(), event.getTextChannel());
event.getHelpCommand().sendHelp(this, event);
}
}

2
src/main/java/com/bbn/hadder/commands/moderation/GuildPrefixCommand.java
View file

@ -19,7 +19,7 @@ public class GuildPrefixCommand implements Command {
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING).setDescription("The prefix must not contain **\"**").build()).queue();
}
} else {
event.getHelpCommand().sendHelp(this, event.getRethink(), event.getAuthor(), event.getTextChannel());
event.getHelpCommand().sendHelp(this, event);
}
} else {
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_PERMISSION).build()).queue();

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

@ -51,7 +51,7 @@ public class InviteDetectCommand implements Command {
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_PERMISSION).build()).queue();
}
} else {
event.getHelpCommand().sendHelp(this, event.getRethink(), event.getAuthor(), event.getTextChannel());
event.getHelpCommand().sendHelp(this, event);
}
}

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

@ -33,7 +33,7 @@ public class KickCommand implements Command {
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING).setDescription("You can't kick yourself.").build()).queue();
}
} else if (event.getMessage().getMentionedMembers().size() == 0) {
event.getHelpCommand().sendHelp(this, event.getRethink(), event.getAuthor(), event.getTextChannel());
event.getHelpCommand().sendHelp(this, event);
} else if (event.getMessage().getMentionedMembers().size() > 1) {
for (int i = 0; i < event.getMessage().getMentionedMembers().size(); i++) {
Member member = event.getMessage().getMentionedMembers().get(i);

2
src/main/java/com/bbn/hadder/commands/moderation/LinkCommand.java
View file

@ -9,7 +9,7 @@ import net.dv8tion.jda.api.entities.Guild;
public class LinkCommand implements Command {
@Override
public void executed(String[] args, CommandEvent event) {
if (args.length == 0) event.getHelpCommand().sendHelp(this, event.getRethink(), event.getAuthor(), event.getTextChannel());
if (args.length == 0) event.getHelpCommand().sendHelp(this, event);
switch (args[0].toLowerCase()) {
case "add":
if (args.length != 2) return;

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

@ -28,7 +28,7 @@ public class NickCommand implements Command {
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO).setTitle("✅ Successfully nicked ✅").setDescription("I successfully nicked " + event.getMessage().getMentionedMembers().get(0).getUser().getAsTag() + ".").build()).queue();
}
} else {
event.getHelpCommand().sendHelp(this, event.getRethink(), event.getAuthor(), event.getTextChannel());
event.getHelpCommand().sendHelp(this, event);
}
} else {
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue();
@ -43,7 +43,7 @@ public class NickCommand implements Command {
}
}
} else if (event.getMessage().getMentionedMembers().size() == 0) {
event.getHelpCommand().sendHelp(this, event.getRethink(), event.getAuthor(), event.getTextChannel());
event.getHelpCommand().sendHelp(this, event);
} else {
for (int i = 0; i < event.getMessage().getMentionedMembers().size(); i++) {
Member member = event.getMessage().getMentionedMembers().get(i);

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

@ -67,7 +67,7 @@ public class RoleCommand implements Command {
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_PERMISSION).build()).queue();
}
} else {
event.getHelpCommand().sendHelp(this, event.getRethink(), event.getAuthor(), event.getTextChannel());
event.getHelpCommand().sendHelp(this, event);
}
}

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

@ -77,7 +77,7 @@ public class EvalCommand implements Command {
}, 0, TimeUnit.MILLISECONDS);
} else {
event.getHelpCommand().sendHelp(this, event.getRethink(), event.getAuthor(), event.getTextChannel());
event.getHelpCommand().sendHelp(this, event);
}
} else {
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_PERMISSION).build()).queue();

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

@ -22,7 +22,7 @@ public class GuildLeaveCommand implements Command {
.setDescription("I successfully left " + guild.getName())
.build()).queue();
} else {
event.getHelpCommand().sendHelp(this, event.getRethink(), event.getAuthor(), event.getTextChannel());
event.getHelpCommand().sendHelp(this, event);
}
} else {
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_PERMISSION).build()).queue();

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

@ -23,7 +23,7 @@ public class LanguageCommand implements Command {
break;
}
} else {
event.getHelpCommand().sendHelp(this, event.getRethink(), event.getAuthor(), event.getTextChannel());
event.getHelpCommand().sendHelp(this, event);
}
}

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

@ -16,7 +16,7 @@ public class PrefixCommand implements Command {
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();
} else {
event.getHelpCommand().sendHelp(this, event.getRethink(), event.getAuthor(), event.getTextChannel());
event.getHelpCommand().sendHelp(this, event);
}
}