Add permission clear and list commands (Grasscutters#1715)

* Add permission clear and list commands * Add Account clear permission
GoJam11 · Aug 27, 2022 · 32289e2 · 32289e2
1 parent 656cb79
commit 32289e2
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 4 deletions.
diff --git a/src/main/java/emu/grasscutter/command/commands/PermissionCommand.java b/src/main/java/emu/grasscutter/command/commands/PermissionCommand.java
@@ -11,12 +11,17 @@
 
 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 void execute(Player sender, Player targetPlayer, List<String> args) {
         }
 
         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 void execute(Player sender, Player targetPlayer, List<String> args) {
                 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 void execute(Player sender, Player targetPlayer, List<String> args) {
                     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();

diff --git a/src/main/java/emu/grasscutter/game/Account.java b/src/main/java/emu/grasscutter/game/Account.java
@@ -210,6 +210,10 @@ public boolean removePermission(String permission) {
         return this.permissions.remove(permission);
     }
 
+    public void clearPermission() {
+        this.permissions.clear();
+    }
+
     // TODO make unique
     public String generateLoginToken() {
         this.token = Utils.bytesToHex(Crypto.createSessionKey(32));