Sheldan/abstracto
1
0
Fork 0
mirror of https://github.com/Sheldan/abstracto.git synced 2026-04-03 00:20:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixing command alternatives being required

Browse Source 
fixing filename for export emote stats
fixing reaction report message update
This commit is contained in:
Sheldan
2022-08-01 22:59:48 +02:00
parent 0a4238c9f5
commit b747516881
5 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/CommandReceivedHandler.java
View File

@@ -75,7 +75,7 @@ public class CommandReceivedHandler extends ListenerAdapter {
@Autowired
private List<CommandParameterHandler> parameterHandlers;
@Autowired
@Autowired(required = false)
private List<CommandAlternative> commandAlternatives;
@Autowired
@@ -149,14 +149,16 @@ public class CommandReceivedHandler extends ListenerAdapter {
return null;
});
} else {
Optional<CommandAlternative> foundAlternativeOptional = commandAlternatives
.stream()
.filter(commandAlternative -> commandAlternative.matches(result.getParameter()))
.findFirst();
if(foundAlternativeOptional.isPresent()) {
CommandAlternative foundAlternative = foundAlternativeOptional.get();
log.info("Found alternative {} to execute for command.", foundAlternative.getClass());
foundAlternative.execute(result.getParameter(), message);
if(commandAlternatives != null) {
Optional<CommandAlternative> foundAlternativeOptional = commandAlternatives
.stream()
.filter(commandAlternative -> commandAlternative.matches(result.getParameter()))
.findFirst();
if(foundAlternativeOptional.isPresent()) {
CommandAlternative foundAlternative = foundAlternativeOptional.get();
log.info("Found alternative {} to execute for command.", foundAlternative.getClass());
foundAlternative.execute(result.getParameter(), message);
}
}
}
} catch (Exception e) {
@@ -553,7 +555,9 @@ public class CommandReceivedHandler extends ListenerAdapter {
metricService.registerCounter(COMMANDS_PROCESSED_COUNTER, "Commands processed");
metricService.registerCounter(COMMANDS_WRONG_PARAMETER_COUNTER, "Commands with incorrect parameter");
this.parameterHandlers = parameterHandlers.stream().sorted(comparing(CommandParameterHandler::getPriority)).collect(Collectors.toList());
this.commandAlternatives = commandAlternatives.stream().sorted(comparing(Prioritized::getPriority)).collect(Collectors.toList());
if(commandAlternatives != null) {
this.commandAlternatives = commandAlternatives.stream().sorted(comparing(Prioritized::getPriority)).collect(Collectors.toList());
}
}
@Getter