Removed commands for custom domains.

Joo200 · Joo200 · commit b3ae14bfbaf4 · 2022-09-19T11:57:54.000+02:00
Adding/Removing custom domains are now in /rg addmember/delmember/addowner/delowner
diff --git a/worldguard-core/src/main/java/com/sk89q/worldguard/commands/region/MemberCommands.java b/worldguard-core/src/main/java/com/sk89q/worldguard/commands/region/MemberCommands.java
@@ -81,6 +81,8 @@ public void addMember(CommandContext args, Actor sender) throws CommandException
         DomainInputResolver resolver = new DomainInputResolver(
                 WorldGuard.getInstance().getProfileService(), args.getParsedPaddedSlice(1, 0));
         resolver.setLocatorPolicy(args.hasFlag('n') ? UserLocatorPolicy.NAME_ONLY : UserLocatorPolicy.UUID_ONLY);
+        resolver.setActor(sender);
+        resolver.setRegion(region);
 
 
         final String description = String.format("Adding members to the region '%s' on '%s'", region.getId(), world.getName());
@@ -115,7 +117,8 @@ public void addOwner(CommandContext args, Actor sender) throws CommandException
         DomainInputResolver resolver = new DomainInputResolver(
                 WorldGuard.getInstance().getProfileService(), args.getParsedPaddedSlice(1, 0));
         resolver.setLocatorPolicy(args.hasFlag('n') ? UserLocatorPolicy.NAME_ONLY : UserLocatorPolicy.UUID_ONLY);
-
+        resolver.setActor(sender);
+        resolver.setRegion(region);
 
         final String description = String.format("Adding owners to the region '%s' on '%s'", region.getId(), world.getName());
         AsyncCommandBuilder.wrap(checkedAddOwners(sender, manager, region, world, resolver), sender)
@@ -188,6 +191,8 @@ public void removeMember(CommandContext args, Actor sender) throws CommandExcept
             DomainInputResolver resolver = new DomainInputResolver(
                     WorldGuard.getInstance().getProfileService(), args.getParsedPaddedSlice(1, 0));
             resolver.setLocatorPolicy(args.hasFlag('n') ? UserLocatorPolicy.NAME_ONLY : UserLocatorPolicy.UUID_AND_NAME);
+            resolver.setActor(sender);
+            resolver.setRegion(region);
 
             callable = resolver;
         }
@@ -231,6 +236,8 @@ public void removeOwner(CommandContext args, Actor sender) throws CommandExcepti
             DomainInputResolver resolver = new DomainInputResolver(
                     WorldGuard.getInstance().getProfileService(), args.getParsedPaddedSlice(1, 0));
             resolver.setLocatorPolicy(args.hasFlag('n') ? UserLocatorPolicy.NAME_ONLY : UserLocatorPolicy.UUID_AND_NAME);
+            resolver.setActor(sender);
+            resolver.setRegion(region);
 
             callable = resolver;
         }
@@ -244,98 +251,7 @@ public void removeOwner(CommandContext args, Actor sender) throws CommandExcepti
                 .buildAndExec(worldGuard.getExecutorService());
     }
 
-
-    /**
-     * Modify a custom domain for owner.
-     *
-     * @param args the arguments
-     * @param sender the sender
-     * @throws CommandException any error
-     */
-    @Command(aliases = {"ownerdomain"},
-            usage = "<id> <domain> [-w world] [value]",
-            flags = "w:",
-            desc = "Set flags",
-            min = 2)
-    public void ownerDomain(CommandContext args, Actor sender) throws CommandException {
-        domain(args, sender, true);
-    }
-
-    /**
-     * Modify a custom domain for member.
-     *
-     * @param args the arguments
-     * @param sender the sender
-     * @throws CommandException any error
-     */
-    @Command(aliases = {"memberdomain"},
-            usage = "<id> <domain> [-w world] [value]",
-            flags = "w:",
-            desc = "Set flags",
-            min = 2)
-    public void onMemberDomain(CommandContext args, Actor sender) throws CommandException {
-        domain(args, sender, false);
-    }
-
-    private void domain(CommandContext args, Actor sender, boolean isOwner) throws CommandException {
-        warnAboutSaveFailures(sender);
-
-        World world = checkWorld(args, sender, 'w'); // Get the world
-        String domainName = args.getString(1);
-        String value = args.argsLength() >= 3 ? args.getJoinedStrings(2) : null;
-        DomainRegistry domainRegistry = WorldGuard.getInstance().getDomainRegistry();
-        RegionPermissionModel permModel = getPermissionModel(sender);
-
-        // Lookup the existing region
-        RegionManager manager = checkRegionManager(world);
-        ProtectedRegion existing = checkExistingRegion(manager, args.getString(0), true);
-
-        // Check permissions
-        if (!permModel.mayModifyCustomDomain(existing, isOwner, domainName)) {
-            throw new CommandPermissionsException();
-        }
-        String regionId = existing.getId();
-
-        DomainFactory<?> domainFactory = domainRegistry.get(domainName);
-
-        // We didn't find the domain, so let's print a list of domains that the user
-        // can use, and do nothing afterwards
-        if (domainFactory == null) {
-            AsyncCommandBuilder.wrap(new DomainListBuilder(domainRegistry, permModel, existing, world,
-                    regionId, sender, domainName, isOwner), sender)
-                    .registerWithSupervisor(WorldGuard.getInstance().getSupervisor(), "Domain list for invalid domain command.")
-                    .onSuccess((Component) null, sender::print)
-                    .onFailure((Component) null, WorldGuard.getInstance().getExceptionConverter())
-                    .buildAndExec(WorldGuard.getInstance().getExecutorService());
-            return;
-        }
-
-        DefaultDomain usedDomain = isOwner ? existing.getOwners() : existing.getMembers();
-
-        // Set the flag value if a value was set
-        if (value != null) {
-            // Set the flag if [value] was given even if [-g group] was given as well
-            try {
-                CustomDomain customDomain = domainFactory.create(domainName);
-                setDomain(existing, usedDomain, customDomain, sender, value);
-            } catch (InvalidDomainFormat e) {
-                throw new CommandException(e.getMessage());
-            }
-            // No value? Clear the flag, if -g isn't specified
-        } else {
-            usedDomain.removeCustomDomain(domainName);
-        }
-
-        RegionPrintoutBuilder printout = new RegionPrintoutBuilder(world.getName(), existing, null, sender);
-        printout.append(SubtleFormat.wrap("(Current domains:"));
-        printout.newline();
-        printout.appendDomain();
-        printout.append(SubtleFormat.wrap(")"));
-        printout.send(sender);
-        checkSpawnOverlap(sender, world, existing);
-
-    }
-
+    // TODO: Implement a list for available domains. Maybe /rg domains? or /rg addmembers/addowners/delmembers/delowners?
     private static class DomainListBuilder implements Callable<Component> {
         private final DomainRegistry domainRegistry;
         private final RegionPermissionModel permModel;
@@ -375,11 +291,11 @@ public Component call() {
 
             final HoverEvent clickToSet = HoverEvent.of(HoverEvent.Action.SHOW_TEXT, TextComponent.of("Click to set"));
             for (int i = 0; i < domainList.size(); i++) {
-                String flag = domainList.get(i);
+                String domainName = domainList.get(i);
 
-                builder.append(TextComponent.of(flag, i % 2 == 0 ? TextColor.GRAY : TextColor.WHITE)
+                builder.append(TextComponent.of(domainName, i % 2 == 0 ? TextColor.GRAY : TextColor.WHITE)
                         .hoverEvent(clickToSet).clickEvent(ClickEvent.of(ClickEvent.Action.SUGGEST_COMMAND,
-                                "/rg " + (isOwner ? "ownerdomains" : "memberdomains") +" -w \"" + world.getName() + "\" " + regionId + " " + flag + " ")));
+                                "/rg " + (isOwner ? "addowner" : "addmember") +" -w \"" + world.getName() + "\" " + regionId + " " + domainName + ":")));
                 if (i < domainList.size() + 1) {
                     builder.append(TextComponent.of(", "));
                 }
diff --git a/worldguard-core/src/main/java/com/sk89q/worldguard/commands/region/RegionCommands.java b/worldguard-core/src/main/java/com/sk89q/worldguard/commands/region/RegionCommands.java
@@ -160,7 +160,7 @@ public void define(CommandContext args, Actor sender) throws CommandException {
             region = checkRegionFromSelection(sender, id);
         }
 
-        RegionAdder task = new RegionAdder(manager, region);
+        RegionAdder task = new RegionAdder(manager, region, sender);
         task.addOwnersFromCommand(args, 2);
 
         final String description = String.format("Adding region '%s'", region.getId());
@@ -214,7 +214,7 @@ public void redefine(CommandContext args, Actor sender) throws CommandException
 
         region.copyFrom(existing);
 
-        RegionAdder task = new RegionAdder(manager, region);
+        RegionAdder task = new RegionAdder(manager, region, sender);
 
         final String description = String.format("Updating region '%s'", region.getId());
         AsyncCommandBuilder.wrap(task, sender)
diff --git a/worldguard-core/src/main/java/com/sk89q/worldguard/commands/region/RegionCommandsBase.java b/worldguard-core/src/main/java/com/sk89q/worldguard/commands/region/RegionCommandsBase.java
@@ -426,13 +426,4 @@ protected static <V> V setFlag(ProtectedRegion region, Flag<V> flag, Actor sende
         region.setFlag(flag, val);
         return val;
     }
-
-    /**
-     * Utility method to set a custom domain
-     */
-    protected static void setDomain(ProtectedRegion region, DefaultDomain target, CustomDomain domain, Actor sender, String value) throws InvalidDomainFormat {
-        domain.parseInput(CustomDomainContext.create().setSender(sender).setInput(value).setObject("region", region).build());
-        target.addCustomDomain(domain);
-    }
-
 }
diff --git a/worldguard-core/src/main/java/com/sk89q/worldguard/commands/task/RegionAdder.java b/worldguard-core/src/main/java/com/sk89q/worldguard/commands/task/RegionAdder.java
@@ -20,6 +20,7 @@
 package com.sk89q.worldguard.commands.task;
 
 import com.sk89q.minecraft.util.commands.CommandContext;
+import com.sk89q.worldedit.extension.platform.Actor;
 import com.sk89q.worldguard.WorldGuard;
 import com.sk89q.worldguard.domains.DefaultDomain;
 import com.sk89q.worldguard.protection.managers.RegionManager;
@@ -39,22 +40,34 @@ public class RegionAdder implements Callable<ProtectedRegion> {
 
     private final RegionManager manager;
     private final ProtectedRegion region;
+    private final Actor actor;
     @Nullable
     private String[] ownersInput;
     private UserLocatorPolicy locatorPolicy = UserLocatorPolicy.UUID_ONLY;
 
     /**
      * Create a new instance.
      *
-     * @param manager the manage
+     * @param manager the manager
      * @param region the region
      */
     public RegionAdder(RegionManager manager, ProtectedRegion region) {
+        this(manager, region, null);
+    }
+
+    /**
+     * Create a new instance.
+     * @param manager the manager
+     * @param region the region
+     * @param actor the actor
+     */
+    public RegionAdder(RegionManager manager, ProtectedRegion region, Actor actor) {
         checkNotNull(manager);
         checkNotNull(region);
 
         this.manager = manager;
         this.region = region;
+        this.actor = actor;
     }
 
     /**
@@ -75,6 +88,9 @@ public ProtectedRegion call() throws Exception {
         if (ownersInput != null) {
             DomainInputResolver resolver = new DomainInputResolver(WorldGuard.getInstance().getProfileService(), ownersInput);
             resolver.setLocatorPolicy(locatorPolicy);
+            resolver.setActor(actor);
+            resolver.setRegion(region);
+
             DefaultDomain domain = resolver.call();
             region.getOwners().addAll(domain);
         }
diff --git a/worldguard-core/src/main/java/com/sk89q/worldguard/domains/CustomDomain.java b/worldguard-core/src/main/java/com/sk89q/worldguard/domains/CustomDomain.java
@@ -81,7 +81,8 @@ public String getName() {
      */
     public static boolean isValidName(String name) {
         checkNotNull(name, "name");
-        return VALID_NAME.matcher(name).matches();
+        // g is already reserved by the group domain
+        return VALID_NAME.matcher(name).matches() && !name.equalsIgnoreCase("g");
     }
 
 
diff --git a/worldguard-core/src/main/java/com/sk89q/worldguard/domains/DefaultDomain.java b/worldguard-core/src/main/java/com/sk89q/worldguard/domains/DefaultDomain.java
@@ -260,7 +260,7 @@ public void removeAll(DefaultDomain other) {
             removeGroup(group);
         }
         for (CustomDomain domain : other.getCustomDomains()) {
-            removeCustomDomain(domain);
+            removeCustomDomain(domain.getName());
         }
     }
 
@@ -549,7 +549,7 @@ public boolean isDirty() {
     public void setDirty(boolean dirty) {
         playerDomain.setDirty(dirty);
         groupDomain.setDirty(dirty);
-        customDomainsChanged = true;
+        customDomainsChanged = dirty;
         customDomains.forEach(d -> d.setDirty(dirty));
     }
 
diff --git a/worldguard-core/src/main/java/com/sk89q/worldguard/protection/util/DomainInputResolver.java b/worldguard-core/src/main/java/com/sk89q/worldguard/protection/util/DomainInputResolver.java
@@ -21,6 +21,13 @@
 
 import com.google.common.base.Function;
 import com.google.common.base.Joiner;
+import com.sk89q.worldedit.extension.platform.Actor;
+import com.sk89q.worldguard.WorldGuard;
+import com.sk89q.worldguard.domains.CustomDomain;
+import com.sk89q.worldguard.domains.registry.CustomDomainContext;
+import com.sk89q.worldguard.domains.registry.DomainFactory;
+import com.sk89q.worldguard.domains.registry.InvalidDomainFormat;
+import com.sk89q.worldguard.protection.regions.ProtectedRegion;
 import com.sk89q.worldguard.util.profile.Profile;
 import com.sk89q.worldguard.util.profile.resolver.ProfileService;
 import com.sk89q.worldguard.util.profile.util.UUIDs;
@@ -43,6 +50,7 @@
 public class DomainInputResolver implements Callable<DefaultDomain> {
 
     private static final Pattern GROUP_PATTERN = Pattern.compile("(?i)^[G]:(.+)$");
+    private static final Pattern CUSTOM_PATTERN = Pattern.compile("(?i)^([A-Za-z0-9\\-]{1,40}):(.*)$");
 
     /**
      * The policy for locating users.
@@ -56,6 +64,8 @@ public enum UserLocatorPolicy {
     private final ProfileService profileService;
     private final String[] input;
     private UserLocatorPolicy locatorPolicy = UserLocatorPolicy.UUID_ONLY;
+    private ProtectedRegion region;
+    private Actor actor;
 
     /**
      * Create a new instance.
@@ -89,15 +99,49 @@ public void setLocatorPolicy(UserLocatorPolicy locatorPolicy) {
         this.locatorPolicy = locatorPolicy;
     }
 
+    /**
+     * Set the region for the Resolver
+     * @param region the region
+     */
+    public void setRegion(ProtectedRegion region) {
+        this.region = region;
+    }
+
+    /**
+     * Get the current region from the Resolver
+     * @return the region
+     */
+    public @Nullable ProtectedRegion getRegion() {
+        return region;
+    }
+
+    /**
+     * Set the actor of the Resolver
+     * @param actor the actor
+     */
+    public void setActor(Actor actor) {
+        this.actor = actor;
+    }
+
     @Override
-    public DefaultDomain call() throws UnresolvedNamesException {
+    public DefaultDomain call() throws UnresolvedNamesException, InvalidDomainFormat {
         DefaultDomain domain = new DefaultDomain();
         List<String> namesToQuery = new ArrayList<>();
 
         for (String s : input) {
-            Matcher m = GROUP_PATTERN.matcher(s);
-            if (m.matches()) {
-                domain.addGroup(m.group(1));
+            Matcher groupMatcher = GROUP_PATTERN.matcher(s);
+            Matcher customMatcher = CUSTOM_PATTERN.matcher(s);
+            if (groupMatcher.matches()) {
+                domain.addGroup(groupMatcher.group(1));
+            } else if (customMatcher.matches()) {
+                String domainName = customMatcher.group(1);
+                DomainFactory<?> domainFactory = WorldGuard.getInstance().getDomainRegistry().get(domainName);
+                if (domainFactory == null) {
+                    throw new InvalidDomainFormat("No domain named '" + domainName + "' found.");
+                }
+                CustomDomain customDomain = domainFactory.create(domainName);
+                customDomain.parseInput(CustomDomainContext.create()
+                    .setSender(actor).setInput(customMatcher.group(2)).setObject("region", region).build());
             } else {
                 UUID uuid = parseUUID(s);
                 if (uuid != null) {
diff --git a/worldguard-core/src/main/java/com/sk89q/worldguard/util/WorldGuardExceptionConverter.java b/worldguard-core/src/main/java/com/sk89q/worldguard/util/WorldGuardExceptionConverter.java
@@ -26,6 +26,7 @@
 import com.sk89q.worldedit.util.auth.AuthorizationException;
 import com.sk89q.worldedit.util.formatting.component.InvalidComponentException;
 import com.sk89q.worldguard.WorldGuard;
+import com.sk89q.worldguard.domains.registry.InvalidDomainFormat;
 import com.sk89q.worldguard.protection.managers.storage.StorageException;
 import com.sk89q.worldguard.protection.util.UnresolvedNamesException;
 
@@ -91,6 +92,11 @@ public void convert(UnresolvedNamesException e) throws CommandException {
         throw newCommandException(e.getMessage(), e);
     }
 
+    @ExceptionMatch
+    public void convert(InvalidDomainFormat e) throws CommandException {
+        throw newCommandException(e.getMessage(), e);
+    }
+
     @ExceptionMatch
     public void convert(AuthorizationException e) throws CommandException {
         throw newCommandException("You don't have permission to do that.", e);

Original file line number	Diff line number	Diff line change
`@@ -426,13 +426,4 @@ protected static <V> V setFlag(ProtectedRegion region, Flag<V> flag, Actor sende`
`426`	`426`	`region.setFlag(flag, val);`
`427`	`427`	`return val;`
`428`	`428`	`}`
`429`		`-`
`430`		`- /**`
`431`		`- * Utility method to set a custom domain`
`432`		`- */`
`433`		`- protected static void setDomain(ProtectedRegion region, DefaultDomain target, CustomDomain domain, Actor sender, String value) throws InvalidDomainFormat {`
`434`		`- domain.parseInput(CustomDomainContext.create().setSender(sender).setInput(value).setObject("region", region).build());`
`435`		`- target.addCustomDomain(domain);`
`436`		`- }`
`437`		`-`
`438`	`429`	`}`
Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,8 @@ public String getName() {`
`81`	`81`	`*/`
`82`	`82`	`public static boolean isValidName(String name) {`
`83`	`83`	`checkNotNull(name, "name");`
`84`		`- return VALID_NAME.matcher(name).matches();`
	`84`	`+ // g is already reserved by the group domain`
	`85`	`+ return VALID_NAME.matcher(name).matches() && !name.equalsIgnoreCase("g");`
`85`	`86`	`}`
`86`	`87`
`87`	`88`
Original file line number	Diff line number	Diff line change
`@@ -260,7 +260,7 @@ public void removeAll(DefaultDomain other) {`
`260`	`260`	`removeGroup(group);`
`261`	`261`	`}`
`262`	`262`	`for (CustomDomain domain : other.getCustomDomains()) {`
`263`		`- removeCustomDomain(domain);`
	`263`	`+ removeCustomDomain(domain.getName());`
`264`	`264`	`}`
`265`	`265`	`}`
`266`	`266`
`@@ -549,7 +549,7 @@ public boolean isDirty() {`
`549`	`549`	`public void setDirty(boolean dirty) {`
`550`	`550`	`playerDomain.setDirty(dirty);`
`551`	`551`	`groupDomain.setDirty(dirty);`
`552`		`- customDomainsChanged = true;`
	`552`	`+ customDomainsChanged = dirty;`
`553`	`553`	`customDomains.forEach(d -> d.setDirty(dirty));`
`554`	`554`	`}`
`555`	`555`