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 #244

Merged
greg6775 merged 23 commits from greg-dev into master 2019-12-23 16:22:53 +01:00
Conversation 0 Commits 23 Files changed 15 +17 -4
3 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit ef74e3240b - Show all commits

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

@ -24,7 +24,6 @@ import java.util.concurrent.TimeUnit;
public class AudioManager {
public AudioManager() {
AudioSourceManagers.registerRemoteSources(myManager);
}

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

@ -5,6 +5,7 @@ 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,11 +18,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()) {
event.getTextChannel().sendMessage(
event.getMessageEditor().getMessage(MessageEditor.MessageType.WARNING, "", "").build()).queue();
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();
// Insert message here
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);
for (AudioInfo g : queue) {
b.addField(g.getTrack().getInfo().author, g.getTrack().getInfo().title, true);
}
event.getTextChannel().sendMessage(b.build()).queue();
}
}

4
src/main/resources/Translations/Translations_en.properties
View file

@ -186,6 +186,10 @@ commands.music.play.help.description = Plays a song
commands.music.stop.success.title = Successfully stopped
commands.music.stop.success.description = I successfully stopped the song.
commands.music.stop.help.description = Stops the song
commands.music.queue.error.title = No queue
commands.music.queue.error.description = There are no queued songs at the moment
commands.music.queue.success.title = Queue
commands.music.queue.success.description = This is the queue: %extra%
commands.nsfw.gif.error.title = GIF not showing? Click here
commands.nsfw.img.error.title = Image not showing? Click here