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

Merge branch 'master' into master

Browse Source
This commit is contained in:
okNick 2024-06-28 09:26:34 +00:00
commit 087ab99b44
3 changed files with 30 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/cc/fascinated/bat/command/impl/BotStatsCommand.java
View File

@ -42,8 +42,8 @@ public class BotStatsCommand extends BatCommand {
interaction.replyEmbeds(EmbedUtils.genericEmbed().setDescription(
"**Bot Statistics**\n" +
"➜ Guilds: **%s\n".formatted(jda.getGuilds().size()) +
"➜ Users: **%s\n".formatted(jda.getUsers().size()) +
"➜ Guilds: **%s**\n".formatted(jda.getGuilds().size()) +
"➜ Users: **%s**\n".formatted(jda.getUsers().size()) +
"➜ Gateway Ping: **%sms**\n".formatted(jda.getGatewayPing()) +
"\n" +
"**Bat Statistics**\n" +

5
src/main/java/cc/fascinated/bat/features/spotify/profile/SpotifyProfile.java
View File

@ -19,6 +19,11 @@ public class SpotifyProfile extends Profile {
*/
private String refreshToken;
/**
* When the access token expires
*/
private Long expiresAt;
public SpotifyProfile() {
super("spotify");
}

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

@ -7,6 +7,8 @@ import lombok.Getter;
import lombok.NonNull;
import lombok.SneakyThrows;
import net.jodah.expiringmap.ExpiringMap;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import se.michaelthelin.spotify.SpotifyApi;
@ -24,6 +26,7 @@ import java.util.concurrent.TimeUnit;
@Service
@Getter
public class SpotifyService {
private static final Logger log = LoggerFactory.getLogger(SpotifyService.class);
/**
* The access token map.
*/
@ -69,15 +72,7 @@ public class SpotifyService {
.build();
this.authorizationUrl = spotifyApi.authorizationCodeUri()
.response_type("code")
.scope(
AuthorizationScope.APP_REMOTE_CONTROL,
AuthorizationScope.USER_READ_PLAYBACK_POSITION,
AuthorizationScope.USER_READ_PLAYBACK_STATE,
AuthorizationScope.USER_MODIFY_PLAYBACK_STATE,
AuthorizationScope.USER_READ_CURRENTLY_PLAYING,
AuthorizationScope.APP_REMOTE_CONTROL,
AuthorizationScope.STREAMING
)
.scope(AuthorizationScope.values())
.build().execute().toString();
}
@ -91,7 +86,7 @@ public class SpotifyService {
try {
return getSpotifyApi(user).getUsersCurrentlyPlayingTrack().build().execute();
} catch (Exception e) {
return null;
throw new RuntimeException("Failed to get currently playing track", e);
}
}
@ -178,11 +173,27 @@ public class SpotifyService {
*
* @return the Spotify API
*/
@SneakyThrows
public SpotifyApi getSpotifyApi(BatUser user) {
SpotifyProfile profile = user.getProfile(SpotifyProfile.class);
return new SpotifyApi.Builder()
.setAccessToken(profile.getAccessToken())
SpotifyApi api = new SpotifyApi.Builder()
.setClientId(clientId)
.setClientSecret(clientSecret)
.setAccessToken(profile.getAccessToken())
.setRefreshToken(profile.getRefreshToken())
.build();
// Refresh the access token if it's expired
if (profile.getExpiresAt() == null || profile.getExpiresAt() < System.currentTimeMillis()) {
AuthorizationCodeCredentials credentials = api.authorizationCodeRefresh().build().execute();
profile.setAccessToken(credentials.getAccessToken());
profile.setRefreshToken(credentials.getRefreshToken());
profile.setExpiresAt(System.currentTimeMillis() + (credentials.getExpiresIn() * 1000));
api.setAccessToken(credentials.getAccessToken());
api.setRefreshToken(credentials.getRefreshToken());
userService.saveUser(user);
log.info("Refreshed spotify access token for user {}", user.getName());
}
return api;
}
}