Handle bad server timestamps

CHANGELOG

@@ -1,6 +1,7 @@
 vNEXT (in development)
 
  * Fix issue parsing CTCPs when the content contained multi-byte chars
+ * If the server provides an invalid timestamp, the event now defaults to the current time
 
 v0.10.2
 

src/main/kotlin/com/dmdirc/ktirc/model/IrcMessage.kt

@@ -3,17 +3,21 @@ package com.dmdirc.ktirc.model
 import com.dmdirc.ktirc.events.EventMetadata
 import com.dmdirc.ktirc.util.currentTimeProvider
 import com.dmdirc.ktirc.util.currentTimeZoneProvider
+import com.dmdirc.ktirc.util.logger
 import java.time.Instant
 import java.time.LocalDateTime
+import java.util.logging.Level
 
 /**
  * Represents an IRC protocol message.
  */
 internal class IrcMessage(val tags: Map<MessageTag, String>, val prefix: ByteArray?, val command: String, val params: List<ByteArray>) {
 
+    private val log by logger()
+
     /** The time at which the message was sent, or our best guess at it. */
     val metadata = EventMetadata(
-            time = time,
+            time = tags[MessageTag.ServerTime]?.toLocalDateOrNull() ?: currentTimeProvider(),
             batchId = tags[MessageTag.Batch],
             messageId = tags[MessageTag.MessageId],
             label = tags[MessageTag.Label])
@@ -25,11 +29,12 @@ internal class IrcMessage(val tags: Map<MessageTag, String>, val prefix: ByteArr
         }
     }
 
-    private val time
-        get() = when (MessageTag.ServerTime in tags) {
-            true -> LocalDateTime.ofInstant(Instant.parse(tags[MessageTag.ServerTime]), currentTimeZoneProvider())
-            false -> currentTimeProvider()
-        }
+    private fun String.toLocalDateOrNull() = try {
+        LocalDateTime.ofInstant(Instant.parse(this), currentTimeZoneProvider())
+    } catch(e: Exception) {
+        log.log(Level.WARNING, e) { "Received unparsable server-time tag: $this" }
+        null
+    }
 
 }
 

src/test/kotlin/com/dmdirc/ktirc/model/IrcMessageTest.kt

@@ -12,21 +12,28 @@ import java.time.ZoneId
 internal class IrcMessageTest {
 
     @Test
-    fun `Gets UTC time from ServerTime tag if present`() {
+    fun `gets UTC time from ServerTime tag if present`() {
         currentTimeZoneProvider = { ZoneId.of("Z") }
         val message = IrcMessage(hashMapOf(MessageTag.ServerTime to "1995-09-15T09:00:00.0000Z"), null, "", emptyList())
         assertEquals(LocalDateTime.parse("1995-09-15T09:00:00"), message.metadata.time)
     }
 
     @Test
-    fun `Converts time in ServerTime tag to local timezone`() {
+    fun `converts time in ServerTime tag to local timezone`() {
         currentTimeZoneProvider = { ZoneId.of("America/New_York") }
         val message = IrcMessage(hashMapOf(MessageTag.ServerTime to "1995-09-15T09:00:00.0000Z"), null, "", emptyList())
         assertEquals(LocalDateTime.parse("1995-09-15T05:00:00"), message.metadata.time)
     }
 
     @Test
-    fun `Uses current local time if no tag present`() {
+    fun `uses current time if ServerTime tag is malformed`() {
+        currentTimeProvider = { TestConstants.time }
+        val message = IrcMessage(hashMapOf(MessageTag.ServerTime to "1996-05-03T13:00:00.***Z"), null, "", emptyList())
+        assertEquals(LocalDateTime.parse("1995-09-15T09:00:00"), message.metadata.time)
+    }
+
+    @Test
+    fun `uses current local time if no tag present`() {
         currentTimeProvider = { TestConstants.time }
         val message = IrcMessage(emptyMap(), null, "", emptyList())
         assertEquals(LocalDateTime.parse("1995-09-15T09:00:00"), message.metadata.time)
@@ -65,7 +72,7 @@ internal class IrcMessageTest {
     }
 
     @Test
-    fun `Uses account-name tag when creating a source user`() {
+    fun `uses account-name tag when creating a source user`() {
         val message = IrcMessage(hashMapOf(MessageTag.AccountName to "acidBurn"), "acidBurn!libby@root.localhost".toByteArray(), "", emptyList())
         val user = message.sourceUser!!