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

Copy prefixes and suffixes during migration processes

Browse Source
This commit is contained in:
Luck 2016-08-23 12:36:20 +01:00
parent f7fa08d5e9
commit 9cd4e01d8e
No known key found for this signature in database
GPG Key ID: EFA9B3EC5FD90F8B
6 changed files with 111 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
bukkit/src/main/java/me/lucko/luckperms/api/vault/VaultChatHook.java
View File

@ -36,6 +36,8 @@ import java.util.Collections;
import java.util.Map;
import java.util.regex.Pattern;
import static me.lucko.luckperms.utils.ArgumentChecker.escapeCharacters;
/**
* Provides the Vault Chat service through the use of normal permission nodes.
*
@ -50,7 +52,7 @@ import java.util.regex.Pattern;
* Permission Nodes = meta.node.value
*
* Node that special characters used within LuckPerms are escaped:
* See {@link #escapeCharacters(String)}
* See {@link me.lucko.luckperms.utils.ArgumentChecker#escapeCharacters(String)}
*
* Registered on normal priority so other plugins can override.
*/
@ -75,14 +77,6 @@ class VaultChatHook extends Chat {
return perms.isEnabled();
}
private static String escapeCharacters(String s) {
s = s.replace(".", "{SEP}");
s = s.replace("/", "{FSEP}");
s = s.replace("$", "{DSEP}");
return s;
}
private void saveMeta(PermissionHolder holder, String world, String node, String value) {
if (holder == null) return;
if (node.equals("")) return;

38
common/src/main/java/me/lucko/luckperms/commands/migration/subcommands/MigrationBungeePerms.java
View File

@ -30,6 +30,7 @@ import me.lucko.luckperms.commands.Sender;
import me.lucko.luckperms.commands.SubCommand;
import me.lucko.luckperms.constants.Permission;
import me.lucko.luckperms.exceptions.ObjectAlreadyHasException;
import me.lucko.luckperms.utils.ArgumentChecker;
import net.alpenblock.bungeeperms.*;
import java.util.List;
@ -92,6 +93,23 @@ public class MigrationBungeePerms extends SubCommand<Object> {
} catch (ObjectAlreadyHasException ignored) {}
}
String prefix = u.getPrefix();
String suffix = u.getSuffix();
if (prefix != null && !prefix.equals("")) {
prefix = ArgumentChecker.escapeCharacters(prefix);
try {
user.setPermission("prefix.100." + prefix, true);
} catch (ObjectAlreadyHasException ignored) {}
}
if (suffix != null && !suffix.equals("")) {
suffix = ArgumentChecker.escapeCharacters(suffix);
try {
user.setPermission("suffix.100." + suffix, true);
} catch (ObjectAlreadyHasException ignored) {}
}
plugin.getDatastore().saveUser(user);
plugin.getUserManager().cleanup(user);
}
@ -134,11 +152,29 @@ public class MigrationBungeePerms extends SubCommand<Object> {
} catch (ObjectAlreadyHasException ignored) {}
}
String prefix = g.getPrefix();
String suffix = g.getSuffix();
if (prefix != null && !prefix.equals("")) {
prefix = ArgumentChecker.escapeCharacters(prefix);
try {
group.setPermission("prefix.50." + prefix, true);
} catch (ObjectAlreadyHasException ignored) {}
}
if (suffix != null && !suffix.equals("")) {
suffix = ArgumentChecker.escapeCharacters(suffix);
try {
group.setPermission("suffix.50." + suffix, true);
} catch (ObjectAlreadyHasException ignored) {}
}
plugin.getDatastore().saveGroup(group);
}
log.info("BungeePerms Migration: Migrated " + groupCount + " groups");
log.info("BungeePerms Migration: Success! Completed without any errors.");
return CommandResult.SUCCESS;
}

1
common/src/main/java/me/lucko/luckperms/commands/migration/subcommands/MigrationGroupManager.java
View File

@ -168,6 +168,7 @@ public class MigrationGroupManager extends SubCommand<Object> {
}
log.info("GroupManager Migration: All existing GroupManager data has been processed. Now beginning the import process.");
log.info("GroupManager Migration: Found a total of " + users.size() + " users and " + groups.size() + " groups.");
for (Map.Entry<UUID, Map<String, Boolean>> e : users.entrySet()) {
plugin.getDatastore().loadOrCreateUser(e.getKey(), "null");

43
common/src/main/java/me/lucko/luckperms/commands/migration/subcommands/MigrationPermissionsEx.java
View File

@ -32,6 +32,7 @@ import me.lucko.luckperms.constants.Permission;
import me.lucko.luckperms.exceptions.ObjectAlreadyHasException;
import me.lucko.luckperms.groups.Group;
import me.lucko.luckperms.users.User;
import me.lucko.luckperms.utils.ArgumentChecker;
import ru.tehkode.permissions.NativeInterface;
import ru.tehkode.permissions.PermissionGroup;
import ru.tehkode.permissions.PermissionManager;
@ -120,6 +121,7 @@ public class MigrationPermissionsEx extends SubCommand<Object> {
// Migrate all users
log.info("PermissionsEx Migration: Starting user migration.");
int userCount = 0;
for (PermissionUser user : manager.getUsers()) {
UUID u = null;
@ -147,6 +149,7 @@ public class MigrationPermissionsEx extends SubCommand<Object> {
continue;
}
userCount++;
plugin.getDatastore().loadOrCreateUser(u, "null");
User lpUser = plugin.getUserManager().get(u);
@ -198,13 +201,34 @@ public class MigrationPermissionsEx extends SubCommand<Object> {
}
}
String prefix = user.getOwnPrefix();
String suffix = user.getOwnSuffix();
if (prefix != null && !prefix.equals("")) {
prefix = ArgumentChecker.escapeCharacters(prefix);
try {
lpUser.setPermission("prefix.100." + prefix, true);
} catch (ObjectAlreadyHasException ignored) {}
}
if (suffix != null && !suffix.equals("")) {
suffix = ArgumentChecker.escapeCharacters(suffix);
try {
lpUser.setPermission("suffix.100." + suffix, true);
} catch (ObjectAlreadyHasException ignored) {}
}
plugin.getUserManager().cleanup(lpUser);
plugin.getDatastore().saveUser(lpUser);
}
log.info("PermissionsEx Migration: Migrated " + userCount + " users.");
// Migrate all groups.
log.info("PermissionsEx Migration: Starting group migration.");
int groupCount = 0;
for (PermissionGroup group : manager.getGroupList()) {
groupCount ++;
final String name = group.getName().toLowerCase();
plugin.getDatastore().createAndLoadGroup(name);
Group lpGroup = plugin.getGroupManager().get(name);
@ -256,8 +280,27 @@ public class MigrationPermissionsEx extends SubCommand<Object> {
}
}
}
String prefix = group.getOwnPrefix();
String suffix = group.getOwnSuffix();
if (prefix != null && !prefix.equals("")) {
prefix = ArgumentChecker.escapeCharacters(prefix);
try {
lpGroup.setPermission("prefix.50." + prefix, true);
} catch (ObjectAlreadyHasException ignored) {}
}
if (suffix != null && !suffix.equals("")) {
suffix = ArgumentChecker.escapeCharacters(suffix);
try {
lpGroup.setPermission("suffix.50." + suffix, true);
} catch (ObjectAlreadyHasException ignored) {}
}
}
log.info("PermissionsEx Migration: Migrated " + groupCount + " groups");
log.info("PermissionsEx Migration: Success! Completed without any errors.");
return CommandResult.SUCCESS;
}

19
common/src/main/java/me/lucko/luckperms/commands/migration/subcommands/MigrationZPermissions.java
View File

@ -33,6 +33,7 @@ import me.lucko.luckperms.exceptions.ObjectAlreadyHasException;
import me.lucko.luckperms.groups.Group;
import me.lucko.luckperms.tracks.Track;
import me.lucko.luckperms.users.User;
import me.lucko.luckperms.utils.ArgumentChecker;
import org.tyrannyofheaven.bukkit.zPermissions.ZPermissionsService;
import java.util.List;
@ -97,6 +98,24 @@ public class MigrationZPermissions extends SubCommand<Object> {
}
user.setPrimaryGroup(service.getPlayerPrimaryGroup(u));
String prefix = service.getPlayerPrefix(u);
String suffix = service.getPlayerSuffix(u);
if (prefix != null && !prefix.equals("")) {
prefix = ArgumentChecker.escapeCharacters(prefix);
try {
user.setPermission("prefix.100." + prefix, true);
} catch (ObjectAlreadyHasException ignored) {}
}
if (suffix != null && !suffix.equals("")) {
suffix = ArgumentChecker.escapeCharacters(suffix);
try {
user.setPermission("suffix.100." + suffix, true);
} catch (ObjectAlreadyHasException ignored) {}
}
plugin.getUserManager().cleanup(user);
plugin.getDatastore().saveUser(user);
}

8
common/src/main/java/me/lucko/luckperms/utils/ArgumentChecker.java
View File

@ -48,4 +48,12 @@ public class ArgumentChecker {
return DateUtil.shouldExpire(l);
}
public static String escapeCharacters(String s) {
s = s.replace(".", "{SEP}");
s = s.replace("/", "{FSEP}");
s = s.replace("$", "{DSEP}");
return s;
}
}