Fix issue with multibyte chars in CTCPs

Mixing substrings and byte array offsets is bad...

CHANGELOG

@@ -1,5 +1,7 @@
 vNEXT (in development)
 
+ * Fix issue parsing CTCPs when the content contained multi-byte chars
+
 v0.10.2
 
  * Fix handling of multiple long lines sometimes dropping part of the line

src/main/kotlin/com/dmdirc/ktirc/messages/processors/NoticeProcessor.kt

@@ -18,7 +18,7 @@ internal class NoticeProcessor : MessageProcessor {
 
     private fun handleCtcp(message: IrcMessage, user: User?): List<IrcEvent> {
         user ?: return emptyList()
-        val content = String(message.params[1]).substring(1 until message.params[1].size - 1)
+        val content = String(message.params[1].sliceArray(1 until message.params[1].size - 1))
         val parts = content.split(' ', limit=2)
         val body = if (parts.size == 2) parts[1] else ""
         return listOf(CtcpReplyReceived(message.metadata, user, String(message.params[0]), parts[0], body))

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

@@ -20,7 +20,7 @@ internal class PrivmsgProcessor : MessageProcessor {
     } ?: emptyList()
 
     private fun handleCtcp(message: IrcMessage, user: User): IrcEvent {
-        val content = String(message.params[1]).substring(1 until message.params[1].size - 1)
+        val content = String(message.params[1].sliceArray(1 until message.params[1].size - 1))
         val parts = content.split(' ', limit=2)
         val body = if (parts.size == 2) parts[1] else ""
         return when (parts[0].toUpperCase()) {

src/test/kotlin/com/dmdirc/ktirc/messages/processors/NoticeProcessorTest.kt

@@ -58,6 +58,20 @@ internal class NoticeProcessorTest {
         assertEquals("12345", event.content)
     }
 
+    @Test
+    fun `raises CTCP reply received event with content when containing unicode chars`() {
+        val events = PrivmsgProcessor().process(
+                IrcMessage(emptyMap(), "acidburn!libby@root.localhost".toByteArray(), "NOTICE", params("#crashandburn", "\u0001PING 👩‍💻\u0001")))
+        assertEquals(1, events.size)
+
+        val event = events[0] as CtcpReplyReceived
+        assertEquals(TestConstants.time, event.metadata.time)
+        assertEquals(User("acidburn", "libby", "root.localhost"), event.user)
+        assertEquals("#crashandburn", event.target)
+        assertEquals("PING", event.type)
+        assertEquals("👩‍💻", event.content)
+    }
+
     @Test
     fun `raises CTCP reply received event without content`() {
         val events = NoticeProcessor().process(

src/test/kotlin/com/dmdirc/ktirc/messages/processors/PrivmsgProcessorTest.kt

@@ -85,6 +85,20 @@ internal class PrivmsgProcessorTest {
         assertEquals("12345", event.content)
     }
 
+    @Test
+    fun `raises CTCP received event with content when containing unicode chars`() {
+        val events = PrivmsgProcessor().process(
+                IrcMessage(emptyMap(), "acidburn!libby@root.localhost".toByteArray(), "PRIVMSG", params("#crashandburn", "\u0001PING 👩‍💻\u0001")))
+        assertEquals(1, events.size)
+
+        val event = events[0] as CtcpReceived
+        assertEquals(TestConstants.time, event.metadata.time)
+        assertEquals(User("acidburn", "libby", "root.localhost"), event.user)
+        assertEquals("#crashandburn", event.target)
+        assertEquals("PING", event.type)
+        assertEquals("👩‍💻", event.content)
+    }
+
     @Test
     fun `raises CTCP received event without content`() {
         val events = PrivmsgProcessor().process(