Upstream/LuckPerms
1
0
Fork 0
mirror of https://github.com/LuckPerms/LuckPerms.git synced 2024-09-30 14:27:29 +02:00
Code Issues Projects Releases Wiki Activity

Bulk update triggers for group related commands (#3073)

Browse Source
This commit is contained in:
Emily 2021-07-04 06:00:18 -03:00 committed by GitHub
parent 979c80d9ee
commit fb36bd0ced
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 82 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bukkit/src/main/resources/luckperms.commodore
View File

@ -62,7 +62,9 @@ luckperms {
}
}
deletegroup {
name brigadier:string single_word;
name brigadier:string single_word {
flags brigadier:string greedy_phrase;
}
}
listgroups;
createtrack {
@ -546,7 +548,9 @@ luckperms {
context brigadier:string greedy_phrase;
}
rename {
newname brigadier:string single_word;
newname brigadier:string single_word {
flags brigadier:string greedy_phrase;
}
}
clone {
newname brigadier:string single_word;

39
common/src/main/java/me/lucko/luckperms/common/commands/group/DeleteGroup.java
View File

@ -26,16 +26,28 @@
package me.lucko.luckperms.common.commands.group;
import me.lucko.luckperms.common.actionlog.LoggedAction;
import me.lucko.luckperms.common.bulkupdate.BulkUpdate;
import me.lucko.luckperms.common.bulkupdate.BulkUpdateBuilder;
import me.lucko.luckperms.common.bulkupdate.DataType;
import me.lucko.luckperms.common.bulkupdate.action.DeleteAction;
import me.lucko.luckperms.common.bulkupdate.comparison.Constraint;
import me.lucko.luckperms.common.bulkupdate.comparison.StandardComparison;
import me.lucko.luckperms.common.bulkupdate.query.Query;
import me.lucko.luckperms.common.bulkupdate.query.QueryField;
import me.lucko.luckperms.common.command.abstraction.SingleCommand;
import me.lucko.luckperms.common.command.access.ArgumentPermissions;
import me.lucko.luckperms.common.command.access.CommandPermission;
import me.lucko.luckperms.common.command.spec.CommandSpec;
import me.lucko.luckperms.common.command.tabcomplete.CompletionSupplier;
import me.lucko.luckperms.common.command.tabcomplete.TabCompleter;
import me.lucko.luckperms.common.command.tabcomplete.TabCompletions;
import me.lucko.luckperms.common.command.utils.ArgumentList;
import me.lucko.luckperms.common.config.ConfigKeys;
import me.lucko.luckperms.common.locale.Message;
import me.lucko.luckperms.common.messaging.InternalMessagingService;
import me.lucko.luckperms.common.model.Group;
import me.lucko.luckperms.common.model.manager.group.GroupManager;
import me.lucko.luckperms.common.node.types.Inheritance;
import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
import me.lucko.luckperms.common.sender.Sender;
import me.lucko.luckperms.common.util.Predicates;
@ -44,10 +56,11 @@ import net.luckperms.api.actionlog.Action;
import net.luckperms.api.event.cause.DeletionCause;
import java.util.List;
import java.util.Optional;
public class DeleteGroup extends SingleCommand {
public DeleteGroup() {
super(CommandSpec.DELETE_GROUP, "DeleteGroup", CommandPermission.DELETE_GROUP, Predicates.not(1));
super(CommandSpec.DELETE_GROUP, "DeleteGroup", CommandPermission.DELETE_GROUP, Predicates.notInRange(1, 2));
}
@Override
@ -89,13 +102,35 @@ public class DeleteGroup extends SingleCommand {
.description("delete")
.build().submit(plugin, sender);
plugin.getSyncTaskBuffer().request();
if (!args.remove("--update-parent-lists")) {
plugin.getSyncTaskBuffer().request();
} else {
// the group is now deleted, proceed to remove its representing inheritance nodes
BulkUpdate operation = BulkUpdateBuilder.create()
.trackStatistics(false)
.dataType(DataType.ALL)
.action(DeleteAction.create())
.query(Query.of(QueryField.PERMISSION, Constraint.of(StandardComparison.EQUAL, Inheritance.key(groupName))))
.build();
plugin.getStorage().applyBulkUpdate(operation).whenCompleteAsync((v, ex) -> {
if (ex != null) {
ex.printStackTrace();
}
plugin.getSyncTaskBuffer().requestDirectly(); // sync regardless of failure state
Optional<InternalMessagingService> messagingService = plugin.getMessagingService();
if (messagingService.isPresent() && plugin.getConfiguration().get(ConfigKeys.AUTO_PUSH_UPDATES)) {
messagingService.get().getUpdateBuffer().request();
}
}, plugin.getBootstrap().getScheduler().async());
}
}
@Override
public List<String> tabComplete(LuckPermsPlugin plugin, Sender sender, ArgumentList args) {
return TabCompleter.create()
.at(0, TabCompletions.groups(plugin))
.at(1, CompletionSupplier.startsWith("--update-parent-lists"))
.complete(args);
}
}

40
common/src/main/java/me/lucko/luckperms/common/commands/group/GroupRename.java
View File

@ -26,14 +26,24 @@
package me.lucko.luckperms.common.commands.group;
import me.lucko.luckperms.common.actionlog.LoggedAction;
import me.lucko.luckperms.common.bulkupdate.BulkUpdate;
import me.lucko.luckperms.common.bulkupdate.BulkUpdateBuilder;
import me.lucko.luckperms.common.bulkupdate.action.UpdateAction;
import me.lucko.luckperms.common.bulkupdate.comparison.Constraint;
import me.lucko.luckperms.common.bulkupdate.comparison.StandardComparison;
import me.lucko.luckperms.common.bulkupdate.query.Query;
import me.lucko.luckperms.common.bulkupdate.query.QueryField;
import me.lucko.luckperms.common.command.abstraction.ChildCommand;
import me.lucko.luckperms.common.command.access.ArgumentPermissions;
import me.lucko.luckperms.common.command.access.CommandPermission;
import me.lucko.luckperms.common.command.spec.CommandSpec;
import me.lucko.luckperms.common.command.tabcomplete.CompletionSupplier;
import me.lucko.luckperms.common.command.tabcomplete.TabCompleter;
import me.lucko.luckperms.common.command.utils.ArgumentList;
import me.lucko.luckperms.common.command.utils.StorageAssistant;
import me.lucko.luckperms.common.locale.Message;
import me.lucko.luckperms.common.model.Group;
import me.lucko.luckperms.common.node.types.Inheritance;
import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
import me.lucko.luckperms.common.sender.Sender;
import me.lucko.luckperms.common.storage.misc.DataConstraints;
@ -44,9 +54,11 @@ import net.luckperms.api.event.cause.CreationCause;
import net.luckperms.api.event.cause.DeletionCause;
import net.luckperms.api.model.data.DataType;
import java.util.List;
public class GroupRename extends ChildCommand<Group> {
public GroupRename() {
super(CommandSpec.GROUP_RENAME, "rename", CommandPermission.GROUP_RENAME, Predicates.not(1));
super(CommandSpec.GROUP_RENAME, "rename", CommandPermission.GROUP_RENAME, Predicates.notInRange(1, 2));
}
@Override
@ -92,6 +104,30 @@ public class GroupRename extends ChildCommand<Group> {
.description("rename", newGroup.getName())
.build().submit(plugin, sender);
StorageAssistant.save(newGroup, sender, plugin);
if (!args.remove("--update-parent-lists")) {
StorageAssistant.save(newGroup, sender, plugin);
} else {
// the group is now renamed, proceed to update its representing inheritance nodes
BulkUpdate operation = BulkUpdateBuilder.create()
.trackStatistics(false)
.dataType(me.lucko.luckperms.common.bulkupdate.DataType.ALL)
.action(UpdateAction.of(QueryField.PERMISSION, Inheritance.key(newGroupName)))
.query(Query.of(QueryField.PERMISSION, Constraint.of(StandardComparison.EQUAL, Inheritance.key(target.getName()))))
.build();
plugin.getStorage().applyBulkUpdate(operation).whenCompleteAsync((v, ex) -> {
plugin.getSyncTaskBuffer().requestDirectly();
if (ex != null) {
ex.printStackTrace();
}
}, plugin.getBootstrap().getScheduler().async())
.thenRunAsync(() -> StorageAssistant.save(newGroup, sender, plugin));
}
}
@Override
public List<String> tabComplete(LuckPermsPlugin plugin, Sender sender, ArgumentList args) {
return TabCompleter.create()
.at(1, CompletionSupplier.startsWith("--update-parent-lists"))
.complete(args);
}
}

2
common/src/main/java/me/lucko/luckperms/common/commands/misc/BulkUpdateCommand.java
View File

@ -87,7 +87,7 @@ public class BulkUpdateCommand extends SingleCommand {
BulkUpdateBuilder bulkUpdateBuilder = BulkUpdateBuilder.create();
bulkUpdateBuilder.trackStatistics(!args.remove("--silent"));
bulkUpdateBuilder.trackStatistics(!args.remove("-s"));
try {
bulkUpdateBuilder.dataType(DataType.valueOf(args.remove(0).toUpperCase()));