Skip to content

Commit 0aee300

Browse files
Update music system embed design
1 parent 7026023 commit 0aee300

2 files changed

Lines changed: 19 additions & 33 deletions

File tree

src/main/java/technobot/handlers/MusicHandler.java

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import net.dv8tion.jda.api.EmbedBuilder;
1212
import net.dv8tion.jda.api.audio.AudioSendHandler;
1313
import net.dv8tion.jda.api.entities.AudioChannel;
14+
import net.dv8tion.jda.api.entities.Guild;
1415
import net.dv8tion.jda.api.entities.TextChannel;
1516
import org.jetbrains.annotations.NotNull;
1617
import org.jetbrains.annotations.Nullable;
@@ -235,18 +236,19 @@ public void onTrackStart(AudioPlayer player, @NotNull AudioTrack track) {
235236
//Grab Track Info
236237
String duration = MusicListener.formatTrackLength(track.getInfo().length);
237238
String thumb = getThumbnail(track);
238-
String nextTrack = "Nothing";
239-
if (handler.queue.size() > 1) {
240-
AudioTrackInfo info = handler.queue.get(1).getInfo();
241-
nextTrack = "[" + info.title + "](" + info.uri + ")";
242-
}
239+
String repeat = (handler.isLoop()) ? "Enabled" : "Disabled";
240+
243241
//Create Embed Message
244242
handler.logChannel.sendMessageEmbeds(
245243
new EmbedBuilder()
246244
.setTitle("Now Playing")
247245
.setDescription("[" + track.getInfo().title + "](" + track.getInfo().uri + ")")
248-
.addField("Song Duration", duration, true)
249-
.addField("Up Next", nextTrack, true)
246+
.addField("Duration", "`"+duration+"`", true)
247+
.addField("Queue", "`"+(handler.queue.size()-1)+"`", true)
248+
.addField("Volume", "`"+handler.audioPlayer.getVolume()+"%`", true)
249+
.addField("Requester", "<@!979590525428580363>", true)
250+
.addField("Link", "[`Click Here`]("+track.getInfo().uri+")", true)
251+
.addField("Repeat", "`"+repeat+"`", true)
250252
.setColor(EmbedColor.DEFAULT.color)
251253
.setThumbnail(thumb)
252254
.build()

src/main/java/technobot/listeners/MusicListener.java

Lines changed: 10 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -120,17 +120,18 @@ public MusicHandler getMusic(@NotNull SlashCommandInteractionEvent event, boolea
120120
/**
121121
* Joins a voice channel.
122122
*
123-
* @param channel The Voice Channel
123+
* @para guildData The GuilData instance for this guild.
124+
* @param channel The Voice Channel.
124125
* @param logChannel A log channel to notify users.
125126
*/
126-
public void joinChannel(@NotNull GuildData settings, @NotNull AudioChannel channel, TextChannel logChannel) {
127+
public void joinChannel(@NotNull GuildData guildData, @NotNull AudioChannel channel, TextChannel logChannel) {
127128
AudioManager manager = channel.getGuild().getAudioManager();
128-
if (settings.musicHandler == null) {
129-
settings.musicHandler = new MusicHandler(playerManager.createPlayer());
129+
if (guildData.musicHandler == null) {
130+
guildData.musicHandler = new MusicHandler(playerManager.createPlayer());
130131
}
131-
manager.setSendingHandler(settings.musicHandler);
132-
Objects.requireNonNull(settings.musicHandler).setLogChannel(logChannel);
133-
settings.musicHandler.setPlayChannel(channel);
132+
manager.setSendingHandler(guildData.musicHandler);
133+
Objects.requireNonNull(guildData.musicHandler).setLogChannel(logChannel);
134+
guildData.musicHandler.setPlayChannel(channel);
134135
manager.openAudioConnection(channel);
135136
}
136137

@@ -166,23 +167,7 @@ public void addTrack(SlashCommandInteractionEvent event, String url) {
166167

167168
@Override
168169
public void trackLoaded(@NotNull AudioTrack audioTrack) {
169-
// Create embed message
170-
if (!music.getQueue().isEmpty()) {
171-
String duration = formatTrackLength(audioTrack.getInfo().length);
172-
String thumb = MusicHandler.getThumbnail(audioTrack);
173-
174-
MessageEmbed embed = new EmbedBuilder()
175-
.setColor(EmbedColor.DEFAULT.color)
176-
.setTitle(audioTrack.getInfo().title, audioTrack.getInfo().uri)
177-
.addField("Song Duration", duration, true)
178-
.addField("Position in Queue", String.valueOf(music.getQueue().size()), true)
179-
.setFooter("Added by " + event.getUser().getAsTag(), event.getUser().getEffectiveAvatarUrl())
180-
.setThumbnail(thumb)
181-
.build();
182-
event.getHook().sendMessage(EmbedUtils.BLUE_TICK + " **" + audioTrack.getInfo().title + "** successfully added!").addEmbeds(embed).queue();
183-
} else {
184-
event.getHook().sendMessage(EmbedUtils.BLUE_TICK + " **" + audioTrack.getInfo().title + "** successfully added!").queue();
185-
}
170+
event.getHook().sendMessage(":notes: | Added **"+audioTrack.getInfo().title+"** to the queue.").queue();
186171
music.enqueue(audioTrack);
187172
}
188173

@@ -197,8 +182,7 @@ public void playlistLoaded(@NotNull AudioPlaylist audioPlaylist) {
197182
// Otherwise load first 100 tracks from playlist
198183
int total = audioPlaylist.getTracks().size();
199184
if (total > 100) total = 100;
200-
String msg = ":ballot_box_with_check: Added " + total + " tracks from playlist `" + audioPlaylist.getName() + "`";
201-
event.getHook().sendMessage(msg).queue();
185+
event.getHook().sendMessage(":notes: | Added **"+audioPlaylist.getName()+"** with `"+total+"` songs to the queue.").queue();
202186

203187
total = music.getQueue().size();
204188
for (AudioTrack track : audioPlaylist.getTracks()) {

0 commit comments

Comments
 (0)