diff --git a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/CommandReceivedHandler.java b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/CommandReceivedHandler.java index 4e240bf53..34735ae31 100644 --- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/CommandReceivedHandler.java +++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/CommandReceivedHandler.java @@ -37,6 +37,7 @@ import net.dv8tion.jda.api.hooks.ListenerAdapter; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; +import org.springframework.transaction.UnexpectedRollbackException; import org.springframework.transaction.annotation.Isolation; import org.springframework.transaction.annotation.Transactional; @@ -149,10 +150,9 @@ public class CommandReceivedHandler extends ListenerAdapter { try { UnParsedCommandResult result = getUnparsedCommandResult(message); CompletableFuture parsingFuture = getParametersFromMessage(message, result); - parsingFuture.thenAccept(parsedParameters -> - self.executeCommand(event, parsedParameters.getCommand(), parsedParameters.getParameters()) - ).exceptionally(throwable -> { - self.reportException(event, result.getCommand(), throwable, "Exception when executing or parsing command."); + parsingFuture.thenAccept(parsedParameters -> self.executeCommand(event, parsedParameters.getCommand(), parsedParameters.getParameters())); + parsingFuture.exceptionally(throwable -> { + self.reportException(event, result.getCommand(), throwable, "Exception when parsing command."); return null; }); } catch (Exception e) { diff --git a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/listener/async/jda/AsyncVoiceChannelLeftListenerBean.java b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/listener/async/jda/AsyncVoiceChannelLeftListenerBean.java index 94152a872..8f7add43e 100644 --- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/listener/async/jda/AsyncVoiceChannelLeftListenerBean.java +++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/listener/async/jda/AsyncVoiceChannelLeftListenerBean.java @@ -17,7 +17,7 @@ import java.util.List; @Slf4j public class AsyncVoiceChannelLeftListenerBean extends ListenerAdapter { - @Autowired + @Autowired(required = false) private List listenerList; @Autowired