Add support for per-channel quit events

CHANGELOG

@@ -9,6 +9,7 @@ vNEXT (in development)
     * ServerConnected event is emitted as soon as the socket is connected
     * ServerReady event is emitted after logging in, negotiating, etc
   * Added extra debugging to show what type of events are being dispatched
+  * Added ChannelQuit event, raised for each channel a user is in when they quit
   * (Internal) Event handlers can now return more events to emit
 
 v0.2.1

src/main/kotlin/com/dmdirc/ktirc/events/ChannelStateHandler.kt

@@ -15,7 +15,7 @@ internal class ChannelStateHandler : EventHandler {
             is ChannelParted -> handlePart(client, event)
             is ChannelNamesReceived -> handleNamesReceived(client, event)
             is ChannelNamesFinished -> handleNamesFinished(client, event)
-            is UserQuit -> handleQuit(client, event)
+            is UserQuit -> return handleQuit(client, event)
         }
         return emptyList()
     }
@@ -61,8 +61,13 @@ internal class ChannelStateHandler : EventHandler {
         }
     }
 
-    private fun handleQuit(client: IrcClient, event: UserQuit) {
-        client.channelState.forEach { it.users -= event.user.nickname }
-    }
+    private fun handleQuit(client: IrcClient, event: UserQuit) = sequence {
+        client.channelState.forEach {
+            if (it.users.contains(event.user.nickname)) {
+                it.users -= event.user.nickname
+                yield(ChannelQuit(event.time, event.user, it.name, event.reason))
+            }
+        }
+    }.toList()
 
 }

src/main/kotlin/com/dmdirc/ktirc/events/Events.kt

@@ -29,6 +29,9 @@ class ChannelJoined(time: LocalDateTime, val user: User, val channel: String) :
 /** Raised when a user leaves a channel. */
 class ChannelParted(time: LocalDateTime, val user: User, val channel: String, val reason: String = "") : IrcEvent(time)
 
+/** Raised when a user quits, and is in a channel. */
+class ChannelQuit(time: LocalDateTime, val user: User, val channel: String, val reason: String = "") : IrcEvent(time)
+
 /** Raised when a batch of the channel's member list has been received. More batches may follow. */
 class ChannelNamesReceived(time: LocalDateTime, val channel: String, val names: List<String>) : IrcEvent(time)
 

src/test/kotlin/com/dmdirc/ktirc/events/ChannelStateHandlerTest.kt

@@ -161,4 +161,39 @@ internal class ChannelStateHandlerTest {
         assertTrue("acidburn" in channelStateMap["#chat"]!!.users)
     }
 
+
+    @Test
+    fun `ChannelStateHandler raises ChannelQuit event for each channel a user quits from`() = runBlocking {
+        with (ChannelState("#thegibson") { CaseMapping.Rfc }) {
+            users += ChannelUser("ZeroCool")
+            channelStateMap += this
+        }
+
+        with (ChannelState("#dumpsterdiving") { CaseMapping.Rfc }) {
+            users += ChannelUser("ZeroCool")
+            channelStateMap += this
+        }
+
+        with (ChannelState("#chat") { CaseMapping.Rfc }) {
+            users += ChannelUser("AcidBurn")
+            channelStateMap += this
+        }
+
+        val events = handler.processEvent(ircClient, UserQuit(TestConstants.time, User("zerocool", "dade", "root.localhost"), "Hack the planet!"))
+
+        val names = mutableListOf<String>()
+        assertEquals(2, events.size)
+        events.forEach { event ->
+            (event as ChannelQuit).let {
+                assertEquals(TestConstants.time, it.time)
+                assertEquals("zerocool", it.user.nickname)
+                assertEquals("Hack the planet!", it.reason)
+                names.add(it.channel)
+            }
+        }
+
+        assertTrue("#thegibson" in names)
+        assertTrue("#dumpsterdiving" in names)
+    }
+
 }