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

Merge the master branch into Greg's branch #273

Merged
greg6775 merged 47 commits from master into greg-dev 2019-12-28 18:52:36 +01:00
Conversation 0 Commits 47 Files changed 7 +231 -131
23 changed files with 231 additions and 131 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit c53c3f43c3 - Show all commits

2
pom.xml
View file

@ -19,7 +19,7 @@
<dependency>
<groupId>net.dv8tion</groupId>
<artifactId>JDA</artifactId>
<version>4.1.0_86</version>
<version>4.1.0_87</version>
</dependency>
<dependency>
<groupId>org.json</groupId>

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

@ -1,5 +1,6 @@
package com.bbn.hadder;
import com.bbn.hadder.audio.AudioManager;
import com.bbn.hadder.commands.general.*;
import com.bbn.hadder.commands.misc.*;
import com.bbn.hadder.commands.moderation.*;
@ -41,6 +42,7 @@ public class Hadder {
builder.setToken(config.getBotToken());
HelpCommand helpCommand = new HelpCommand();
AudioManager audioManager = new AudioManager();
CommandHandler commandHandler = new CommandHandler(
List.of(
@ -100,12 +102,13 @@ public class Hadder {
builder.addEventListeners(
new MentionListener(rethink),
new PrivateMessageListener(rethink),
new CommandListener(rethink, commandHandler),
new CommandListener(rethink, commandHandler, audioManager),
new GuildListener(rethink, config),
new ReadyListener(rethink, config),
new InviteLinkListener(rethink),
new RulesListener(rethink),
new StarboardListener(rethink));
new StarboardListener(rethink),
new VoiceLeaveListener(audioManager));
try {
shardManager = builder.build();

84
src/main/java/com/bbn/hadder/audio/AudioManager.java
View file

@ -10,7 +10,9 @@ import com.sedmelluq.discord.lavaplayer.source.AudioSourceManagers;
import com.sedmelluq.discord.lavaplayer.tools.FriendlyException;
import com.sedmelluq.discord.lavaplayer.track.AudioPlaylist;
import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
import com.sedmelluq.discord.lavaplayer.track.AudioTrackInfo;
import net.dv8tion.jda.api.entities.Guild;
import net.dv8tion.jda.api.entities.Member;
import net.dv8tion.jda.api.entities.Message;
import java.util.AbstractMap;
@ -28,11 +30,47 @@ public class AudioManager {
AudioSourceManagers.registerRemoteSources(myManager);
}
public final Map<String, Map.Entry<AudioPlayer, TrackManager>> players = new HashMap<>();
public final AudioPlayerManager myManager = new DefaultAudioPlayerManager();
public Map<String, Map.Entry<AudioPlayer, TrackManager>> players = new HashMap<>();
private final AudioPlayerManager myManager = new DefaultAudioPlayerManager();
public boolean hasPlayer(Guild guild) {
return players.containsKey(guild.getId());
}
public void removePlayer(Guild g) {
System.out.println(players.toString());
players.remove(g.getId());
System.out.println(players.toString());
}
public Map<String, Map.Entry<AudioPlayer, TrackManager>> getPlayers () {
return players;
}
public AudioPlayer getPlayer(Guild guild) {
AudioPlayer p;
if (hasPlayer(guild)) {
p = players.get(guild.getId()).getKey();
} else {
p = createPlayer(guild);
}
return p;
}
public TrackManager getTrackManager(Guild guild) {
return players.get(guild.getId()).getValue();
}
public AudioPlayer createPlayer(Guild guild) {
AudioPlayer nPlayer = myManager.createPlayer();
TrackManager manager = new TrackManager(nPlayer);
nPlayer.addListener(manager);
guild.getAudioManager().setSendingHandler(new AudioPlayerSendHandler(nPlayer));
players.put(guild.getId(), new AbstractMap.SimpleEntry<>(nPlayer, manager));
return nPlayer;
}
public void loadTrack(String identifier, CommandEvent event, Message msg) {
Guild guild = event.getGuild();
getPlayer(guild);
@ -60,9 +98,15 @@ public class AudioManager {
} else if (playlist.isSearchResult()) {
trackLoaded(playlist.getTracks().get(0));
} else {
for (int i = 0; i < Math.min(playlist.getTracks().size(), 200); i++) {
for (int i = 0; i < Math.min(playlist.getTracks().size(), 69); i++) {
getTrackManager(guild).queue(playlist.getTracks().get(i), event.getMember());
}
msg.editMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO,
"commands.music.play.success.loading.title", "⏯",
"", "")
.addField(event.getMessageEditor().getTerm("commands.music.play.success.title"), playlist.getName(), true)
.addField(event.getMessageEditor().getTerm("commands.music.play.success.tracks"), String.valueOf(playlist.getTracks().size()), true)
.build()).queue();
}
}
@ -84,31 +128,25 @@ public class AudioManager {
});
}
public boolean hasPlayer(Guild guild) {
return players.containsKey(guild.getId());
public boolean isDj(Member member) {
return member.getRoles().stream().anyMatch(r -> r.getName().equals("DJ"));
}
public AudioPlayer getPlayer(Guild guild) {
AudioPlayer p;
if (hasPlayer(guild)) {
p = players.get(guild.getId()).getKey();
} else {
p = createPlayer(guild);
}
return p;
public boolean isCurrentDj(Member member) {
return getTrackManager(member.getGuild()).getTrackInfo(getPlayer(member.getGuild()).getPlayingTrack()).getAuthor().equals(member);
}
public TrackManager getTrackManager(Guild guild) {
return players.get(guild.getId()).getValue();
public void forceSkipTrack(CommandEvent event) {
getPlayer(event.getGuild()).stopTrack();
}
public AudioPlayer createPlayer(Guild guild) {
AudioPlayer nPlayer = myManager.createPlayer();
TrackManager manager = new TrackManager(nPlayer);
nPlayer.addListener(manager);
guild.getAudioManager().setSendingHandler(new AudioPlayerSendHandler(nPlayer));
players.put(guild.getId(), new AbstractMap.SimpleEntry<>(nPlayer, manager));
return nPlayer;
public String getTimestamp(long milis) {
long seconds = milis / 1000;
long hours = Math.floorDiv(seconds, 3600);
seconds = seconds - (hours * 3600);
long mins = Math.floorDiv(seconds, 60);
seconds = seconds - (mins * 60);
return (hours == 0 ? "" : hours + ":") + String.format("%02d", mins) + ":" + String.format("%02d", seconds);
}
public String getOrNull(String s) {

21
src/main/java/com/bbn/hadder/commands/CommandEvent.java
View file

@ -1,6 +1,7 @@
package com.bbn.hadder.commands;
import com.bbn.hadder.Rethink;
import com.bbn.hadder.audio.AudioManager;
import com.bbn.hadder.commands.general.HelpCommand;
import com.bbn.hadder.core.CommandHandler;
import com.bbn.hadder.core.Config;
@ -8,6 +9,7 @@ import com.bbn.hadder.utils.EventWaiter;
import com.bbn.hadder.utils.MessageEditor;
import net.dv8tion.jda.api.JDA;
import net.dv8tion.jda.api.entities.Message;
import net.dv8tion.jda.api.events.Event;
import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
import javax.annotation.Nonnull;
@ -20,8 +22,9 @@ public class CommandEvent extends MessageReceivedEvent {
private HelpCommand helpCommand;
private MessageEditor messageEditor;
private EventWaiter eventWaiter;
private AudioManager audioManager;
public CommandEvent(@Nonnull JDA api, long responseNumber, @Nonnull Message message, Rethink rethink, Config config, CommandHandler commandHandler, HelpCommand helpCommand, MessageEditor messageEditor, EventWaiter eventWaiter) {
public CommandEvent(@Nonnull JDA api, long responseNumber, @Nonnull Message message, Rethink rethink, Config config, CommandHandler commandHandler, HelpCommand helpCommand, MessageEditor messageEditor, EventWaiter eventWaiter, AudioManager audioManager) {
super(api, responseNumber, message);
this.rethink = rethink;
this.config = config;
@ -29,6 +32,18 @@ public class CommandEvent extends MessageReceivedEvent {
this.helpCommand = helpCommand;
this.messageEditor = messageEditor;
this.eventWaiter = eventWaiter;
this.audioManager = audioManager;
}
public CommandEvent(MessageReceivedEvent event, Rethink rethink, Config config, CommandHandler commandHandler, HelpCommand helpCommand, MessageEditor messageEditor, EventWaiter eventWaiter, AudioManager audioManager) {
super(event.getJDA(), event.getResponseNumber(), event.getMessage());
this.rethink = rethink;
this.config = config;
this.commandHandler = commandHandler;
this.helpCommand = helpCommand;
this.messageEditor = messageEditor;
this.eventWaiter = eventWaiter;
this.audioManager = audioManager;
}
public Rethink getRethink() {
@ -54,4 +69,8 @@ public class CommandEvent extends MessageReceivedEvent {
public EventWaiter getEventWaiter() {
return eventWaiter;
}
public AudioManager getAudioManager() {
return audioManager;
}
}

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

@ -66,6 +66,6 @@ public class AvatarCommand implements Command {
@Override
public String usage() {
return "[@User]/[ID]";
return "user/id";
}
}

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

@ -58,6 +58,6 @@ public class GifCommand implements Command {
@Override
public String usage() {
return "<SearchTerm>";
return "searchterm";
}
}

5
src/main/java/com/bbn/hadder/commands/fun/MemeCommand.java
View file

@ -21,16 +21,17 @@ public class MemeCommand implements Command {
public void executed(String[] args, CommandEvent event) {
OkHttpClient client = new OkHttpClient();
Request request = new Request.Builder().url("https://some-random-api.ml/meme").build();
Request request = new Request.Builder().url("https://meme-api.herokuapp.com/gimme").build();
try {
Response response = client.newCall(request).execute();
JSONObject json = new JSONObject(response.body().string());
String url = json.get("image").toString();
String url = json.getString("url");
event.getTextChannel().sendMessage(
event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO,
"commands.fun.meme.success.title", "")
.setImage(url)
.setAuthor("Subreddit: " + json.getString("subreddit"))
.build()).queue();
} catch (IOException e) {
e.printStackTrace();

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

@ -26,7 +26,7 @@ public class BanCommand implements Command {
event.getMessageEditor().getMessage(
MessageEditor.MessageType.INFO,
"commands.moderation.ban.success.title",
"✅",
"",
"commands.moderation.ban.success.description",
victim.getUser().getName() + ".").build()).queue();
} else {
@ -74,7 +74,7 @@ public class BanCommand implements Command {
}
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO,
"commands.moderation.ban.success.title",
"✅",
"",
"commands.moderation.ban.massban.success.description",
String.valueOf(event.getMessage().getMentionedMembers().size())).build()).queue();
}

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

@ -50,13 +50,25 @@ public class ClearCommand implements Command {
List<Message> history = event.getTextChannel().getHistory().retrievePast(nbToDelete + 1).complete();
List<Message> msgToDelete = new ArrayList<>(history);
event.getTextChannel().deleteMessages(msgToDelete).queue();
Message msg = event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, "", "", "commands.moderation.clear.success.description", String.valueOf(nbToDelete)).build()).complete();
try {
TimeUnit.SECONDS.sleep(2);
} catch (InterruptedException e) {
e.printStackTrace();
if (nbToDelete == 1) {
Message msg = event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, "commands.moderation.clear.success.title",
"commands.moderation.clear.success.description.singular").build()).complete();
try {
TimeUnit.SECONDS.sleep(2);
} catch (InterruptedException e) {
e.printStackTrace();
}
msg.delete().queue();
} else {
Message msg = event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, "commands.moderation.clear.success.title", "",
"commands.moderation.clear.success.description.plural", String.valueOf(nbToDelete)).build()).complete();
try {
TimeUnit.SECONDS.sleep(2);
} catch (InterruptedException e) {
e.printStackTrace();
}
msg.delete().queue();
}
msg.delete().queue();
}
} catch (NumberFormatException e) {
event.getHelpCommand().sendHelp(this, event);

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

@ -12,7 +12,7 @@ import com.bbn.hadder.utils.MessageEditor;
import net.dv8tion.jda.api.Permission;
import net.dv8tion.jda.api.entities.Member;
@Perms(Perm.CHANGE_NICKNAME)
@Perms(Perm.MANAGE_NICKNAMES)
public class NickCommand implements Command {
@Override

43
src/main/java/com/bbn/hadder/commands/music/InfoCommand.java
View file

@ -1,8 +1,8 @@
package com.bbn.hadder.commands.music;
import com.bbn.hadder.audio.AudioManager;
import com.bbn.hadder.commands.Command;
import com.bbn.hadder.commands.CommandEvent;
import com.bbn.hadder.utils.MessageEditor;
import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
/**
@ -11,46 +11,31 @@ import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
public class InfoCommand implements Command {
private static final String CD = "\uD83D\uDCBF";
private static final String MIC = "\uD83C\uDFA4";
private static final String QUEUE_DESCRIPTION = "%s **|>** %s\n%s\n%s %s\n%s";
@Override
public void executed(String[] args, CommandEvent event) {
if (new AudioManager().hasPlayer(event.getGuild())) {
event.getTextChannel().sendMessage("Ja Player is auch wieder da");
}
if (new AudioManager().getPlayer(event.getGuild()).getPlayingTrack() == null) {
event.getTextChannel().sendMessage("Joo playing track net anwesend^^").queue();
}
if (!new AudioManager().hasPlayer(event.getGuild()) || new AudioManager().getPlayer(event.getGuild()).getPlayingTrack() == null) {
event.getTextChannel().sendMessage("Shut up eyyyy du kek").queue();
if (event.getAudioManager().hasPlayer(event.getGuild()) && event.getAudioManager().getPlayer(event.getGuild()).getPlayingTrack() != null) {
AudioTrack track = event.getAudioManager().getPlayer(event.getGuild()).getPlayingTrack();
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO,
"commands.music.info.success.title", "")
.setAuthor(track.getInfo().author)
.addField("Title", track.getInfo().title, true)
.addField("Progress", "`[ " + event.getAudioManager().getTimestamp(track.getPosition()) + " / " + event.getAudioManager().getTimestamp(track.getInfo().length) + " ]`", false)
.build()).queue();
} else {
AudioTrack track = new AudioManager().getPlayer(event.getGuild()).getPlayingTrack();
event.getTextChannel().sendMessage("Track Info" + String.format(QUEUE_DESCRIPTION, CD, new AudioManager().getOrNull(track.getInfo().title),
"\n\u23F1 **|>** `[ " + getTimestamp(track.getPosition()) + " / " + getTimestamp(track.getInfo().length) + " ]`",
"\n" + MIC, new AudioManager().getOrNull(track.getInfo().author),
"\n\uD83C\uDFA7 **|>** " + "")).queue();
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR,
"commands.music.info.error.title",
"commands.music.info.error.description").build()).queue();
}
}
private String getTimestamp(long milis) {
long seconds = milis / 1000;
long hours = Math.floorDiv(seconds, 3600);
seconds = seconds - (hours * 3600);
long mins = Math.floorDiv(seconds, 60);
seconds = seconds - (mins * 60);
return (hours == 0 ? "" : hours + ":") + String.format("%02d", mins) + ":" + String.format("%02d", seconds);
}
@Override
public String[] labels() {
return new String[]{"info"};
return new String[]{"info", "songinfo"};
}
@Override
public String description() {
return "Shows information about the playing song";
return "commands.music.info.help.description";
}
@Override

6
src/main/java/com/bbn/hadder/commands/music/JoinCommand.java
View file

@ -42,10 +42,8 @@ public class JoinCommand implements Command {
event.getGuild().getAudioManager().openAudioConnection(vc);
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(
MessageEditor.MessageType.INFO,
"commands.music.join.success.title",
"",
"commands.music.join.success.description",
vc.getName())
"commands.music.join.success.title", "",
"commands.music.join.success.description", vc.getName())
.build()).queue();
}
} else {

2
src/main/java/com/bbn/hadder/commands/music/LeaveCommand.java
View file

@ -30,7 +30,7 @@ public class LeaveCommand implements Command {
@Override
public String[] labels() {
return new String[]{"leave"};
return new String[]{"leave", "quit"};
}
@Override

5
src/main/java/com/bbn/hadder/commands/music/PlayCommand.java
View file

@ -1,6 +1,5 @@
package com.bbn.hadder.commands.music;
import com.bbn.hadder.audio.AudioManager;
import com.bbn.hadder.commands.Command;
import com.bbn.hadder.commands.CommandEvent;
import com.bbn.hadder.utils.MessageEditor;
@ -24,12 +23,12 @@ public class PlayCommand implements Command {
Message msg = event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO,
"commands.music.play.load.title", "⭕",
"commands.music.play.load.description", "").build()).complete();
new AudioManager().loadTrack(input, event, msg);
event.getAudioManager().loadTrack(input, event, msg);
} catch (Exception ignore) {
Message msg = event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO,
"commands.music.play.load.title", "⭕",
"commands.music.play.load.description", "").build()).complete();
new AudioManager().loadTrack("ytsearch: " + input, event, msg);
event.getAudioManager().loadTrack("ytsearch: " + input, event, msg);
}
} else {
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(

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

@ -1,11 +1,9 @@
package com.bbn.hadder.commands.music;
import com.bbn.hadder.audio.AudioInfo;
import com.bbn.hadder.audio.AudioManager;
import com.bbn.hadder.commands.Command;
import com.bbn.hadder.commands.CommandEvent;
import com.bbn.hadder.utils.MessageEditor;
import net.dv8tion.jda.api.EmbedBuilder;
import java.util.Set;
@ -17,21 +15,20 @@ public class QueueCommand implements Command {
@Override
public void executed(String[] args, CommandEvent event) {
if (!new AudioManager().hasPlayer(event.getGuild()) || new AudioManager().getTrackManager(event.getGuild()).getQueuedTracks().isEmpty()) {
if (!event.getAudioManager().hasPlayer(event.getGuild()) || event.getAudioManager().getTrackManager(event.getGuild()).getQueuedTracks().isEmpty()) {
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.WARNING,
"commands.music.queue.error.title",
"commands.music.queue.error.description"
).build()).queue();
} else {
Set<AudioInfo> queue = new AudioManager().getTrackManager(event.getGuild()).getQueuedTracks();
EmbedBuilder b = event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO,
"commands.music.queue.success.title",
"commands.music.queue.success.description")
.addField("Queued songs", String.valueOf(queue.size()), true);
Set<AudioInfo> queue = event.getAudioManager().getTrackManager(event.getGuild()).getQueuedTracks();
StringBuilder builder = new StringBuilder();
for (AudioInfo g : queue) {
b.addField(g.getTrack().getInfo().author, g.getTrack().getInfo().title, true);
builder.append("**").append(g.getTrack().getInfo().author).append("**: `").append(g.getTrack().getInfo().title).append("` \n");
}
event.getTextChannel().sendMessage(b.build()).queue();
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO,
"commands.music.queue.success.title", "",
"commands.music.queue.success.description", builder.toString()).build()).queue();
}
}
@ -42,7 +39,7 @@ public class QueueCommand implements Command {
@Override
public String description() {
return "Shows the music queue.";
return "commands.music.queue.help.description";
}
@Override

16
src/main/java/com/bbn/hadder/commands/music/SkipCommand.java
View file

@ -1,9 +1,8 @@
package com.bbn.hadder.commands.music;
import com.bbn.hadder.audio.AudioInfo;
import com.bbn.hadder.audio.AudioManager;
import com.bbn.hadder.commands.Command;
import com.bbn.hadder.commands.CommandEvent;
import com.bbn.hadder.utils.MessageEditor;
/**
* @author Skidder / GregTCLTK
@ -13,7 +12,16 @@ public class SkipCommand implements Command {
@Override
public void executed(String[] args, CommandEvent event) {
if (event.getAudioManager().hasPlayer(event.getGuild()) && !event.getAudioManager().getTrackManager(event.getGuild()).getQueuedTracks().isEmpty()) {
event.getAudioManager().forceSkipTrack(event);
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO,
"commands.music.skip.success.title",
"commands.music.skip.success.description").build()).queue();
} else {
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR,
"commands.music.info.error.title",
"commands.music.info.error.description").build()).queue();
}
}
@Override
@ -23,7 +31,7 @@ public class SkipCommand implements Command {
@Override
public String description() {
return "Skips the song";
return "commands.music.skip.help.description";
}
@Override

21
src/main/java/com/bbn/hadder/commands/music/StopCommand.java
View file

@ -1,6 +1,5 @@
package com.bbn.hadder.commands.music;
import com.bbn.hadder.audio.AudioManager;
import com.bbn.hadder.commands.Command;
import com.bbn.hadder.commands.CommandEvent;
import com.bbn.hadder.utils.MessageEditor;
@ -13,13 +12,19 @@ public class StopCommand implements Command {
@Override
public void executed(String[] args, CommandEvent event) {
new AudioManager().players.remove(event.getGuild().getId());
new AudioManager().getPlayer(event.getGuild()).destroy();
new AudioManager().getTrackManager(event.getGuild()).purgeQueue();
event.getGuild().getAudioManager().closeAudioConnection();
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO,
"commands.music.stop.success.title",
"commands.music.stop.success.description").build()).queue();
if (event.getAudioManager().hasPlayer(event.getGuild()) && event.getAudioManager().getPlayer(event.getGuild()).getPlayingTrack() != null) {
event.getAudioManager().players.remove(event.getGuild().getId());
event.getAudioManager().getPlayer(event.getGuild()).destroy();
event.getAudioManager().getTrackManager(event.getGuild()).purgeQueue();
event.getGuild().getAudioManager().closeAudioConnection();
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO,
"commands.music.stop.success.title",
"commands.music.stop.success.description").build()).queue();
} else {
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR,
"commands.music.info.error.title",
"commands.music.info.error.description").build()).queue();
}
}
@Override

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

@ -5,6 +5,7 @@ package com.bbn.hadder.commands.owner;
*/
import com.bbn.hadder.Hadder;
import com.bbn.hadder.audio.AudioManager;
import com.bbn.hadder.commands.Command;
import com.bbn.hadder.commands.CommandEvent;
import com.bbn.hadder.core.Perm;
@ -43,6 +44,8 @@ public class EvalCommand implements Command {
engine.put("author", event.getAuthor());
engine.put("member", event.getMember());
engine.put("self", event.getGuild().getSelfMember());
engine.put("audio", event.getAudioManager());
engine.put("out", System.out);
ScheduledExecutorService service = Executors.newScheduledThreadPool(1);
@ -52,12 +55,12 @@ public class EvalCommand implements Command {
Object out;
try {
String script = "";
StringBuilder script = new StringBuilder();
for (int i = 0; i < args.length; i++) {
args[i] = args[i].replace("```java", "").replace("```", "");
script += i == args.length - 1 ? args[i] : args[i] + " ";
script.append(i == args.length - 1 ? args[i] : args[i] + " ");
}
out = engine.eval(script);
out = engine.eval(script.toString());
event.getTextChannel().sendMessage(event.getMessageEditor()
.getMessage(MessageEditor.MessageType.INFO, "commands.owner.eval.success.title", "")

5
src/main/java/com/bbn/hadder/core/CommandHandler.java
View file

@ -1,6 +1,7 @@
package com.bbn.hadder.core;
import com.bbn.hadder.Rethink;
import com.bbn.hadder.audio.AudioManager;
import com.bbn.hadder.commands.Command;
import com.bbn.hadder.commands.CommandEvent;
import com.bbn.hadder.commands.general.HelpCommand;
@ -23,7 +24,7 @@ public class CommandHandler {
this.helpCommand = helpCommand;
}
public void handle(MessageReceivedEvent event, Rethink rethink, String prefix) {
public void handle(MessageReceivedEvent event, Rethink rethink, String prefix, AudioManager audioManager) {
String invoke = event.getMessage().getContentRaw().replaceFirst(prefix, "").split(" ")[0];
for (Command cmd : commandList) {
for (String label : cmd.labels()) {
@ -35,7 +36,7 @@ public class CommandHandler {
if (args.length > 0 && args[0].equals("")) args = new String[0];
CommandEvent commandEvent = new CommandEvent(event.getJDA(), event.getResponseNumber(), event.getMessage(), rethink,
config, this, helpCommand, new MessageEditor(rethink, event.getAuthor()), new EventWaiter());
config, this, helpCommand, new MessageEditor(rethink, event.getAuthor()), new EventWaiter(), audioManager);
if (cmd.getClass().getAnnotations().length > 0 && !Arrays.asList(cmd.getClass().getAnnotations()).contains(Perms.class)) {
for (Perm perm : cmd.getClass().getAnnotation(Perms.class).value()) {
if (!perm.check(commandEvent)) {

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

@ -52,10 +52,10 @@ public enum Perm {
return event.getMember().hasPermission(Permission.MANAGE_ROLES) || event.getConfig().getOwners().contains(event.getAuthor().getIdLong());
}
},
CHANGE_NICKNAME {
MANAGE_NICKNAMES {
@Override
public boolean check(CommandEvent event) {
return event.getMember().hasPermission(Permission.NICKNAME_CHANGE) || event.getConfig().getOwners().contains(event.getAuthor().getIdLong());
return event.getMember().hasPermission(Permission.NICKNAME_MANAGE) || event.getConfig().getOwners().contains(event.getAuthor().getIdLong());
}
},
ADMINISTRATOR {

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

@ -1,6 +1,7 @@
package com.bbn.hadder.listener;
import com.bbn.hadder.Rethink;
import com.bbn.hadder.audio.AudioManager;
import com.bbn.hadder.core.CommandHandler;
import net.dv8tion.jda.api.entities.ChannelType;
import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
@ -14,10 +15,12 @@ public class CommandListener extends ListenerAdapter {
private Rethink rethink;
private CommandHandler handler;
private AudioManager audioManager;
public CommandListener(Rethink rethink, CommandHandler handler) {
public CommandListener(Rethink rethink, CommandHandler handler, AudioManager audioManager) {
this.rethink = rethink;
this.handler = handler;
this.audioManager = audioManager;
}
@Override
@ -31,7 +34,7 @@ public class CommandListener extends ListenerAdapter {
};
for (String prefix : prefixes) {
if (event.getMessage().getContentRaw().startsWith(prefix)) {
handler.handle(event, rethink, prefix);
handler.handle(event, rethink, prefix, audioManager);
return;
}
}

28
src/main/java/com/bbn/hadder/listener/VoiceLeaveListener.java Normal file
View file

@ -0,0 +1,28 @@
package com.bbn.hadder.listener;
import com.bbn.hadder.audio.AudioManager;
import net.dv8tion.jda.api.events.guild.voice.GuildVoiceLeaveEvent;
import net.dv8tion.jda.api.hooks.ListenerAdapter;
/**
* @author Skidder / GregTCLTK
*/
public class VoiceLeaveListener extends ListenerAdapter {
private AudioManager audioManager;
public VoiceLeaveListener(AudioManager audioManager) {
this.audioManager = audioManager;
}
@Override
public void onGuildVoiceLeave(GuildVoiceLeaveEvent event) {
if (new AudioManager().hasPlayer(event.getGuild()) && event.getChannelLeft().getMembers().equals(event.getGuild().getSelfMember())) {
audioManager.players.remove(event.getGuild().getId());
audioManager.getPlayer(event.getGuild()).destroy();
audioManager.getTrackManager(event.getGuild()).purgeQueue();
event.getGuild().getAudioManager().closeAudioConnection();
}
}
}

22
src/main/java/com/bbn/hadder/utils/MessageEditor.java
View file

@ -24,21 +24,21 @@ public class MessageEditor {
return this.getMessage(type, "", "", "", "", "", "");
}
public EmbedBuilder getMessage(MessageType type, String title_language_string, String description_language_string) {
return this.getMessage(type, title_language_string, "", "", description_language_string, "", "");
public EmbedBuilder getMessage(MessageType type, String title, String description) {
return this.getMessage(type, title, "", "", description, "", "");
}
public EmbedBuilder getMessage(MessageType type, String title_language_string, String title_extra,
String description_language_string, String description_extra) {
return this.getMessage(type, title_language_string, title_extra, "", description_language_string, description_extra, "");
public EmbedBuilder getMessage(MessageType type, String title, String title_extra,
String description, String description_extra) {
return this.getMessage(type, title, title_extra, "", description, description_extra, "");
}
public EmbedBuilder getMessage(MessageType type, String title_language_string, String title_extra, String title_extra_two,
String description_language_string, String description_extra, String description_extra_two) {
public EmbedBuilder getMessage(MessageType type, String title, String title_extra, String title_extra_two,
String description, String description_extra, String description_extra_two) {
String language = (this.user!=null) ? rethink.getLanguage(this.user.getId()) : null;
EmbedBuilder eb = this.getDefaultSettings(type);
if (!title_language_string.equals("")) eb.setTitle(this.handle(language, title_language_string, title_extra, title_extra_two));
if (!description_language_string.equals("")) eb.setDescription(this.handle(language, description_language_string, description_extra, description_extra_two));
if (!title.equals("")) eb.setTitle(this.handle(language, title, title_extra, title_extra_two));
if (!description.equals("")) eb.setDescription(this.handle(language, description, description_extra, description_extra_two));
return eb;
}
@ -122,7 +122,7 @@ public class MessageEditor {
Locale locale = new Locale(language_code);
ResourceBundle resourceBundle = ResourceBundle.getBundle("Translations/Translations", locale);
if (resourceBundle.containsKey(string))
return resourceBundle.getString(string).replaceAll("%prefix%", "h.").replaceAll("%extra%", extra).replaceAll("%extra_two%", extra_two);
else return "This key doesn't exist. Please report this to the Bot Developers. Key: "+string+" Language_code: "+language_code;
return resourceBundle.getString(string).replaceAll("%extra%", extra).replaceAll("%extra_two%", extra_two);
else return "This key doesn't exist. Please report this to the Bot Developers. Key: " + string + " Language_code: " + language_code;
}
}