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

allowed the Arole parameter type to be either an id or the role mention

Browse Source 
fixed adding/removing allowed roles, the compare did not work
changed a few commands to use the Arole parameter
This commit is contained in:
Sheldan
2020-04-28 22:12:29 +02:00
parent 6ed3a133e2
commit 85c47db5ed
18 changed files with 36 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
abstracto-application/abstracto-modules/experience-tracking/experience-tracking-impl/src/main/java/dev/sheldan/abstracto/experience/commands/SetExpRole.java
View File

@@ -53,7 +53,7 @@ public class SetExpRole extends AbstractConditionableCommand {
public CommandConfiguration getConfiguration() {
List<Parameter> parameters = new ArrayList<>();
parameters.add(Parameter.builder().name("level").type(Integer.class).build());
parameters.add(Parameter.builder().name("roleId").type(Long.class).build());
parameters.add(Parameter.builder().name("role").type(ARole.class).build());
HelpInfo helpInfo = HelpInfo.builder().templated(true).build();
return CommandConfiguration.builder()
.name("setExpRole")

5
abstracto-application/abstracto-modules/experience-tracking/experience-tracking-impl/src/main/java/dev/sheldan/abstracto/experience/commands/UnSetExpRole.java
View File

@@ -28,8 +28,7 @@ public class UnSetExpRole extends AbstractConditionableCommand {
@Override
public CommandResult execute(CommandContext commandContext) {
Long roleId = (Long) commandContext.getParameters().getParameters().get(0);
ARole role = roleManagementService.findRole(roleId);
ARole role = (ARole) commandContext.getParameters().getParameters().get(0);
// do not check for the existence of the role, because if the role was deleted, users should be able
// to get rid of it in the configuration
experienceRoleService.unsetRole(role, commandContext.getUserInitiatedContext().getServer(), commandContext.getUserInitiatedContext().getChannel());
@@ -39,7 +38,7 @@ public class UnSetExpRole extends AbstractConditionableCommand {
@Override
public CommandConfiguration getConfiguration() {
List<Parameter> parameters = new ArrayList<>();
parameters.add(Parameter.builder().name("roleId").type(Long.class).build());
parameters.add(Parameter.builder().name("role").type(ARole.class).build());
HelpInfo helpInfo = HelpInfo.builder().templated(true).build();
return CommandConfiguration.builder()
.name("unSetExpRole")

2
abstracto-application/abstracto-modules/experience-tracking/experience-tracking-impl/src/main/resources/templates/commands/setExpRole/setExpRole_usage_en_US.ftl
View File

@@ -1 +1 @@
setExpRole <level> <roleId>
setExpRole <level> <role>

2
abstracto-application/abstracto-modules/experience-tracking/experience-tracking-impl/src/main/resources/templates/commands/unSetExpRole/unSetExpRole_usage_en_US.ftl
View File

@@ -1 +1 @@
unSetExpRole <roleId>
unSetExpRole <role>