clean up scoresaber feature

src/main/java/cc/fascinated/bat/features/scoresaber/UserScoreFeedListener.java

@@ -12,21 +12,23 @@ import cc.fascinated.bat.model.guild.BatGuild;
 import cc.fascinated.bat.model.guild.profiles.ScoreSaberUserScoreFeedProfile;
 import cc.fascinated.bat.service.DiscordService;
 import cc.fascinated.bat.service.GuildService;
+import lombok.extern.log4j.Log4j2;
 import net.dv8tion.jda.api.EmbedBuilder;
 import net.dv8tion.jda.api.entities.Guild;
 import net.dv8tion.jda.api.entities.MessageEmbed;
+import net.dv8tion.jda.api.entities.channel.concrete.TextChannel;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 /**
  * @author Fascinated (fascinated7)
  */
-@Component
-public class ScoreSaberScoreFeedListener implements EventListener {
+@Component @Log4j2
+public class UserScoreFeedListener implements EventListener {
     private final GuildService guildService;
 
     @Autowired
-    public ScoreSaberScoreFeedListener(GuildService guildService) {
+    public UserScoreFeedListener(GuildService guildService) {
         this.guildService = guildService;
     }
 
@@ -38,19 +40,19 @@ public class ScoreSaberScoreFeedListener implements EventListener {
             if (batGuild == null) {
                 continue;
             }
-
             ScoreSaberUserScoreFeedProfile profile = batGuild.getProfile(ScoreSaberUserScoreFeedProfile.class);
-            if (profile == null) {
-                continue;
-            }
-            if (profile.getChannelId() == null) {
-                continue;
-            }
-            if (!profile.getTrackedUsers().contains(player.getId())) {
+            if (profile == null || profile.getChannelId() == null || !profile.getTrackedUsers().contains(player.getId())) {
                 continue;
             }
 
-            profile.getAsTextChannel().sendMessageEmbeds(this.buildScoreEmbed(score)).queue();
+            TextChannel channel = profile.getAsTextChannel();
+            if (channel == null) {
+                log.error("Scoresaber user feed channel is null for guild {}, removing the stored channel.", guild.getId());
+                profile.setChannelId(null);
+                guildService.saveGuild(batGuild);
+                continue;
+            }
+            channel.sendMessageEmbeds(this.buildScoreEmbed(score)).queue();
         }
     }
 
@@ -78,7 +80,7 @@ public class ScoreSaberScoreFeedListener implements EventListener {
                         leaderboardToken.getMaxScore() == 0 ? "N/A" : NumberUtils.formatNumberCommas(((double) scoreToken.getBaseScore() / leaderboardToken.getMaxScore()) * 100)
                 ), true)
                 .addField("Raw PP", scoreToken.getPp() == 0 ? "Unranked" : NumberUtils.formatNumberCommas(scoreToken.getPp()), true)
-                .addField("Global Rank", "#%s".formatted(NumberUtils.formatNumberCommas(scoreToken.getRank())), true)
+                .addField("Rank", "#%s".formatted(NumberUtils.formatNumberCommas(scoreToken.getRank())), true)
                 .addField("Misses", "%s".formatted(scoreToken.getMissedNotes()), true)
                 .addField("Bad Cuts", "%s".formatted(scoreToken.getBadCuts()), true)
                 .addField("Max Combo", "%s %s".formatted(

src/main/java/cc/fascinated/bat/features/scoresaber/command/scoresaber/LinkSubCommand.java

@@ -19,7 +19,7 @@ import org.springframework.stereotype.Component;
 /**
  * @author Fascinated (fascinated7)
  */
-@Component
+@Component("scoresaber:link.sub")
 public class LinkSubCommand extends BatSubCommand {
     private final ScoreSaberService scoreSaberService;
     private final UserService userService;

src/main/java/cc/fascinated/bat/features/scoresaber/command/scoresaber/MeSubCommand.java

@@ -0,0 +1,30 @@
+package cc.fascinated.bat.features.scoresaber.command.scoresaber;
+
+import cc.fascinated.bat.command.BatSubCommand;
+import cc.fascinated.bat.model.guild.BatGuild;
+import cc.fascinated.bat.model.user.BatUser;
+import cc.fascinated.bat.service.ScoreSaberService;
+import lombok.NonNull;
+import net.dv8tion.jda.api.entities.Member;
+import net.dv8tion.jda.api.entities.channel.concrete.TextChannel;
+import net.dv8tion.jda.api.interactions.commands.SlashCommandInteraction;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author Fascinated (fascinated7)
+ */
+@Component("scoresaber:me.sub")
+public class MeSubCommand extends BatSubCommand {
+    private final ScoreSaberService scoreSaberService;
+
+    @Autowired
+    public MeSubCommand(@NonNull ScoreSaberService scoreSaberService) {
+        this.scoreSaberService = scoreSaberService;
+    }
+
+    @Override
+    public void execute(@NonNull BatGuild guild, @NonNull BatUser user, @NonNull TextChannel channel, @NonNull Member member, @NonNull SlashCommandInteraction interaction) {
+        ScoreSaberCommand.sendProfileEmbed(true, user, scoreSaberService, interaction);
+    }
+}

src/main/java/cc/fascinated/bat/features/scoresaber/command/scoresaber/ScoreSaberCommand.java

@@ -45,6 +45,7 @@ public class ScoreSaberCommand extends BatCommand {
                 .addSubcommands(new SubcommandData("user", "View a user's ScoreSaber profile")
                         .addOptions(new OptionData(OptionType.USER, "user", "The user to view the ScoreSaber profile of", true))
                 )
+                .addSubcommands(new SubcommandData("me", "View your ScoreSaber profile"))
         );
     }
 

src/main/java/cc/fascinated/bat/features/scoresaber/command/scoresaber/UserSubCommand.java

@@ -17,7 +17,7 @@ import org.springframework.stereotype.Component;
 /**
  * @author Fascinated (fascinated7)
  */
-@Component
+@Component("scoresaber:user.sub")
 public class UserSubCommand extends BatSubCommand {
     private final ScoreSaberService scoreSaberService;
     private final UserService userService;

src/main/java/cc/fascinated/bat/features/scoresaber/command/userfeed/ChannelSubCommand.java

@@ -20,12 +20,12 @@ import org.springframework.stereotype.Component;
 /**
  * @author Fascinated (fascinated7)
  */
-@Component
-public class ScoreFeedChannelCommand extends BatSubCommand {
+@Component("scoresaber-userfeed:channel.sub")
+public class ChannelSubCommand extends BatSubCommand {
     private final GuildService guildService;
 
     @Autowired
-    public ScoreFeedChannelCommand(GuildService guildService) {
+    public ChannelSubCommand(GuildService guildService) {
         this.guildService = guildService;
     }
 

src/main/java/cc/fascinated/bat/features/scoresaber/command/userfeed/ClearUsersSubCommand.java

@@ -17,12 +17,12 @@ import org.springframework.stereotype.Component;
 /**
  * @author Fascinated (fascinated7)
  */
-@Component
-public class ScoreFeedClearUsersCommand extends BatSubCommand {
+@Component("scoresaber-userfeed:clearusers.sub")
+public class ClearUsersSubCommand extends BatSubCommand {
     private final GuildService guildService;
 
     @Autowired
-    public ScoreFeedClearUsersCommand(GuildService guildService, UserService userService) {
+    public ClearUsersSubCommand(GuildService guildService, UserService userService) {
         this.guildService = guildService;
     }
 

src/main/java/cc/fascinated/bat/features/scoresaber/command/userfeed/UserFeedCommand.java

@@ -12,9 +12,9 @@ import org.springframework.stereotype.Component;
 /**
  * @author Fascinated (fascinated7)
  */
-@Component
-public class ScoreSaberUserFeedCommand extends BatCommand {
-    public ScoreSaberUserFeedCommand() {
+@Component("scoresaber-userfeed:feed.sub")
+public class UserFeedCommand extends BatCommand {
+    public UserFeedCommand() {
         super("scoresaber-userfeed");
         super.setCategory(Category.BEAT_SABER);
 

src/main/java/cc/fascinated/bat/features/scoresaber/command/userfeed/UserSubCommand.java

@@ -20,13 +20,13 @@ import org.springframework.stereotype.Component;
 /**
  * @author Fascinated (fascinated7)
  */
-@Component
-public class ScoreFeedUserCommand extends BatSubCommand {
+@Component("scoresaber-userfeed:user.sub")
+public class UserSubCommand extends BatSubCommand {
     private final GuildService guildService;
     private final UserService userService;
 
     @Autowired
-    public ScoreFeedUserCommand(GuildService guildService, UserService userService) {
+    public UserSubCommand(GuildService guildService, UserService userService) {
         this.guildService = guildService;
         this.userService = userService;
     }