Fascinated/Bat
1
1
Fork 2
Code Issues 1 Pull Requests Actions Activity

cleanup spotify
All checks were successful
Deploy to Dokku / docker (ubuntu-latest) (push) Successful in 36s
Details

Browse Source
This commit is contained in:
Lee 2024-06-28 19:59:29 +01:00
parent f4d3752de7
commit 827e1bed4f
6 changed files with 55 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -43,7 +43,7 @@ public class CurrentSubCommand extends BatSubCommand {
} }
if (!spotifyService.hasTrackPlaying(user)) { if (!spotifyService.hasTrackPlaying(user)) {
interaction.replyEmbeds(EmbedUtils.genericEmbed() interaction.replyEmbeds(EmbedUtils.errorEmbed()
.setDescription("You are not currently playing a track.") .setDescription("You are not currently playing a track.")
.build()) .build())
.queue(); .queue();
@ -55,14 +55,23 @@ public class CurrentSubCommand extends BatSubCommand {
String trackUrl = "https://open.spotify.com/track/" + track.getId(); String trackUrl = "https://open.spotify.com/track/" + track.getId();
String albumUrl = "https://open.spotify.com/album/" + album.getId(); String albumUrl = "https://open.spotify.com/album/" + album.getId();
StringBuilder artists = new StringBuilder();
for (int i = 0; i < track.getArtists().length; i++) {
artists.append("**[%s](%s)**".formatted(track.getArtists()[i].getName(), "https://open.spotify.com/artist/" + track.getArtists()[i].getId()));
if (i != track.getArtists().length - 1) {
artists.append(", ");
}
}
String description = String description =
"➜ Song: **[%s](%s)**\n".formatted(track.getName(), trackUrl) + "➜ Song: **[%s](%s)**\n".formatted(track.getName(), trackUrl) +
"➜ Album: **[%s](%s)**\n".formatted(album.getName(), albumUrl) + "➜ Album: **[%s](%s)**\n".formatted(album.getName(), albumUrl) +
"➜ Position: %s\n".formatted(getFormattedTime(currentlyPlaying)); "➜ Artist%s: %s\n".formatted(track.getArtists().length > 1 ? "s" : "", artists) +
"➜ Position: %s\n".formatted(getFormattedTime(currentlyPlaying));
Image albumCover = album.getImages()[0]; Image albumCover = album.getImages()[0];
interaction.replyEmbeds(EmbedUtils.genericEmbed() interaction.replyEmbeds(EmbedUtils.genericEmbed()
.setAuthor("Listening to %s".formatted(track.getName()), trackUrl) .setAuthor("Listening to %s | %s".formatted(track.getName(), track.getArtists()[0].getName()), trackUrl)
.setThumbnail(albumCover.getUrl()) .setThumbnail(albumCover.getUrl())
.setDescription(description) .setDescription(description)
.build()).queue(); .build()).queue();

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

@ -4,6 +4,7 @@ import cc.fascinated.bat.command.BatSubCommand;
import cc.fascinated.bat.command.CommandInfo; import cc.fascinated.bat.command.CommandInfo;
import cc.fascinated.bat.common.EmbedUtils; import cc.fascinated.bat.common.EmbedUtils;
import cc.fascinated.bat.event.EventListener; import cc.fascinated.bat.event.EventListener;
import cc.fascinated.bat.features.spotify.profile.SpotifyProfile;
import cc.fascinated.bat.model.BatGuild; import cc.fascinated.bat.model.BatGuild;
import cc.fascinated.bat.model.BatUser; import cc.fascinated.bat.model.BatUser;
import cc.fascinated.bat.service.SpotifyService; import cc.fascinated.bat.service.SpotifyService;
@ -37,6 +38,15 @@ public class LinkSubCommand extends BatSubCommand implements EventListener {
@Override @Override
public void execute(BatGuild guild, @NonNull BatUser user, @NonNull MessageChannel channel, Member member, @NonNull SlashCommandInteraction interaction) { public void execute(BatGuild guild, @NonNull BatUser user, @NonNull MessageChannel channel, Member member, @NonNull SlashCommandInteraction interaction) {
SpotifyProfile profile = user.getProfile(SpotifyProfile.class);
if (profile.hasLinkedAccount()) {
interaction.replyEmbeds(EmbedUtils.errorEmbed()
.setDescription("You have already linked your Spotify account!")
.build())
.queue();
return;
}
interaction.replyEmbeds(EmbedUtils.genericEmbed() interaction.replyEmbeds(EmbedUtils.genericEmbed()
.setDescription("You can link your Spotify account by clicking [here](%s)".formatted(spotifyService.getAuthorizationUrl())) .setDescription("You can link your Spotify account by clicking [here](%s)".formatted(spotifyService.getAuthorizationUrl()))
.build()) .build())

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

@ -37,7 +37,7 @@ public class PauseSubCommand extends BatSubCommand {
} }
if (!spotifyService.hasTrackPlaying(user)) { if (!spotifyService.hasTrackPlaying(user)) {
interaction.replyEmbeds(EmbedUtils.genericEmbed() interaction.replyEmbeds(EmbedUtils.errorEmbed()
.setDescription("You need to be playing a track to pause it.") .setDescription("You need to be playing a track to pause it.")
.build()) .build())
.queue(); .queue();
@ -45,7 +45,7 @@ public class PauseSubCommand extends BatSubCommand {
} }
boolean didPause = spotifyService.pausePlayback(user); boolean didPause = spotifyService.pausePlayback(user);
interaction.replyEmbeds(EmbedUtils.genericEmbed() interaction.replyEmbeds(EmbedUtils.successEmbed()
.setDescription(didPause ? "Paused the current track." : "The current track is already paused.") .setDescription(didPause ? "Paused the current track." : "The current track is already paused.")
.build()) .build())
.queue(); .queue();

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

@ -37,15 +37,15 @@ public class ResumeSubCommand extends BatSubCommand {
} }
if (!spotifyService.hasTrackPlaying(user)) { if (!spotifyService.hasTrackPlaying(user)) {
interaction.replyEmbeds(EmbedUtils.genericEmbed() interaction.replyEmbeds(EmbedUtils.errorEmbed()
.setDescription("You need to be playing a track to pause it.") .setDescription("You need to be playing a track to resume it.")
.build()) .build())
.queue(); .queue();
return; return;
} }
boolean didPause = spotifyService.resumePlayback(user); boolean didPause = spotifyService.resumePlayback(user);
interaction.replyEmbeds(EmbedUtils.genericEmbed() interaction.replyEmbeds(EmbedUtils.successEmbed()
.setDescription(didPause ? "Resumed the current track." : "The current track is already playing.") .setDescription(didPause ? "Resumed the current track." : "The current track is already playing.")
.build()) .build())
.queue(); .queue();

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

@ -32,7 +32,7 @@ public class UnlinkSubCommand extends BatSubCommand implements EventListener {
public void execute(BatGuild guild, @NonNull BatUser user, @NonNull MessageChannel channel, Member member, @NonNull SlashCommandInteraction interaction) { public void execute(BatGuild guild, @NonNull BatUser user, @NonNull MessageChannel channel, Member member, @NonNull SlashCommandInteraction interaction) {
SpotifyProfile profile = user.getProfile(SpotifyProfile.class); SpotifyProfile profile = user.getProfile(SpotifyProfile.class);
if (!profile.hasLinkedAccount()) { if (!profile.hasLinkedAccount()) {
interaction.replyEmbeds(EmbedUtils.genericEmbed() interaction.replyEmbeds(EmbedUtils.errorEmbed()
.setDescription("You do not have a linked Spotify account.") .setDescription("You do not have a linked Spotify account.")
.build()) .build())
.queue(); .queue();
@ -41,7 +41,7 @@ public class UnlinkSubCommand extends BatSubCommand implements EventListener {
profile.reset(); profile.reset();
userService.saveUser(user); userService.saveUser(user);
interaction.replyEmbeds(EmbedUtils.genericEmbed() interaction.replyEmbeds(EmbedUtils.successEmbed()
.setDescription("Successfully unlinked your Spotify account.") .setDescription("Successfully unlinked your Spotify account.")
.build()) .build())
.queue(); .queue();

55
src/main/java/cc/fascinated/bat/service/SpotifyService.java
View File

@ -6,9 +6,8 @@ import cc.fascinated.bat.model.BatUser;
import lombok.Getter; import lombok.Getter;
import lombok.NonNull; import lombok.NonNull;
import lombok.SneakyThrows; import lombok.SneakyThrows;
import lombok.extern.log4j.Log4j2;
import net.jodah.expiringmap.ExpiringMap; import net.jodah.expiringmap.ExpiringMap;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import se.michaelthelin.spotify.SpotifyApi; import se.michaelthelin.spotify.SpotifyApi;
@ -25,8 +24,8 @@ import java.util.concurrent.TimeUnit;
*/ */
@Service @Service
@Getter @Getter
@Log4j2
public class SpotifyService { public class SpotifyService {
private static final Logger log = LoggerFactory.getLogger(SpotifyService.class);
/** /**
* The access token map. * The access token map.
*/ */
@ -108,12 +107,8 @@ public class SpotifyService {
*/ */
@SneakyThrows @SneakyThrows
public boolean pausePlayback(BatUser user) { public boolean pausePlayback(BatUser user) {
try { getSpotifyApi(user).pauseUsersPlayback().build().execute();
getSpotifyApi(user).pauseUsersPlayback().build().execute(); return true;
return true;
} catch (Exception e) {
return false;
}
} }
/** /**
@ -124,12 +119,8 @@ public class SpotifyService {
*/ */
@SneakyThrows @SneakyThrows
public boolean resumePlayback(BatUser user) { public boolean resumePlayback(BatUser user) {
try { getSpotifyApi(user).startResumeUsersPlayback().build().execute();
getSpotifyApi(user).startResumeUsersPlayback().build().execute(); return true;
return true;
} catch (Exception e) {
return false;
}
} }
/** /**
@ -154,7 +145,7 @@ public class SpotifyService {
* Links the user's Spotify account with their Discord account. * Links the user's Spotify account with their Discord account.
* *
* @param user the user to link the account with * @param user the user to link the account with
* @param key the key to link the account with * @param key the key to link the account with
*/ */
public void linkAccount(BatUser user, String key) { public void linkAccount(BatUser user, String key) {
AuthorizationCodeCredentials credentials = accessToken.get(key); AuthorizationCodeCredentials credentials = accessToken.get(key);
@ -165,6 +156,7 @@ public class SpotifyService {
SpotifyProfile profile = user.getProfile(SpotifyProfile.class); SpotifyProfile profile = user.getProfile(SpotifyProfile.class);
profile.setAccessToken(credentials.getAccessToken()); profile.setAccessToken(credentials.getAccessToken());
profile.setRefreshToken(credentials.getRefreshToken()); profile.setRefreshToken(credentials.getRefreshToken());
profile.setExpiresAt(System.currentTimeMillis() + (credentials.getExpiresIn() * 1000));
userService.saveUser(user); userService.saveUser(user);
} }
@ -176,24 +168,27 @@ public class SpotifyService {
@SneakyThrows @SneakyThrows
public SpotifyApi getSpotifyApi(BatUser user) { public SpotifyApi getSpotifyApi(BatUser user) {
SpotifyProfile profile = user.getProfile(SpotifyProfile.class); SpotifyProfile profile = user.getProfile(SpotifyProfile.class);
SpotifyApi api = new SpotifyApi.Builder() ensureValidToken(profile, user);
.setClientId(clientId) return new SpotifyApi.Builder()
.setClientSecret(clientSecret)
.setAccessToken(profile.getAccessToken()) .setAccessToken(profile.getAccessToken())
.setRefreshToken(profile.getRefreshToken()) .setRefreshToken(profile.getRefreshToken())
.build(); .build();
}
// Refresh the access token if it's expired /**
if (profile.getExpiresAt() == null || profile.getExpiresAt() < System.currentTimeMillis()) { * Ensures the user has a valid Spotify access token.
AuthorizationCodeCredentials credentials = api.authorizationCodeRefresh().build().execute(); *
profile.setAccessToken(credentials.getAccessToken()); * @param user the user to get the token for
profile.setRefreshToken(credentials.getRefreshToken()); */
profile.setExpiresAt(System.currentTimeMillis() + (credentials.getExpiresIn() * 1000)); @SneakyThrows
api.setAccessToken(credentials.getAccessToken()); public void ensureValidToken(SpotifyProfile profile, BatUser user) {
api.setRefreshToken(credentials.getRefreshToken()); if (profile.getExpiresAt() == null || profile.getExpiresAt() > System.currentTimeMillis()) {
userService.saveUser(user); return;
log.info("Refreshed spotify access token for user {}", user.getName());
} }
return api; AuthorizationCodeCredentials credentials = spotifyApi.authorizationCodeRefresh().build().execute();
profile.setAccessToken(credentials.getAccessToken());
profile.setRefreshToken(credentials.getRefreshToken());
profile.setExpiresAt(System.currentTimeMillis() + (credentials.getExpiresIn() * 1000));
userService.saveUser(user);
} }
} }