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

cleanup commands

Browse Source
This commit is contained in:
Lee
2024-06-25 15:43:36 +01:00
parent 519cb72c14
commit e0fca911d9
24 changed files with 182 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,12 +2,7 @@ package cc.fascinated.bat.service;
import cc.fascinated.bat.command.BatCommand;
import cc.fascinated.bat.command.BatSubCommand;
import cc.fascinated.bat.command.impl.PingCommand;
import cc.fascinated.bat.common.EmbedUtils;
import cc.fascinated.bat.features.autorole.command.AutoRoleCommand;
import cc.fascinated.bat.features.scoresaber.command.numberone.NumberOneFeedCommand;
import cc.fascinated.bat.features.scoresaber.command.scoresaber.ScoreSaberCommand;
import cc.fascinated.bat.features.scoresaber.command.userfeed.UserFeedCommand;
import cc.fascinated.bat.model.BatGuild;
import cc.fascinated.bat.model.BatUser;
import lombok.NonNull;
@ -52,18 +47,7 @@ public class CommandService extends ListenerAdapter {
this.userService = userService;
DiscordService.JDA.addEventListener(this);
// todo: auto register commands
// Guild commands
registerCommand(context.getBean(UserFeedCommand.class));
registerCommand(context.getBean(NumberOneFeedCommand.class));
registerCommand(context.getBean(AutoRoleCommand.class));
// Global commands
registerCommand(context.getBean(ScoreSaberCommand.class));
registerCommand(context.getBean(PingCommand.class));
registerSlashCommands(); // Register all slash commands
context.getBeansOfType(BatCommand.class).values().forEach(this::registerCommand);
}
/**
@ -72,6 +56,10 @@ public class CommandService extends ListenerAdapter {
* @param command The command to register
*/
public void registerCommand(@NonNull BatCommand command) {
if (commands.get(command.getName().toLowerCase()) != null) {
return;
}
log.info("Registered command \"{}\"", command.getName());
commands.put(command.getName().toLowerCase(), command);
}

1
src/main/java/cc/fascinated/bat/service/EventService.java
View File

@ -9,7 +9,6 @@ import cc.fascinated.bat.model.BatUser;
import lombok.NonNull;
import lombok.extern.log4j.Log4j2;
import net.dv8tion.jda.api.events.guild.member.GuildMemberJoinEvent;
import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
import net.dv8tion.jda.api.hooks.ListenerAdapter;
import org.jetbrains.annotations.NotNull;
import org.springframework.beans.factory.annotation.Autowired;

36
src/main/java/cc/fascinated/bat/service/FeatureService.java Normal file
View File

@ -0,0 +1,36 @@
package cc.fascinated.bat.service;
import cc.fascinated.bat.features.Feature;
import lombok.Getter;
import lombok.NonNull;
import lombok.extern.log4j.Log4j2;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.DependsOn;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List;
/**
* @author Fascinated (fascinated7)
*/
@Service @Getter @Log4j2
@DependsOn("commandService")
public class FeatureService {
/**
* The registered features
*/
private final List<Feature> features = new ArrayList<>();
@Autowired
public FeatureService(@NonNull ApplicationContext context, @NonNull CommandService commandService) {
context.getBeansOfType(Feature.class)
.values()
.forEach((feature) -> {
features.add(context.getBean(feature.getClass()));
});
commandService.registerSlashCommands(); // Register all slash commands
}
}