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

Merge Greg's branch into the master branch #287

Merged
greg6775 merged 3 commits from greg-dev into master 2019-12-31 03:51:48 +01:00
Conversation 0 Commits 3 Files changed 8 +11 -6
4 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 2eff728c2f - Show all commits

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

@ -52,6 +52,8 @@ public class InviteDetectCommand implements Command {
.build()).queue();
}
break;
default:
event.getHelpCommand().sendHelp(this, event);
}
} else {
event.getHelpCommand().sendHelp(this, event);

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

@ -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,

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

@ -15,8 +15,7 @@ public class RoleCommand implements Command {
@Override
public void executed(String[] args, CommandEvent event) {
if (args.length > 0) {
if (event.getMember().hasPermission(Permission.MANAGE_ROLES)) {
if (event.getGuild().getSelfMember().hasPermission(Permission.MANAGE_ROLES)) {
String action = args[0].toLowerCase();
switch (action) {
case "add":
@ -66,7 +65,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 +73,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();

3
src/main/java/com/bbn/hadder/commands/music/QueueCommand.java
View file

@ -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();
}
}