okNick/Bat
1
0
Fork 0
forked from Fascinated/Bat
Code Pull Requests Activity

add emojis to the spotify commands

Browse Source
This commit is contained in:
Lee
2024-06-29 16:54:39 +01:00
parent 4cb34fbb9a
commit 4821e2a4fa
13 changed files with 100 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/cc/fascinated/bat/features/spotify/SpotifyFeature.java
View File

@ -1,5 +1,6 @@
package cc.fascinated.bat.features.spotify;
import cc.fascinated.bat.Emojis;
import cc.fascinated.bat.command.Category;
import cc.fascinated.bat.common.EmbedUtils;
import cc.fascinated.bat.features.Feature;
@ -24,7 +25,7 @@ public class SpotifyFeature extends Feature {
*/
public static MessageEmbed linkAccountEmbed() {
return EmbedUtils.genericEmbed()
.setDescription("You need to link your Spotify account before you can use this command.")
.setDescription("%s You need to link your Spotify account before you can use this command.".formatted(Emojis.CROSS_MARK_EMOJI))
.build();
}
}

3
src/main/java/cc/fascinated/bat/features/spotify/command/CurrentSubCommand.java
View File

@ -1,5 +1,6 @@
package cc.fascinated.bat.features.spotify.command;
import cc.fascinated.bat.Emojis;
import cc.fascinated.bat.command.BatSubCommand;
import cc.fascinated.bat.command.CommandInfo;
import cc.fascinated.bat.common.EmbedUtils;
@ -44,7 +45,7 @@ public class CurrentSubCommand extends BatSubCommand {
if (!spotifyService.hasTrackPlaying(user)) {
interaction.replyEmbeds(EmbedUtils.errorEmbed()
.setDescription("You are not currently playing a track.")
.setDescription("%s You are not currently playing a track.".formatted(Emojis.CROSS_MARK_EMOJI))
.build())
.queue();
return;

50
src/main/java/cc/fascinated/bat/features/spotify/command/LinkSubCommand.java
View File

@ -1,5 +1,7 @@
package cc.fascinated.bat.features.spotify.command;
import cc.fascinated.bat.Consts;
import cc.fascinated.bat.Emojis;
import cc.fascinated.bat.command.BatSubCommand;
import cc.fascinated.bat.command.CommandInfo;
import cc.fascinated.bat.common.EmbedUtils;
@ -38,25 +40,33 @@ public class LinkSubCommand extends BatSubCommand implements EventListener {
@Override
public void execute(BatGuild guild, @NonNull BatUser user, @NonNull MessageChannel channel, Member member, @NonNull SlashCommandInteraction interaction) {
if (!user.getId().equals(Consts.BOT_OWNER)) {
interaction.replyEmbeds(EmbedUtils.genericEmbed()
.setDescription("""
%s We are currently awaiting Spotify's approval for our application. Please check back later.
Submitted on: <t:1719583353>
""".formatted(Emojis.CROSS_MARK_EMOJI))
.build()).queue();
return;
}
SpotifyProfile profile = user.getProfile(SpotifyProfile.class);
if (profile.hasLinkedAccount()) {
interaction.replyEmbeds(EmbedUtils.errorEmbed()
.setDescription("%s You have already linked your Spotify account!".formatted(Emojis.CROSS_MARK_EMOJI))
.build())
.setEphemeral(true)
.queue();
return;
}
interaction.replyEmbeds(EmbedUtils.genericEmbed()
.setDescription("We are currently awaiting Spotify's approval for our application. Please check back later.")
.build()).queue();
// SpotifyProfile profile = user.getProfile(SpotifyProfile.class);
// if (profile.hasLinkedAccount()) {
// interaction.replyEmbeds(EmbedUtils.errorEmbed()
// .setDescription("You have already linked your Spotify account!")
// .build())
// .setEphemeral(true)
// .queue();
// return;
// }
//
// interaction.replyEmbeds(EmbedUtils.genericEmbed()
// .setDescription("You can link your Spotify account by clicking [here](%s)".formatted(spotifyService.getAuthorizationUrl()))
// .build())
// .addComponents(ActionRow.of(Button.primary("spotify_link", "Link Spotify")))
// .setEphemeral(true)
// .queue();
.setDescription("%s You can link your Spotify account by clicking [here](%s)".formatted(
Emojis.SPOTIFY_EMOJI.getFormatted(),
spotifyService.getAuthorizationUrl()
)).build())
.addComponents(ActionRow.of(Button.primary("spotify_link", "Link Code").withEmoji(Emojis.SPOTIFY_EMOJI)))
.setEphemeral(true)
.queue();
}
@Override
@ -91,8 +101,8 @@ public class LinkSubCommand extends BatSubCommand implements EventListener {
String code = codeMapping.getAsString();
spotifyService.linkAccount(user, code);
event.replyEmbeds(EmbedUtils.successEmbed()
.setDescription("Successfully linked your Spotify account!")
.build())
.setDescription("%s You have linked your Spotify account!".formatted(Emojis.CHECK_MARK_EMOJI.getFormatted()))
.build())
.setEphemeral(true)
.queue();
}

6
src/main/java/cc/fascinated/bat/features/spotify/command/PauseSubCommand.java
View File

@ -1,5 +1,6 @@
package cc.fascinated.bat.features.spotify.command;
import cc.fascinated.bat.Emojis;
import cc.fascinated.bat.command.BatSubCommand;
import cc.fascinated.bat.command.CommandInfo;
import cc.fascinated.bat.common.EmbedUtils;
@ -38,7 +39,7 @@ public class PauseSubCommand extends BatSubCommand {
if (!spotifyService.hasTrackPlaying(user)) {
interaction.replyEmbeds(EmbedUtils.errorEmbed()
.setDescription("You need to be playing a track to pause it.")
.setDescription("%s You need to be playing a track to pause it.".formatted(Emojis.CROSS_MARK_EMOJI))
.build())
.queue();
return;
@ -46,7 +47,8 @@ public class PauseSubCommand extends BatSubCommand {
boolean didPause = spotifyService.pausePlayback(user);
interaction.replyEmbeds(EmbedUtils.successEmbed()
.setDescription(didPause ? "Paused the current track." : "The current track is already paused.")
.setDescription(didPause ? ":pause_button: Paused the current track.".formatted(Emojis.CHECK_MARK_EMOJI) :
"%s The current track is already paused.".formatted(Emojis.CROSS_MARK_EMOJI))
.build())
.queue();
}

6
src/main/java/cc/fascinated/bat/features/spotify/command/ResumeSubCommand.java
View File

@ -1,5 +1,6 @@
package cc.fascinated.bat.features.spotify.command;
import cc.fascinated.bat.Emojis;
import cc.fascinated.bat.command.BatSubCommand;
import cc.fascinated.bat.command.CommandInfo;
import cc.fascinated.bat.common.EmbedUtils;
@ -38,7 +39,7 @@ public class ResumeSubCommand extends BatSubCommand {
if (!spotifyService.hasTrackPlaying(user)) {
interaction.replyEmbeds(EmbedUtils.errorEmbed()
.setDescription("You need to be playing a track to resume it.")
.setDescription("%s You need to be playing a track to resume it.".formatted(Emojis.CROSS_MARK_EMOJI))
.build())
.queue();
return;
@ -46,7 +47,8 @@ public class ResumeSubCommand extends BatSubCommand {
boolean didPause = spotifyService.resumePlayback(user);
interaction.replyEmbeds(EmbedUtils.successEmbed()
.setDescription(didPause ? "Resumed the current track." : "The current track is already playing.")
.setDescription(didPause ? "%s Resumed the current track.".formatted(Emojis.CHECK_MARK_EMOJI) :
"%s The current track is already playing.".formatted(Emojis.CROSS_MARK_EMOJI))
.build())
.queue();
}

5
src/main/java/cc/fascinated/bat/features/spotify/command/UnlinkSubCommand.java
View File

@ -1,5 +1,6 @@
package cc.fascinated.bat.features.spotify.command;
import cc.fascinated.bat.Emojis;
import cc.fascinated.bat.command.BatSubCommand;
import cc.fascinated.bat.command.CommandInfo;
import cc.fascinated.bat.common.EmbedUtils;
@ -33,7 +34,7 @@ public class UnlinkSubCommand extends BatSubCommand implements EventListener {
SpotifyProfile profile = user.getProfile(SpotifyProfile.class);
if (!profile.hasLinkedAccount()) {
interaction.replyEmbeds(EmbedUtils.errorEmbed()
.setDescription("You do not have a linked Spotify account.")
.setDescription("%s You do not have a linked Spotify account.".formatted(Emojis.CROSS_MARK_EMOJI))
.build())
.setEphemeral(true)
.queue();
@ -43,7 +44,7 @@ public class UnlinkSubCommand extends BatSubCommand implements EventListener {
profile.reset();
userService.saveUser(user);
interaction.replyEmbeds(EmbedUtils.successEmbed()
.setDescription("Successfully unlinked your Spotify account.")
.setDescription("%s Successfully unlinked your Spotify account.".formatted(Emojis.CHECK_MARK_EMOJI))
.build())
.setEphemeral(true)
.queue();