Merge branch 'master' into master

This commit is contained in:
Lee 2024-06-28 17:55:07 +00:00
commit 4fc3431213
2 changed files with 5 additions and 4 deletions

@ -1,6 +1,7 @@
package cc.fascinated.bat.features.spotify.command;
import cc.fascinated.bat.command.BatCommand;
import cc.fascinated.bat.command.Category;
import cc.fascinated.bat.command.CommandInfo;
import lombok.NonNull;
import org.springframework.beans.factory.annotation.Autowired;
@ -11,7 +12,7 @@ import org.springframework.stereotype.Component;
* @author Fascinated (fascinated7)
*/
@Component
@CommandInfo(name = "spotify", description = "Change your Spotify settings", guildOnly = false)
@CommandInfo(name = "spotify", description = "Change your Spotify settings", guildOnly = false, category = Category.MUSIC)
public class SpotifyCommand extends BatCommand {
@Autowired
public SpotifyCommand(@NonNull ApplicationContext context) {

@ -50,7 +50,7 @@ public class GuildService extends ListenerAdapter {
if (premium.getExpiresAt() != null && premium.getExpiresAt().before(new Date())) {
premium.removePremium();
guildRepository.save(guild);
log.info("Removed premium status from guild \"{}\"", guild.getId());
log.info("Removed premium status from guild \"{}\"", guild.getName());
}
}
}
@ -77,7 +77,7 @@ public class GuildService extends ListenerAdapter {
return guild;
}
BatGuild guild = guildRepository.save(new BatGuild(id));
log.info("Created guild \"{}\" in {}ms", id, System.currentTimeMillis() - start);
log.info("Created guild \"{}\" in {}ms", guild.getName(), System.currentTimeMillis() - start);
return guild;
}
@ -106,7 +106,7 @@ public class GuildService extends ListenerAdapter {
@Override
public final void onGuildJoin(GuildJoinEvent event) {
Guild guild = event.getGuild();
log.info("Joined guild \"{}\"", guild.getId());
log.info("Joined guild \"{}\"", guild.getName());
getGuild(guild.getId()); // Ensure the guild is in the database
}
}