http-api: encode json Instants as millis since epoch

2021-02-24 10:21:31 -07:00
parent 463b0d73ba
commit 06b8e1b798
3 changed files with 17 additions and 10 deletions
--- a/http-api/src/main/java/net/runelite/http/api/gson/InstantTypeAdapter.java
+++ b/http-api/src/main/java/net/runelite/http/api/gson/InstantTypeAdapter.java
@@ -43,12 +43,7 @@ public class InstantTypeAdapter extends TypeAdapter<Instant>
 			return;
 		}

-		out.beginObject()
-			.name("seconds")
-			.value(value.getEpochSecond())
-			.name("nanos")
-			.value(value.getNano())
-			.endObject();
+		out.value(value.toEpochMilli());
 	}

 	@Override
@@ -60,6 +55,12 @@ public class InstantTypeAdapter extends TypeAdapter<Instant>
 			return null;
 		}

+		if (in.peek() == JsonToken.NUMBER)
+		{
+			long jsTime = in.nextLong();
+			return Instant.ofEpochMilli(jsTime);
+		}
+
 		long seconds = 0;
 		int nanos = 0;
 		in.beginObject();