From b3ba4e3e9916972b70eee75300981f656d304fe2 Mon Sep 17 00:00:00 2001
From: moonleay <contact@moonleay.net>
Date: Sat, 21 Oct 2023 14:56:26 +0200
Subject: [PATCH 1/2] fix!: fixed timestamp not converting correctly

Signed-off-by: moonleay <contact@moonleay.net>
---
 .../net/moonleay/rssbot/util/MessageUtil.kt   |  2 +-
 .../net/moonleay/rssbot/util/TimeUtil.kt      | 24 +++++++++++++++----
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/src/main/kotlin/net/moonleay/rssbot/util/MessageUtil.kt b/src/main/kotlin/net/moonleay/rssbot/util/MessageUtil.kt
index 12fedd7..21b109e 100644
--- a/src/main/kotlin/net/moonleay/rssbot/util/MessageUtil.kt
+++ b/src/main/kotlin/net/moonleay/rssbot/util/MessageUtil.kt
@@ -29,7 +29,7 @@ import java.time.LocalDateTime
 import java.time.format.DateTimeFormatter
 
 object MessageUtil {
-    private val dtf: DateTimeFormatter = DateTimeFormatter.ofPattern("dd/MM/yyyy @ HH:mm:ss")
+    private val dtf: DateTimeFormatter = DateTimeFormatter.ofPattern("EEE, dd MMM yyyy HH:mm:ss")
 
     ///Send an embedded message as a reply
     suspend fun sendEmbedForPublicSlashCommand(
diff --git a/src/main/kotlin/net/moonleay/rssbot/util/TimeUtil.kt b/src/main/kotlin/net/moonleay/rssbot/util/TimeUtil.kt
index 644d0c0..18fa0f1 100644
--- a/src/main/kotlin/net/moonleay/rssbot/util/TimeUtil.kt
+++ b/src/main/kotlin/net/moonleay/rssbot/util/TimeUtil.kt
@@ -20,13 +20,27 @@ package net.moonleay.rssbot.util
 
 import java.time.ZonedDateTime
 import java.time.format.DateTimeFormatter
+import java.time.format.DateTimeParseException
 
 
 object TimeUtil {
     fun getUnixTimeFromStamp(input: String): Long { // Pattern: Sun, 15 Oct 2023 11:04:57 GMT
-        val formatter = DateTimeFormatter.ofPattern("EEE, dd MMM yyyy HH:mm:ss z")
-        val result = ZonedDateTime.parse(input, formatter).toEpochSecond() * 1000
-        Logger.out("Converted $input to $result")
-        return result
-    }
+        try {
+            val formatter = DateTimeFormatter.ofPattern("EEE, dd MMM yyyy HH:mm:ss zzz")
+            val result = ZonedDateTime.parse(input, formatter).toEpochSecond() * 1000
+            Logger.out("Converted $input to $result")
+            return result
+        } catch (e: DateTimeParseException) {
+            Logger.out("Could not convert $input to unix time, trying other pattern")
+            return try {
+                val formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ssX")
+                val result = ZonedDateTime.parse(input, formatter).toEpochSecond() * 1000
+                Logger.out("Converted $input to $result")
+                result
+            } catch (e: DateTimeParseException) {
+                Logger.out("Could not convert $input to unix time")
+                0
+            }
+        }
+    } // I'm ashamed of this code. I'm sorry. I don't know how to do it better.
 }

From 8a2a9564b837046a25bba0f7b9f7bfb2aefd28ae Mon Sep 17 00:00:00 2001
From: moonleay <contact@moonleay.net>
Date: Sat, 21 Oct 2023 14:56:38 +0200
Subject: [PATCH 2/2] chore: bump version

Signed-off-by: moonleay <contact@moonleay.net>
---
 build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index c3accb8..2b549ee 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -14,7 +14,7 @@ val ownerID = 372703841151614976L
 group = "net.moonleay.rssbot"
 version = System.getenv("CI_COMMIT_TAG")?.let { "$it-${System.getenv("CI_COMMIT_SHORT_SHA")}-prod" }
     ?: System.getenv("CI_COMMIT_SHORT_SHA")?.let { "$it-dev" }
-            ?: "0.3.1"
+            ?: "0.3.3"
 
 val kordver = "1.5.10-SNAPSHOT"
 val coroutinesver = "1.7.3"