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

Merge branch 'hax-dev'

Browse source
This commit is contained in:
Schlauer-Hax 2020-03-13 21:44:39 +01:00
commit 7cc51d680e
5 changed files with 80 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pom.xml
View file

@ -66,7 +66,7 @@
<dependency>
<groupId>net.dv8tion</groupId>
<artifactId>JDA</artifactId>
<version>4.1.1_110</version>
<version>4.1.1_113</version>
</dependency>
<dependency>
<groupId>org.json</groupId>
@ -142,7 +142,7 @@
</plugin>
<plugin>
<artifactId>maven-site-plugin</artifactId>
<version>3.8.2</version>
<version>3.9.0</version>
</plugin>
<plugin>
<artifactId>maven-project-info-reports-plugin</artifactId>

3
src/main/java/com/bbn/hadder/Hadder.java
View file

@ -126,7 +126,8 @@ public class Hadder {
new EchoCommand(),
new ServerStatsCommand(),
new ProfileCommand(),
new CodeCommand()), config, helpCommand);
new CodeCommand(),
new MoveAllCommand()), config, helpCommand);
builder.addEventListeners(
new MentionListener(rethink),

50
src/main/java/com/bbn/hadder/commands/misc/MoveAllCommand.java Normal file
View file

@ -0,0 +1,50 @@
/*
* @author Hax / Hax6775 / Schlauer_Hax
*/
package com.bbn.hadder.commands.misc;
import com.bbn.hadder.commands.Command;
import com.bbn.hadder.commands.CommandEvent;
import com.bbn.hadder.core.Perm;
import com.bbn.hadder.core.Perms;
import net.dv8tion.jda.api.Permission;
import net.dv8tion.jda.api.entities.Member;
import java.util.ArrayList;
import java.util.Objects;
public class MoveAllCommand implements Command {
@Perms(Perm.VOICE_MOVE_OTHERS)
@Override
public void executed(String[] args, CommandEvent e) {
if (args.length == 2) {
Objects.requireNonNull(e.getGuild().getVoiceChannelById(args[0])).getMembers().forEach(
member -> e.getGuild().moveVoiceMember(member, e.getGuild().getVoiceChannelById(args[1])).queue()
);
} else {
e.getHelpCommand().sendHelp(this, e);
}
}
@Override
public String[] labels() {
return new String[]{"moveall", "move-all"};
}
@Override
public String description() {
return "Moves All users in channel1 to channel2";
}
@Override
public String usage() {
return "[channel1] [channel2]";
}
@Override
public String example() {
return "452806287307046923 452858405212782623";
}
}

22
src/main/java/com/bbn/hadder/core/Perm.java
View file

@ -26,54 +26,60 @@ public enum Perm {
public boolean check(CommandEvent e) {
return e.getConfig().getOwners().contains(e.getAuthor().getIdLong());
}
},
},
MANAGE_MESSAGES {
@Override
public boolean check(CommandEvent e) {
return e.getMember().hasPermission(Permission.MESSAGE_MANAGE) || e.getConfig().getOwners().contains(e.getAuthor().getIdLong());
}
},
},
BAN_MEMBERS {
@Override
public boolean check(CommandEvent e) {
return e.getMember().hasPermission(Permission.BAN_MEMBERS) || e.getConfig().getOwners().contains(e.getAuthor().getIdLong());
}
},
},
KICK_MEMBERS {
@Override
public boolean check(CommandEvent e) {
return e.getMember().hasPermission(Permission.KICK_MEMBERS) || e.getConfig().getOwners().contains(e.getAuthor().getIdLong());
}
},
},
MANAGE_SERVER {
@Override
public boolean check(CommandEvent e) {
return e.getMember().hasPermission(Permission.MANAGE_SERVER) || e.getConfig().getOwners().contains(e.getAuthor().getIdLong());
}
},
},
MANAGE_ROLES {
@Override
public boolean check(CommandEvent e) {
return e.getMember().hasPermission(Permission.MANAGE_ROLES) || e.getConfig().getOwners().contains(e.getAuthor().getIdLong());
}
},
},
MANAGE_NICKNAMES {
@Override
public boolean check(CommandEvent e) {
return e.getMember().hasPermission(Permission.NICKNAME_MANAGE) || e.getConfig().getOwners().contains(e.getAuthor().getIdLong());
}
},
},
ADMINISTRATOR {
@Override
public boolean check(CommandEvent e) {
return e.getMember().hasPermission(Permission.ADMINISTRATOR) || e.getConfig().getOwners().contains(e.getAuthor().getIdLong());
}
},
},
MANAGE_WEBHOOKS {
@Override
public boolean check(CommandEvent e) {
return e.getMember().hasPermission(Permission.MANAGE_WEBHOOKS) || e.getConfig().getOwners().contains(e.getAuthor().getIdLong());
}
},
VOICE_MOVE_OTHERS {
@Override
public boolean check(CommandEvent e) {
return e.getMember().hasPermission(Permission.VOICE_MOVE_OTHERS) || e.getConfig().getOwners().contains(e.getAuthor().getIdLong());
}
};
public abstract boolean check(CommandEvent e);

19
src/main/java/com/bbn/hadder/listener/CommandListener.java
View file

@ -25,6 +25,7 @@ import net.dv8tion.jda.api.EmbedBuilder;
import net.dv8tion.jda.api.Permission;
import net.dv8tion.jda.api.entities.ChannelType;
import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
import net.dv8tion.jda.api.exceptions.ErrorResponseException;
import net.dv8tion.jda.api.hooks.ListenerAdapter;
import java.awt.*;
@ -64,13 +65,17 @@ public class CommandListener extends ListenerAdapter {
}
}
} else {
e.getAuthor().openPrivateChannel().complete().sendMessage(new EmbedBuilder()
.setTitle("No permission")
.setDescription("I need the `MESSAGE EMBED LINKS` permission in order to work!")
.setColor(Color.RED)
.setFooter("Hadder", "https://bigbotnetwork.com/images/Hadder.png")
.setTimestamp(Instant.now())
.build()).queue();
try {
e.getAuthor().openPrivateChannel().complete().sendMessage(new EmbedBuilder()
.setTitle("No permission")
.setDescription("I need the `MESSAGE EMBED LINKS` permission in order to work!")
.setColor(Color.RED)
.setFooter("Hadder", "https://bigbotnetwork.com/images/Hadder.png")
.setTimestamp(Instant.now())
.build()).queue();
} catch (ErrorResponseException ex) {
e.getTextChannel().sendMessage("I need the `MESSAGE EMBED LINKS` permission in order to work!").queue();
}
}
} else {
e.getAuthor().openPrivateChannel().complete().sendMessage(new EmbedBuilder()