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

[AB-332] showing separate message in case there are no warnings

Browse Source
This commit is contained in:
Sheldan
2021-09-28 22:05:51 +02:00
parent 16e6caa1f0
commit b2a94059e2
1 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/command/Warnings.java
View File

@@ -12,9 +12,13 @@ import dev.sheldan.abstracto.core.command.execution.ContextConverter;
import dev.sheldan.abstracto.core.config.FeatureDefinition; import dev.sheldan.abstracto.core.config.FeatureDefinition;
import dev.sheldan.abstracto.core.exception.EntityGuildMismatchException; import dev.sheldan.abstracto.core.exception.EntityGuildMismatchException;
import dev.sheldan.abstracto.core.models.database.AServer; import dev.sheldan.abstracto.core.models.database.AServer;
import dev.sheldan.abstracto.core.service.ChannelService;
import dev.sheldan.abstracto.core.service.PaginatorService; import dev.sheldan.abstracto.core.service.PaginatorService;
import dev.sheldan.abstracto.core.service.management.ServerManagementService; import dev.sheldan.abstracto.core.service.management.ServerManagementService;
import dev.sheldan.abstracto.core.service.management.UserInServerManagementService; import dev.sheldan.abstracto.core.service.management.UserInServerManagementService;
import dev.sheldan.abstracto.core.templating.model.MessageToSend;
import dev.sheldan.abstracto.core.templating.service.TemplateService;
import dev.sheldan.abstracto.core.utils.FutureUtils;
import dev.sheldan.abstracto.moderation.config.ModerationModuleDefinition; import dev.sheldan.abstracto.moderation.config.ModerationModuleDefinition;
import dev.sheldan.abstracto.moderation.config.feature.ModerationFeatureDefinition; import dev.sheldan.abstracto.moderation.config.feature.ModerationFeatureDefinition;
import dev.sheldan.abstracto.moderation.converter.WarnEntryConverter; import dev.sheldan.abstracto.moderation.converter.WarnEntryConverter;
@@ -35,6 +39,7 @@ import java.util.concurrent.CompletableFuture;
public class Warnings extends AbstractConditionableCommand { public class Warnings extends AbstractConditionableCommand {
public static final String WARNINGS_RESPONSE_TEMPLATE = "warnings_response"; public static final String WARNINGS_RESPONSE_TEMPLATE = "warnings_response";
public static final String NO_WARNINGS_TEMPLATE_KEY = "warnings_no_warnings_found";
@Autowired @Autowired
private WarnManagementService warnManagementService; private WarnManagementService warnManagementService;
@@ -56,6 +61,12 @@ public class Warnings extends AbstractConditionableCommand {
@Autowired @Autowired
private Warnings self; private Warnings self;
@Autowired
private TemplateService templateService;
@Autowired
private ChannelService channelService;
@Override @Override
public CompletableFuture<CommandResult> executeAsync(CommandContext commandContext) { public CompletableFuture<CommandResult> executeAsync(CommandContext commandContext) {
List<Warning> warnsToDisplay; List<Warning> warnsToDisplay;
@@ -69,10 +80,17 @@ public class Warnings extends AbstractConditionableCommand {
AServer server = serverManagementService.loadServer(commandContext.getGuild()); AServer server = serverManagementService.loadServer(commandContext.getGuild());
warnsToDisplay = warnManagementService.getAllWarningsOfServer(server); warnsToDisplay = warnManagementService.getAllWarningsOfServer(server);
} }
return warnEntryConverter.fromWarnings(warnsToDisplay).thenApply(warnEntries -> { if(warnsToDisplay.isEmpty()) {
self.renderWarnings(commandContext, warnEntries); MessageToSend messageToSend = templateService.renderEmbedTemplate(NO_WARNINGS_TEMPLATE_KEY, new Object(), commandContext.getGuild().getIdLong());
return CommandResult.fromIgnored(); return FutureUtils.toSingleFutureGeneric(channelService.sendMessageToSendToChannel(messageToSend, commandContext.getChannel()))
}); .thenApply(unused -> CommandResult.fromSuccess());
} else {
return warnEntryConverter.fromWarnings(warnsToDisplay).thenApply(warnEntries -> {
self.renderWarnings(commandContext, warnEntries);
return CommandResult.fromSuccess();
});
}
} }
@@ -96,7 +114,7 @@ public class Warnings extends AbstractConditionableCommand {
.module(ModerationModuleDefinition.MODERATION) .module(ModerationModuleDefinition.MODERATION)
.templated(true) .templated(true)
.async(true) .async(true)
.causesReaction(true) .causesReaction(false)
.supportsEmbedException(true) .supportsEmbedException(true)
.parameters(parameters) .parameters(parameters)
.help(helpInfo) .help(helpInfo)