From 32ba05bf99ca4f6a1c9f863147d6690e9fddbd67 Mon Sep 17 00:00:00 2001 From: SebClem Date: Mon, 16 May 2022 12:14:07 +0200 Subject: [PATCH] Change music message --- .../net/Broken/Tools/EmbedMessageUtils.java | 2 +- src/main/java/net/Broken/audio/AudioM.java | 66 ++++++++++++++++--- 2 files changed, 57 insertions(+), 11 deletions(-) diff --git a/src/main/java/net/Broken/Tools/EmbedMessageUtils.java b/src/main/java/net/Broken/Tools/EmbedMessageUtils.java index d1bc9b4..b0a98f5 100644 --- a/src/main/java/net/Broken/Tools/EmbedMessageUtils.java +++ b/src/main/java/net/Broken/Tools/EmbedMessageUtils.java @@ -37,7 +37,7 @@ public class EmbedMessageUtils { } public static MessageEmbed getMusicInfo(AudioTrackInfo info, UserAudioTrack userAudioTrack) { - EmbedBuilder temp = new EmbedBuilder().setTitle(":loud_sound: Currently playing") + EmbedBuilder temp = new EmbedBuilder().setTitle(":information_source: Currently playing") .addField("Title", info.title, false) .addField("Author", info.author, false) .addField("URL", info.uri, false) diff --git a/src/main/java/net/Broken/audio/AudioM.java b/src/main/java/net/Broken/audio/AudioM.java index 3fe8426..f510e73 100644 --- a/src/main/java/net/Broken/audio/AudioM.java +++ b/src/main/java/net/Broken/audio/AudioM.java @@ -21,6 +21,7 @@ import net.dv8tion.jda.api.events.interaction.SlashCommandEvent; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import java.awt.*; import java.util.Collections; import java.util.HashMap; import java.util.List; @@ -214,7 +215,12 @@ public class AudioM { public void skipTrack(SlashCommandEvent event) { GuildMusicManager musicManager = getGuildAudioPlayer(); musicManager.scheduler.nextTrack(); - Message message = new MessageBuilder().setEmbeds(EmbedMessageUtils.getMusicOk("Next music !")).build(); + Message message = new MessageBuilder().setEmbeds( + EmbedMessageUtils.buildStandar( + new EmbedBuilder() + .setTitle(":track_next: Next Track") + .setColor(Color.green) + )).build(); event.getHook().sendMessage(message).queue(); } @@ -226,7 +232,12 @@ public class AudioM { public void pause(SlashCommandEvent event) { GuildMusicManager musicManager = getGuildAudioPlayer(); musicManager.scheduler.pause(); - Message message = new MessageBuilder().setEmbeds(EmbedMessageUtils.getMusicOk("Playback paused")).build(); + Message message = new MessageBuilder().setEmbeds( + EmbedMessageUtils.buildStandar( + new EmbedBuilder() + .setTitle(":pause_button: Playback paused") + .setColor(Color.green) + )).build(); event.getHook().sendMessage(message).queue(); @@ -240,7 +251,12 @@ public class AudioM { public void resume(SlashCommandEvent event) { GuildMusicManager musicManager = getGuildAudioPlayer(); musicManager.scheduler.resume(); - Message message = new MessageBuilder().setEmbeds(EmbedMessageUtils.getMusicOk("Playback resumed")).build(); + Message message = new MessageBuilder().setEmbeds( + EmbedMessageUtils.buildStandar( + new EmbedBuilder() + .setTitle(":arrow_forward: Playback resumed") + .setColor(Color.green) + )).build(); event.getHook().sendMessage(message).queue(); } @@ -260,7 +276,12 @@ public class AudioM { public void flush(SlashCommandEvent event) { GuildMusicManager musicManager = getGuildAudioPlayer(); musicManager.scheduler.flush(); - Message message = new MessageBuilder().setEmbeds(EmbedMessageUtils.getMusicOk("Flush playlist!")).build(); + Message message = new MessageBuilder().setEmbeds( + EmbedMessageUtils.buildStandar( + new EmbedBuilder() + .setTitle(":wastebasket: Playlist flushed") + .setColor(Color.green) + )).build(); event.getHook().sendMessage(message).queue(); } @@ -272,18 +293,43 @@ public class AudioM { public void list(SlashCommandEvent event) { GuildMusicManager musicManager = getGuildAudioPlayer(); List list = musicManager.scheduler.getList(); - StringBuilder resp = new StringBuilder(); + if (list.size() == 0) { - resp.append("Oh my god!\nThe playlist is empty ! \n:astonished: "); + Message message = new MessageBuilder().setEmbeds( + EmbedMessageUtils.buildStandar( + new EmbedBuilder() + .setTitle(":scroll: Playlist") + .setColor(Color.green) + .setDescription("Oh no ! The playlist is empty !") + )).build(); + event.getHook().sendMessage(message).queue(); } else { + StringBuilder resp = new StringBuilder(); + int i = 0; for (UserAudioTrackData trackInfo : list) { - resp.append("- "); + resp.append(":arrow_right: "); resp.append(trackInfo.getAudioTrackInfo().title); - resp.append("\n"); + resp.append(" - "); + resp.append(trackInfo.getAudioTrackInfo().author); + resp.append("\n\n"); + if (i >= 5){ + resp.append(":arrow_forward: And "); + resp.append(list.size() - 5); + resp.append(" other tracks ..."); + break; + } + i++; } + Message message = new MessageBuilder().setEmbeds( + EmbedMessageUtils.buildStandar( + new EmbedBuilder() + .setTitle(":scroll: Playlist") + .setColor(Color.green) + .setDescription(resp.toString()) + )).build(); + event.getHook().sendMessage(message).queue(); } - Message message = new MessageBuilder().setEmbeds(EmbedMessageUtils.getMusicOk("Playlist:\n\n" + resp.toString())).build(); - event.getHook().sendMessage(message).queue(); + } /**