Handle account name tags

src/main/kotlin/com/dmdirc/ktirc/messages/JoinProcessor.kt

@@ -2,14 +2,13 @@ package com.dmdirc.ktirc.messages
 
 import com.dmdirc.ktirc.events.ChannelJoined
 import com.dmdirc.ktirc.model.IrcMessage
-import com.dmdirc.ktirc.model.asUser
 
 internal class JoinProcessor : MessageProcessor {
 
     override val commands = arrayOf("JOIN")
 
-    override fun process(message: IrcMessage) = message.prefix?.let {
-        listOf(ChannelJoined(message.time, it.asUser(), String(message.params[0])))
+    override fun process(message: IrcMessage) = message.sourceUser?.let { user ->
+        listOf(ChannelJoined(message.time, user, String(message.params[0])))
     } ?: emptyList()
 
 }

src/main/kotlin/com/dmdirc/ktirc/messages/PartProcessor.kt

@@ -2,14 +2,13 @@ package com.dmdirc.ktirc.messages
 
 import com.dmdirc.ktirc.events.ChannelParted
 import com.dmdirc.ktirc.model.IrcMessage
-import com.dmdirc.ktirc.model.asUser
 
 internal class PartProcessor : MessageProcessor {
 
     override val commands = arrayOf("PART")
 
-    override fun process(message: IrcMessage) = message.prefix?.let {
-        listOf(ChannelParted(message.time, it.asUser(), message.channel, message.reason))
+    override fun process(message: IrcMessage) = message.sourceUser?.let { user ->
+        listOf(ChannelParted(message.time, user, message.channel, message.reason))
     } ?: emptyList()
 
     private val IrcMessage.channel

src/main/kotlin/com/dmdirc/ktirc/messages/PrivmsgProcessor.kt

@@ -2,14 +2,13 @@ package com.dmdirc.ktirc.messages
 
 import com.dmdirc.ktirc.events.MessageReceived
 import com.dmdirc.ktirc.model.IrcMessage
-import com.dmdirc.ktirc.model.asUser
 
 internal class PrivmsgProcessor : MessageProcessor {
 
     override val commands = arrayOf("PRIVMSG")
 
-    override fun process(message: IrcMessage) = message.prefix?.let {
-        listOf(MessageReceived(message.time, it.asUser(), String(message.params[0]), String(message.params[1])))
+    override fun process(message: IrcMessage) = message.sourceUser?.let { user ->
+        listOf(MessageReceived(message.time, user, String(message.params[0]), String(message.params[1])))
     } ?: emptyList()
 
 }

src/main/kotlin/com/dmdirc/ktirc/messages/QuitProcessor.kt

@@ -2,14 +2,13 @@ package com.dmdirc.ktirc.messages
 
 import com.dmdirc.ktirc.events.UserQuit
 import com.dmdirc.ktirc.model.IrcMessage
-import com.dmdirc.ktirc.model.asUser
 
 internal class QuitProcessor : MessageProcessor {
 
     override val commands = arrayOf("QUIT")
 
-    override fun process(message: IrcMessage) = message.prefix?.let {
-        listOf(UserQuit(message.time, it.asUser(), message.reason))
+    override fun process(message: IrcMessage) = message.sourceUser?.let { user ->
+        listOf(UserQuit(message.time, user, message.reason))
     } ?: emptyList()
 
     private val IrcMessage.reason

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

@@ -17,6 +17,12 @@ class IrcMessage(val tags: Map<MessageTag, String>, val prefix: ByteArray?, val
         currentTimeProvider()
     }
 
+    val sourceUser by lazy {
+        prefix?.asUser()?.apply {
+            tags[MessageTag.AccountName]?.let { account = it }
+        }
+    }
+
 }
 
 sealed class MessageTag(val name: String) {

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

@@ -1,6 +1,13 @@
 package com.dmdirc.ktirc.model
 
-data class User(val nickname: String, val ident: String? = null, val hostname: String? = null)
+data class User(
+        var nickname: String,
+        var ident: String? = null,
+        var hostname: String? = null,
+        var account: String? = null,
+        var realName: String? = null,
+        var awayMessage: String? = null
+)
 
 fun ByteArray.asUser(): User {
     val string = String(this)

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

@@ -2,6 +2,7 @@ package com.dmdirc.ktirc.model
 
 import com.dmdirc.ktirc.TestConstants
 import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Assertions.assertNull
 import org.junit.jupiter.api.Test
 import java.time.LocalDateTime
 import java.time.ZoneId
@@ -29,4 +30,26 @@ internal class IrcMessageTest {
         assertEquals(LocalDateTime.parse("1995-09-15T09:00:00"), message.time)
     }
 
+    @Test
+    fun `Can parse the prefix as a source user`() {
+        val message = IrcMessage(emptyMap(), "acidBurn!libby@root.localhost".toByteArray(), "", emptyList())
+        val user = message.sourceUser!!
+
+        assertEquals("acidBurn", user.nickname)
+        assertEquals("libby", user.ident)
+        assertEquals("root.localhost", user.hostname)
+        assertNull(user.account)
+    }
+
+    @Test
+    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!!
+
+        assertEquals("acidBurn", user.nickname)
+        assertEquals("libby", user.ident)
+        assertEquals("root.localhost", user.hostname)
+        assertEquals("acidBurn", user.account)
+    }
+
 }