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

add scoresaber feed command and websocket impl

Browse Source
This commit is contained in:
Lee
2024-06-24 17:42:57 +01:00
parent 39cdab27ce
commit c0ae0fc596
19 changed files with 570 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/main/java/cc/fascinated/bat/service/CommandService.java
View File

@ -5,8 +5,11 @@ import cc.fascinated.bat.command.BatSubCommand;
import cc.fascinated.bat.command.impl.global.beatsaber.scoresaber.LinkSubCommand;
import cc.fascinated.bat.command.impl.global.beatsaber.scoresaber.ScoreSaberCommand;
import cc.fascinated.bat.command.impl.global.beatsaber.scoresaber.UserSubCommand;
import cc.fascinated.bat.command.impl.guild.beatsaber.scoresaber.ScoreFeedChannelCommand;
import cc.fascinated.bat.command.impl.guild.beatsaber.scoresaber.ScoreFeedClearUsersCommand;
import cc.fascinated.bat.command.impl.guild.beatsaber.scoresaber.ScoreFeedUserCommand;
import cc.fascinated.bat.common.EmbedUtils;
import cc.fascinated.bat.model.BatGuild;
import cc.fascinated.bat.model.guild.BatGuild;
import cc.fascinated.bat.model.user.BatUser;
import lombok.NonNull;
import lombok.extern.log4j.Log4j2;
@ -14,7 +17,6 @@ import net.dv8tion.jda.api.JDA;
import net.dv8tion.jda.api.entities.Guild;
import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
import net.dv8tion.jda.api.hooks.ListenerAdapter;
import net.dv8tion.jda.api.interactions.commands.OptionMapping;
import org.jetbrains.annotations.NotNull;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.ApplicationContext;
@ -22,7 +24,6 @@ import org.springframework.context.annotation.DependsOn;
import org.springframework.stereotype.Service;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
@ -64,8 +65,11 @@ public class CommandService extends ListenerAdapter {
// Global commands
registerCommand(context.getBean(ScoreSaberCommand.class)
.addSubCommand("link", context.getBean(LinkSubCommand.class))
.addSubCommand("user", context.getBean(UserSubCommand.class)
));
.addSubCommand("user", context.getBean(UserSubCommand.class))
.addSubCommand("score-feed-user", context.getBean(ScoreFeedUserCommand.class))
.addSubCommand("score-feed-channel", context.getBean(ScoreFeedChannelCommand.class))
.addSubCommand("score-feed-clear-users", context.getBean(ScoreFeedClearUsersCommand.class))
);
registerSlashCommands(); // Register all slash commands
}
@ -125,18 +129,13 @@ public class CommandService extends ListenerAdapter {
BatUser user = userService.getUser(event.getUser().getId());
// No args provided, use the main command executor
List<OptionMapping> options = event.getInteraction().getOptions();
try {
if (options.isEmpty()) {
command.execute(guild, user, event.getChannel().asTextChannel(), event.getMember(), event.getInteraction(), null);
}
// Check if the sub command exists
for (Map.Entry<String, BatSubCommand> subCommand : command.getSubCommands().entrySet()) {
for (OptionMapping option : options) {
if (subCommand.getKey().equalsIgnoreCase(option.getName())) {
subCommand.getValue().execute(guild, user, event.getChannel().asTextChannel(), event.getMember(), event.getInteraction(), option);
if (event.getInteraction().getSubcommandName() == null) {
command.execute(guild, user, event.getChannel().asTextChannel(), event.getMember(), event.getInteraction());
} else {
for (Map.Entry<String, BatSubCommand> subCommand : command.getSubCommands().entrySet()) {
if (subCommand.getKey().equalsIgnoreCase(event.getInteraction().getSubcommandName())) {
subCommand.getValue().execute(guild, user, event.getChannel().asTextChannel(), event.getMember(), event.getInteraction());
break;
}
}