mirror of
https://github.com/Melledy/Grasscutter.git
synced 2024-11-22 09:56:57 +00:00
Add permission clear and list commands (#1715)
* Add permission clear and list commands * Add Account clear permission
This commit is contained in:
parent
656cb79b06
commit
32289e2d80
@ -11,12 +11,17 @@ import java.util.List;
|
||||
|
||||
import static emu.grasscutter.utils.Language.translate;
|
||||
|
||||
@Command(label = "permission", usage = "(add|remove) <permission>", permission = "permission", targetRequirement = TargetRequirement.PLAYER)
|
||||
@Command(label = "permission", usage = {
|
||||
"add <permission>",
|
||||
"remove <permission>",
|
||||
"clear",
|
||||
"list"
|
||||
}, permission = "permission", targetRequirement = TargetRequirement.PLAYER)
|
||||
public final class PermissionCommand implements CommandHandler {
|
||||
|
||||
@Override
|
||||
public void execute(Player sender, Player targetPlayer, List<String> args) {
|
||||
if (args.size() != 2) {
|
||||
if (args.isEmpty() || args.size() > 2) {
|
||||
sendUsageMessage(sender);
|
||||
return;
|
||||
}
|
||||
@ -27,7 +32,10 @@ public final class PermissionCommand implements CommandHandler {
|
||||
}
|
||||
|
||||
String action = args.get(0);
|
||||
String permission = args.get(1);
|
||||
String permission = "";
|
||||
if (args.size() > 1) {
|
||||
permission = args.get(1);
|
||||
}
|
||||
|
||||
Account account = targetPlayer.getAccount();
|
||||
if (account == null) {
|
||||
@ -40,7 +48,9 @@ public final class PermissionCommand implements CommandHandler {
|
||||
sendUsageMessage(sender);
|
||||
break;
|
||||
case "add":
|
||||
if (account.addPermission(permission)) {
|
||||
if (permission.isEmpty()) {
|
||||
sendUsageMessage(sender);
|
||||
} else if (account.addPermission(permission)) {
|
||||
CommandHandler.sendMessage(sender, translate(sender, "commands.permission.add"));
|
||||
} else CommandHandler.sendMessage(sender, translate(sender, "commands.permission.has_error"));
|
||||
break;
|
||||
@ -49,6 +59,13 @@ public final class PermissionCommand implements CommandHandler {
|
||||
CommandHandler.sendMessage(sender, translate(sender, "commands.permission.remove"));
|
||||
} else CommandHandler.sendMessage(sender, translate(sender, "commands.permission.not_have_error"));
|
||||
break;
|
||||
case "clear":
|
||||
account.clearPermission();
|
||||
CommandHandler.sendMessage(sender, translate(sender, "commands.permission.remove"));
|
||||
break;
|
||||
case "list":
|
||||
CommandHandler.sendMessage(sender, String.join("\n", account.getPermissions()));
|
||||
break;
|
||||
}
|
||||
|
||||
account.save();
|
||||
|
@ -210,6 +210,10 @@ public class Account {
|
||||
return this.permissions.remove(permission);
|
||||
}
|
||||
|
||||
public void clearPermission() {
|
||||
this.permissions.clear();
|
||||
}
|
||||
|
||||
// TODO make unique
|
||||
public String generateLoginToken() {
|
||||
this.token = Utils.bytesToHex(Crypto.createSessionKey(32));
|
||||
|
Loading…
Reference in New Issue
Block a user