Merge pull request #231 from Shikkanime/fix-threads-and-bsky

Fix ThreadsSocialNetwork.kt and BskySocialNetwork.kt
Shikkanime · Mar 1, 2024 · 22ac06c · 22ac06c
2 parents 66bcf4c + 86a7923
commit 22ac06c
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 11 deletions.
diff --git a/src/main/kotlin/fr/shikkanime/socialnetworks/BskySocialNetwork.kt b/src/main/kotlin/fr/shikkanime/socialnetworks/BskySocialNetwork.kt
@@ -46,12 +46,14 @@ class BskySocialNetwork : AbstractSocialNetwork() {
     }
 
     private fun checkSession() {
-        if (!isInitialized) return
-
-        if (initializedAt!!.plusMinutes(configCacheService.getValueAsInt(ConfigPropertyKey.BSKY_SESSION_TIMEOUT, 10).toLong()).isBefore(ZonedDateTime.now())) {
-            logout()
-            login()
+        if (initializedAt != null && initializedAt!!.plusMinutes(configCacheService.getValueAsInt(ConfigPropertyKey.BSKY_SESSION_TIMEOUT, 10).toLong())
+                .isAfter(ZonedDateTime.now())
+        ) {
+            return
         }
+
+        logout()
+        login()
     }
 
     override fun sendMessage(message: String) {

diff --git a/src/main/kotlin/fr/shikkanime/socialnetworks/ThreadsSocialNetwork.kt b/src/main/kotlin/fr/shikkanime/socialnetworks/ThreadsSocialNetwork.kt
@@ -50,14 +50,14 @@ class ThreadsSocialNetwork : AbstractSocialNetwork() {
     }
 
     private fun checkSession() {
-        if (!isInitialized) return
-
-        if (initializedAt!!.plusMinutes(configCacheService.getValueAsInt(ConfigPropertyKey.THREADS_SESSION_TIMEOUT, 10).toLong())
-                .isBefore(ZonedDateTime.now())
+        if (initializedAt != null && initializedAt!!.plusMinutes(configCacheService.getValueAsInt(ConfigPropertyKey.THREADS_SESSION_TIMEOUT, 10).toLong())
+                .isAfter(ZonedDateTime.now())
         ) {
-            logout()
-            login()
+            return
         }
+
+        logout()
+        login()
     }
 
     override fun sendMessage(message: String) {