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

added allowed roles, immune roles and restriction status to help command

Browse Source
This commit is contained in:
Sheldan
2020-04-28 21:32:20 +02:00
parent 65b693be7b
commit 6ed3a133e2
3 changed files with 34 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/commands/help/Help.java
View File

@@ -3,14 +3,19 @@ package dev.sheldan.abstracto.core.commands.help;
import dev.sheldan.abstracto.core.command.*; import dev.sheldan.abstracto.core.command.*;
import dev.sheldan.abstracto.core.command.config.*; import dev.sheldan.abstracto.core.command.config.*;
import dev.sheldan.abstracto.core.command.execution.*; import dev.sheldan.abstracto.core.command.execution.*;
import dev.sheldan.abstracto.core.command.models.database.ACommand;
import dev.sheldan.abstracto.core.command.models.database.ACommandInAServer;
import dev.sheldan.abstracto.core.command.service.CommandRegistry; import dev.sheldan.abstracto.core.command.service.CommandRegistry;
import dev.sheldan.abstracto.core.command.service.ModuleRegistry; import dev.sheldan.abstracto.core.command.service.ModuleRegistry;
import dev.sheldan.abstracto.core.command.service.management.CommandInServerManagementService;
import dev.sheldan.abstracto.core.command.service.management.CommandManagementService;
import dev.sheldan.abstracto.core.config.FeatureEnum; import dev.sheldan.abstracto.core.config.FeatureEnum;
import dev.sheldan.abstracto.core.config.features.CoreFeatures; import dev.sheldan.abstracto.core.config.features.CoreFeatures;
import dev.sheldan.abstracto.core.models.template.commands.help.HelpCommandDetailsModel; import dev.sheldan.abstracto.core.models.template.commands.help.HelpCommandDetailsModel;
import dev.sheldan.abstracto.core.models.template.commands.help.HelpModuleDetailsModel; import dev.sheldan.abstracto.core.models.template.commands.help.HelpModuleDetailsModel;
import dev.sheldan.abstracto.core.models.template.commands.help.HelpModuleOverviewModel; import dev.sheldan.abstracto.core.models.template.commands.help.HelpModuleOverviewModel;
import dev.sheldan.abstracto.core.service.ChannelService; import dev.sheldan.abstracto.core.service.ChannelService;
import dev.sheldan.abstracto.core.service.RoleService;
import dev.sheldan.abstracto.templating.model.MessageToSend; import dev.sheldan.abstracto.templating.model.MessageToSend;
import dev.sheldan.abstracto.templating.service.TemplateService; import dev.sheldan.abstracto.templating.service.TemplateService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@@ -36,6 +41,15 @@ public class Help implements Command {
@Autowired @Autowired
private CommandRegistry commandRegistry; private CommandRegistry commandRegistry;
@Autowired
private CommandInServerManagementService commandInServerManagementService;
@Autowired
private CommandManagementService commandManagementService;
@Autowired
private RoleService roleService;
@Override @Override
public CommandResult execute(CommandContext commandContext) { public CommandResult execute(CommandContext commandContext) {
List<Object> parameters = commandContext.getParameters().getParameters(); List<Object> parameters = commandContext.getParameters().getParameters();
@@ -59,7 +73,14 @@ public class Help implements Command {
channelService.sendMessageToEndInTextChannel(messageToSend, commandContext.getChannel()); channelService.sendMessageToEndInTextChannel(messageToSend, commandContext.getChannel());
} else if(commandRegistry.commandExists(parameter)) { } else if(commandRegistry.commandExists(parameter)) {
Command command = commandRegistry.getCommandByName(parameter); Command command = commandRegistry.getCommandByName(parameter);
ACommand aCommand = commandManagementService.findCommandByName(parameter);
ACommandInAServer aCommandInAServer = commandInServerManagementService.getCommandForServer(aCommand, commandContext.getUserInitiatedContext().getServer());
HelpCommandDetailsModel model = (HelpCommandDetailsModel) ContextConverter.fromCommandContext(commandContext, HelpCommandDetailsModel.class); HelpCommandDetailsModel model = (HelpCommandDetailsModel) ContextConverter.fromCommandContext(commandContext, HelpCommandDetailsModel.class);
if(aCommandInAServer.getRestricted()) {
model.setImmuneRoles(roleService.getRolesFromGuild(aCommandInAServer.getImmuneRoles()));
model.setAllowedRoles(roleService.getRolesFromGuild(aCommandInAServer.getAllowedRoles()));
model.setRestricted(true);
}
model.setCommand(command.getConfiguration()); model.setCommand(command.getConfiguration());
MessageToSend messageToSend = templateService.renderEmbedTemplate("help_command_details_response", model); MessageToSend messageToSend = templateService.renderEmbedTemplate("help_command_details_response", model);
channelService.sendMessageToEndInTextChannel(messageToSend, commandContext.getChannel()); channelService.sendMessageToEndInTextChannel(messageToSend, commandContext.getChannel());

7
abstracto-application/core/core-impl/src/main/resources/seedData/templates/coreCommands/help/help_command_details_response_embed_en_US.ftl
View File

@@ -25,6 +25,13 @@ Detailed help: ${command.help.longHelp}
<#if command.aliases?? && command.aliases?size gt 0> <#if command.aliases?? && command.aliases?size gt 0>
Aliases: `${command.aliases?join("`, `")}` Aliases: `${command.aliases?join("`, `")}`
</#if> </#if>
Restrictions:
<#if restricted?? && restricted>
Executable by:<#if allowedRoles??> <#list allowedRoles as allowedRole> ${allowedRole.asMention}<#sep>or<#else>Nobody</#list> </#if>
<#if immuneRoles?? > Immune roles: <#list immuneRoles as immuneRole> ${immuneRole.asMention}<#sep>or<#else>None</#list> </#if>
<#else>
Not restricted
</#if>
</#if> </#if>
Parameters: Parameters:
<#if command.parameters??> <#if command.parameters??>

6
abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/template/commands/help/HelpCommandDetailsModel.java
View File

@@ -5,10 +5,16 @@ import dev.sheldan.abstracto.core.models.context.UserInitiatedServerContext;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import lombok.experimental.SuperBuilder; import lombok.experimental.SuperBuilder;
import net.dv8tion.jda.api.entities.Role;
import java.util.List;
@Getter @Getter
@Setter @Setter
@SuperBuilder @SuperBuilder
public class HelpCommandDetailsModel extends UserInitiatedServerContext { public class HelpCommandDetailsModel extends UserInitiatedServerContext {
private CommandConfiguration command; private CommandConfiguration command;
private List<Role> allowedRoles;
private List<Role> immuneRoles;
private Boolean restricted;
} }