worldofcraft/LuckPerms-DBA
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Allow expiry timestamp for temporary assignment args

Browse Source
This commit is contained in:
Luck 2016-08-18 13:51:31 +01:00
parent 6451175d0e
commit 98b56691dd
No known key found for this signature in database
GPG Key ID: EFA9B3EC5FD90F8B
4 changed files with 33 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupSetTempInherit.java
View File

@ -55,10 +55,14 @@ public class GroupSetTempInherit extends SubCommand<Group> {
long duration; long duration;
try { try {
duration = DateUtil.parseDateDiff(args.get(1), true); duration = Long.parseLong(args.get(1));
} catch (DateUtil.IllegalDateException e) { } catch (NumberFormatException e) {
Message.ILLEGAL_DATE_ERROR.send(sender, args.get(1)); try {
return CommandResult.INVALID_ARGS; duration = DateUtil.parseDateDiff(args.get(1), true);
} catch (DateUtil.IllegalDateException e1) {
Message.ILLEGAL_DATE_ERROR.send(sender, args.get(1));
return CommandResult.INVALID_ARGS;
}
} }
if (DateUtil.shouldExpire(duration)) { if (DateUtil.shouldExpire(duration)) {

12
common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupSetTempPermission.java
View File

@ -69,10 +69,14 @@ public class GroupSetTempPermission extends SubCommand<Group> {
long duration; long duration;
try { try {
duration = DateUtil.parseDateDiff(args.get(2), true); duration = Long.parseLong(args.get(2));
} catch (DateUtil.IllegalDateException e) { } catch (NumberFormatException e) {
Message.ILLEGAL_DATE_ERROR.send(sender, args.get(2)); try {
return CommandResult.INVALID_ARGS; duration = DateUtil.parseDateDiff(args.get(2), true);
} catch (DateUtil.IllegalDateException e1) {
Message.ILLEGAL_DATE_ERROR.send(sender, args.get(2));
return CommandResult.INVALID_ARGS;
}
} }
if (DateUtil.shouldExpire(duration)) { if (DateUtil.shouldExpire(duration)) {

13
common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserAddTempGroup.java
View File

@ -55,11 +55,16 @@ public class UserAddTempGroup extends SubCommand<User> {
} }
long duration; long duration;
try { try {
duration = DateUtil.parseDateDiff(args.get(1), true); duration = Long.parseLong(args.get(1));
} catch (DateUtil.IllegalDateException e) { } catch (NumberFormatException e) {
Message.ILLEGAL_DATE_ERROR.send(sender, args.get(1)); try {
return CommandResult.INVALID_ARGS; duration = DateUtil.parseDateDiff(args.get(1), true);
} catch (DateUtil.IllegalDateException e1) {
Message.ILLEGAL_DATE_ERROR.send(sender, args.get(1));
return CommandResult.INVALID_ARGS;
}
} }
if (DateUtil.shouldExpire(duration)) { if (DateUtil.shouldExpire(duration)) {

12
common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserSetTempPermission.java
View File

@ -69,10 +69,14 @@ public class UserSetTempPermission extends SubCommand<User> {
long duration; long duration;
try { try {
duration = DateUtil.parseDateDiff(args.get(2), true); duration = Long.parseLong(args.get(2));
} catch (DateUtil.IllegalDateException e) { } catch (NumberFormatException e) {
Message.ILLEGAL_DATE_ERROR.send(sender, args.get(2)); try {
return CommandResult.INVALID_ARGS; duration = DateUtil.parseDateDiff(args.get(2), true);
} catch (DateUtil.IllegalDateException e1) {
Message.ILLEGAL_DATE_ERROR.send(sender, args.get(2));
return CommandResult.INVALID_ARGS;
}
} }
if (DateUtil.shouldExpire(duration)) { if (DateUtil.shouldExpire(duration)) {