Plexus/Plex
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex.git synced 2025-07-05 09:06:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

add tempban punishment type and swap localdatetime zoneddatetime, as well as reload timezone on /plex reload

Browse Source
This commit is contained in:
Taah
2022-04-19 14:49:45 -07:00
parent bae1e49c5e
commit a00c6926c4
21 changed files with 134 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/dev/plex/util/adapter/LocalDateTimeDeserializer.java → src/main/java/dev/plex/util/adapter/ZonedDateTimeDeserializer.java
View File

@ -4,17 +4,21 @@ import com.google.gson.JsonDeserializationContext;
import com.google.gson.JsonDeserializer;
import com.google.gson.JsonElement;
import com.google.gson.JsonParseException;
import dev.plex.Plex;
import java.lang.reflect.Type;
import java.time.Instant;
import java.time.LocalDateTime;
import java.time.ZoneId;
import java.time.ZonedDateTime;
public class LocalDateTimeDeserializer implements JsonDeserializer<LocalDateTime>
public class ZonedDateTimeDeserializer implements JsonDeserializer<ZonedDateTime>
{
private static String TIMEZONE = Plex.get().config.getString("server.timezone");
@Override
public LocalDateTime deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException
public ZonedDateTime deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException
{
Instant instant = Instant.ofEpochMilli(json.getAsJsonPrimitive().getAsLong());
return LocalDateTime.ofInstant(instant, ZoneId.systemDefault());
return ZonedDateTime.ofInstant(instant, ZoneId.of(TIMEZONE));
}
}

10
src/main/java/dev/plex/util/adapter/LocalDateTimeSerializer.java → src/main/java/dev/plex/util/adapter/ZonedDateTimeSerializer.java
View File

@ -4,16 +4,20 @@ import com.google.gson.JsonElement;
import com.google.gson.JsonPrimitive;
import com.google.gson.JsonSerializationContext;
import com.google.gson.JsonSerializer;
import dev.plex.Plex;
import java.lang.reflect.Type;
import java.time.Instant;
import java.time.LocalDateTime;
import java.time.ZoneId;
import java.time.ZonedDateTime;
public class LocalDateTimeSerializer implements JsonSerializer<LocalDateTime>
public class ZonedDateTimeSerializer implements JsonSerializer<ZonedDateTime>
{
private static String TIMEZONE = Plex.get().config.getString("server.timezone");
@Override
public JsonElement serialize(LocalDateTime src, Type typeOfSrc, JsonSerializationContext context)
public JsonElement serialize(ZonedDateTime src, Type typeOfSrc, JsonSerializationContext context)
{
return new JsonPrimitive(src.toInstant(ZoneId.systemDefault().getRules().getOffset(Instant.now())).toEpochMilli());
return new JsonPrimitive(src.toInstant().toEpochMilli());
}
}