fix: add MMM d, yyyy, HH:mm:ss a timestamp heal support

titivermeesch · Jun 22, 2024 · a6fb140 · a6fb140
1 parent 2d4198b
commit a6fb140
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 8 deletions.
diff --git a/build.gradle b/build.gradle
@@ -9,7 +9,7 @@ java {
 }
 
 group = 'me.playbosswar.com'
-version = '8.7.0'
+version = '8.7.1'
 description = 'CommandTimer'
 
 repositories {
@@ -61,7 +61,7 @@ publishing {
         maven(MavenPublication) {
             groupId = 'me.playbosswar.com'
             artifactId = 'commandtimer'
-            version = '8.7.0'
+            version = '8.7.1'
 
             from components.java
         }

diff --git a/java8-build.gradle b/java8-build.gradle
@@ -9,7 +9,7 @@ java {
 }
 
 group = 'me.playbosswar.com'
-version = '8.7.0'
+version = '8.7.1'
 description = 'CommandTimer'
 
 repositories {
@@ -69,7 +69,7 @@ publishing {
         maven(MavenPublication) {
             groupId = 'me.playbosswar.com'
             artifactId = 'commandtimer'
-            version = '8.7.0'
+            version = '8.7.1'
 
             from components.java
         }

diff --git a/src/main/java/me/playbosswar/com/utils/gson/GsonDate.java b/src/main/java/me/playbosswar/com/utils/gson/GsonDate.java
@@ -17,13 +17,18 @@ public Date deserialize(JsonElement jsonElement, Type type,
         SimpleDateFormat formatter = new SimpleDateFormat(FORMAT);
         try {
             return formatter.parse(jsonElement.getAsString());
-        } catch(ParseException e) {
+        } catch(ParseException ex1) {
             // Check if maybe it's in the old format
             try {
                 SimpleDateFormat oldFormatter = new SimpleDateFormat("MMM d, yyyy, H:mm:ss a");
                 return oldFormatter.parse(jsonElement.getAsString());
-            } catch(ParseException ex) {
-                throw new JsonParseException(e);
+            } catch(ParseException ex2) {
+                try {
+                    SimpleDateFormat oldFormatter = new SimpleDateFormat("MMM d, yyyy, HH:mm:ss a");
+                    return oldFormatter.parse(jsonElement.getAsString());
+                } catch(ParseException ex3) {
+                    throw new JsonParseException(ex3);
+                }
             }
         }
     }

diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
@@ -1,6 +1,6 @@
 main: me.playbosswar.com.CommandTimerPlugin
 name: "CommandTimer"
-version: "8.7.0"
+version: "8.7.1"
 description: "Schedule commands like you want"
 author: PlayBossWar
 api-version: 1.13