Grasscutters/Grasscutter
3
0
Fork 0
mirror of https://github.com/Melledy/Grasscutter.git synced 2024-11-22 15:38:24 +00:00
Code Issues Projects Releases Wiki Activity

Add permission clear and list commands (#1715)

Browse Source 
* Add permission clear and list commands

* Add Account clear permission
This commit is contained in:
jie65535 2022-08-27 19:46:27 +08:00 committed by GitHub
parent 656cb79b06
commit 32289e2d80
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/main/java/emu/grasscutter/command/commands/PermissionCommand.java
View File

@ -11,12 +11,17 @@ import java.util.List;
import static emu.grasscutter.utils.Language.translate; 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 { public final class PermissionCommand implements CommandHandler {
@Override @Override
public void execute(Player sender, Player targetPlayer, List<String> args) { public void execute(Player sender, Player targetPlayer, List<String> args) {
if (args.size() != 2) { if (args.isEmpty() || args.size() > 2) {
sendUsageMessage(sender); sendUsageMessage(sender);
return; return;
} }
@ -27,7 +32,10 @@ public final class PermissionCommand implements CommandHandler {
} }
String action = args.get(0); String action = args.get(0);
String permission = args.get(1); String permission = "";
if (args.size() > 1) {
permission = args.get(1);
}
Account account = targetPlayer.getAccount(); Account account = targetPlayer.getAccount();
if (account == null) { if (account == null) {
@ -40,7 +48,9 @@ public final class PermissionCommand implements CommandHandler {
sendUsageMessage(sender); sendUsageMessage(sender);
break; break;
case "add": case "add":
if (account.addPermission(permission)) { if (permission.isEmpty()) {
sendUsageMessage(sender);
} else if (account.addPermission(permission)) {
CommandHandler.sendMessage(sender, translate(sender, "commands.permission.add")); CommandHandler.sendMessage(sender, translate(sender, "commands.permission.add"));
} else CommandHandler.sendMessage(sender, translate(sender, "commands.permission.has_error")); } else CommandHandler.sendMessage(sender, translate(sender, "commands.permission.has_error"));
break; break;
@ -49,6 +59,13 @@ public final class PermissionCommand implements CommandHandler {
CommandHandler.sendMessage(sender, translate(sender, "commands.permission.remove")); CommandHandler.sendMessage(sender, translate(sender, "commands.permission.remove"));
} else CommandHandler.sendMessage(sender, translate(sender, "commands.permission.not_have_error")); } else CommandHandler.sendMessage(sender, translate(sender, "commands.permission.not_have_error"));
break; 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(); account.save();

4
src/main/java/emu/grasscutter/game/Account.java
View File

@ -210,6 +210,10 @@ public class Account {
return this.permissions.remove(permission); return this.permissions.remove(permission);
} }
public void clearPermission() {
this.permissions.clear();
}
// TODO make unique // TODO make unique
public String generateLoginToken() { public String generateLoginToken() {
this.token = Utils.bytesToHex(Crypto.createSessionKey(32)); this.token = Utils.bytesToHex(Crypto.createSessionKey(32));