Upstream/Plan
1
0
Fork 0
mirror of https://github.com/plan-player-analytics/Plan.git synced 2025-01-29 19:41:35 +01:00
Code Issues Projects Releases Wiki Activity

Updated permissions in plugin.yml and nukkit.yml

Browse Source
This commit is contained in:
Risto Lahtela 2020-08-31 19:05:37 +03:00
parent d12297494c
commit a47ce3e57e
6 changed files with 106 additions and 131 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Plan/common/src/main/java/com/djrapitops/plan/commands/subcommands/RegistrationCommands.java
View File

@ -191,7 +191,7 @@ public class RegistrationCommands {
}
User presentUser = found.get();
boolean ownsTheUser = Objects.equals(playerUUID, presentUser.getLinkedToUUID());
if (!(ownsTheUser || sender.hasPermission(Permissions.MANAGE_WEB.getPerm()))) {
if (!(ownsTheUser || sender.hasPermission(Permissions.UNREGISTER_OTHER.getPerm()))) {
throw new IllegalArgumentException(locale.getString(CommandLang.USER_NOT_LINKED));
}

12
Plan/common/src/main/java/com/djrapitops/plan/settings/Permissions.java
View File

@ -53,18 +53,6 @@ public enum Permissions {
JSON_SELF("plan.json.self"),
JSON_OTHER("plan.json.other"),
HELP("plan.?"),
INSPECT("plan.inspect.base"),
QUICK_INSPECT("plan.qinspect.base"),
INSPECT_OTHER("plan.inspect.other"),
QUICK_INSPECT_OTHER("plan.qinspect.other"),
ANALYZE("plan.analyze"),
MANAGE("plan.manage"),
MANAGE_WEB("plan.webmanage"),
IGNORE_COMMAND_USE("plan.ignore.commanduse"),
IGNORE_AFK("plan.ignore.afk");

2
Plan/common/src/main/java/com/djrapitops/plan/utilities/MiscUtils.java
View File

@ -44,7 +44,7 @@ public class MiscUtils {
* @return Player name.
*/
public static String getPlayerName(String[] args, Sender sender) {
return getPlayerName(args, sender, Permissions.INSPECT_OTHER);
return getPlayerName(args, sender, Permissions.PLAYER_OTHER);
}
/**

108
Plan/common/src/main/resources/nukkit.yml
View File

@ -11,69 +11,63 @@ commands:
description: base command
permissions:
plan.?:
description: Help command
plan.server:
default: op
plan.servers:
default: op
plan.network:
default: op
plan.player.self:
default: true
plan.inspect.base:
description: Allows you to check your player data.
default: true
plan.inspect.other:
description: Allows you to check other players' player data.
default: op
plan.qinspect.base:
description: Allows you to check your player data.
default: op
plan.qinspect.other:
description: Allows you to check other players' player data.
plan.analyze:
description: Allows you to check analysed data about all players.
default: op
plan.qanalyze:
description: Allows you to check analysed data about all players.
default: op
plan.reload:
description: Allows to reload plugin config
plan.player.other:
default: op
plan.search:
description: Allows search
default: op
plan.ingame.self:
default: true
plan.ingame.other:
default: op
plan.register.self:
default: true
plan.register.other:
default: op
plan.unregister.self:
default: true
plan.unregister.other:
default: op
plan.info:
description: Allows to view info
default: op
plan.reload:
default: op
plan.disable:
default: op
plan.users:
default: op
plan.data.base:
default: op
plan.data.backup:
default: op
plan.data.restore:
default: op
plan.data.move:
default: op
plan.data.hotswap:
default: op
plan.data.clear:
default: op
plan.data.remove.player:
default: op
plan.data.remove.server:
default: op
plan.data.export:
default: op
plan.data.import:
default: op
plan.json.self:
default: true
plan.json.other:
default: op
plan.ignore.commanduse:
description: Commands used by this player are not saved
default: false
plan.ignore.afk:
description: AFK time by this player is ignored
default: false
plan.manage:
description: Manage the database, clear, move, combine.
default: op
plan.webmanage:
description: Manage the webusers, delete, list, check
default: op
plan.basic:
children:
plan.?: true
plan.inspect.base: true
plan.qinspect.base: true
plan.advanced:
childer:
plan.basic: true
plan.info: true
plan.qanalyze: true
plan.staff:
children:
plan.search: true
plan.advanced: true
plan.analyze: true
plan.inspect.other: true
plan.qinspect.other: true
plan.webmanage: true
plan.reload: true
plan.*:
children:
plan.manage: true
plan.staff: true
apf.notify: true
default: false

111
Plan/common/src/main/resources/plugin.yml
View File

@ -33,73 +33,66 @@ softdepend:
commands:
plan:
usage: /plan help
description: base command
usage: /plan
permissions:
plan.?:
description: Help command
plan.server:
default: op
plan.servers:
default: op
plan.network:
default: op
plan.player.self:
default: true
plan.inspect.base:
description: Allows you to check your player data.
default: true
plan.inspect.other:
description: Allows you to check other players' player data.
default: op
plan.qinspect.base:
description: Allows you to check your player data.
default: op
plan.qinspect.other:
description: Allows you to check other players' player data.
plan.analyze:
description: Allows you to check analysed data about all players.
default: op
plan.qanalyze:
description: Allows you to check analysed data about all players.
default: op
plan.reload:
description: Allows to reload plugin config
plan.player.other:
default: op
plan.search:
description: Allows search
default: op
plan.ingame.self:
default: true
plan.ingame.other:
default: op
plan.register.self:
default: true
plan.register.other:
default: op
plan.unregister.self:
default: true
plan.unregister.other:
default: op
plan.info:
description: Allows to view info
default: op
plan.reload:
default: op
plan.disable:
default: op
plan.users:
default: op
plan.data.base:
default: op
plan.data.backup:
default: op
plan.data.restore:
default: op
plan.data.move:
default: op
plan.data.hotswap:
default: op
plan.data.clear:
default: op
plan.data.remove.player:
default: op
plan.data.remove.server:
default: op
plan.data.export:
default: op
plan.data.import:
default: op
plan.json.self:
default: true
plan.json.other:
default: op
plan.ignore.commanduse:
description: Commands used by this player are not saved
default: false
plan.ignore.afk:
description: AFK time by this player is ignored
default: false
plan.manage:
description: Manage the database, clear, move, combine.
default: op
plan.webmanage:
description: Manage the webusers, delete, list, check
default: op
plan.basic:
children:
plan.?: true
plan.inspect.base: true
plan.qinspect.base: true
plan.advanced:
childer:
plan.basic: true
plan.info: true
plan.qanalyze: true
plan.staff:
children:
plan.search: true
plan.advanced: true
plan.analyze: true
plan.inspect.other: true
plan.qinspect.other: true
plan.webmanage: true
plan.reload: true
plan.*:
children:
plan.manage: true
plan.staff: true
apf.notify: true
default: false

2
Plan/common/src/test/java/com/djrapitops/plan/utilities/MiscUtilsTest.java
View File

@ -35,7 +35,7 @@ class MiscUtilsTest {
private Sender mockAPlayerSender(String name, boolean hasPermission) {
Sender sender = Mockito.mock(Sender.class);
when(sender.hasPermission(Permissions.INSPECT_OTHER.getPermission())).thenReturn(hasPermission);
when(sender.hasPermission(Permissions.PLAYER_OTHER.getPermission())).thenReturn(hasPermission);
when(sender.getName()).thenReturn(name);
when(sender.getSenderType()).thenReturn(SenderType.PLAYER);
return sender;