The-pack-family/APIv3
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change POST /grants|ipBans|punishments to use expiresIn (a relative field in seconds) instead of expiresAt (absolute time)

Browse Source
This commit is contained in:
Colin McDonald 2016-07-10 11:48:53 -04:00
parent 6fbc8925eb
commit 53a56401e0
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/net/frozenorb/apiv3/route/grants/POSTGrants.java
View File

@ -65,8 +65,9 @@ public final class POSTGrants implements Handler<RoutingContext> {
Instant expiresAt = null; Instant expiresAt = null;
if (requestBody.containsKey("expiresAt") && requestBody.getLong("expiresAt") != -1) { if (requestBody.containsKey("expiresIn") && requestBody.getLong("expiresIn") != -1) {
expiresAt = Instant.ofEpochMilli(requestBody.getLong("expiresAt")); long expiresInMillis = requestBody.getLong("expiresIn") * 1000;
expiresAt = Instant.ofEpochMilli(System.currentTimeMillis() + expiresInMillis);
} }
if (expiresAt != null && expiresAt.isBefore(Instant.now())) { if (expiresAt != null && expiresAt.isBefore(Instant.now())) {

5
src/main/java/net/frozenorb/apiv3/route/ipBans/POSTIpBans.java
View File

@ -35,8 +35,9 @@ public final class POSTIpBans implements Handler<RoutingContext> {
Instant expiresAt = null; Instant expiresAt = null;
if (requestBody.containsKey("expiresAt") && requestBody.getLong("expiresAt") != -1) { if (requestBody.containsKey("expiresIn") && requestBody.getLong("expiresIn") != -1) {
expiresAt = Instant.ofEpochMilli(requestBody.getLong("expiresAt")); long expiresInMillis = requestBody.getLong("expiresIn") * 1000;
expiresAt = Instant.ofEpochMilli(System.currentTimeMillis() + expiresInMillis);
} }
if (expiresAt != null && expiresAt.isBefore(Instant.now())) { if (expiresAt != null && expiresAt.isBefore(Instant.now())) {

5
src/main/java/net/frozenorb/apiv3/route/punishments/POSTPunishments.java
View File

@ -63,8 +63,9 @@ public final class POSTPunishments implements Handler<RoutingContext> {
Instant expiresAt = null; Instant expiresAt = null;
if (requestBody.containsKey("expiresAt") && requestBody.getLong("expiresAt") != -1) { if (requestBody.containsKey("expiresIn") && requestBody.getLong("expiresIn") != -1) {
expiresAt = Instant.ofEpochMilli(requestBody.getLong("expiresAt")); long expiresInMillis = requestBody.getLong("expiresIn") * 1000;
expiresAt = Instant.ofEpochMilli(System.currentTimeMillis() + expiresInMillis);
} }
if (expiresAt != null && expiresAt.isBefore(Instant.now())) { if (expiresAt != null && expiresAt.isBefore(Instant.now())) {