From 7094b6a7df22f01121b985e773fa341aea2295f0 Mon Sep 17 00:00:00 2001
From: w1gz <w1gz@noreply.com>
Date: Tue, 21 Feb 2017 23:31:56 +0100
Subject: Fix unicode bug when parsing message arguments

---
 lib/exirc/utils.ex  | 10 +++++-----
 test/utils_test.exs | 52 +++++++++++++++++++++++++++++++++++++++++++---------
 2 files changed, 48 insertions(+), 14 deletions(-)

diff --git a/lib/exirc/utils.ex b/lib/exirc/utils.ex
index d3f903c..0ef392e 100644
--- a/lib/exirc/utils.ex
+++ b/lib/exirc/utils.ex
@@ -54,7 +54,7 @@ defmodule ExIrc.Utils do
       |> Enum.map(&List.to_string/1)
     case args do
       args when args != [] ->
-        %{msg | 
+        %{msg |
           cmd:  to_string(ctcp_cmd),
           args: [to_string(target), args |> Enum.join(" ")],
           ctcp: true
@@ -72,10 +72,10 @@ defmodule ExIrc.Utils do
   # Parse command args from message
   defp get_args([], msg) do
     args = msg.args
-      |> Enum.reverse
-      |> Enum.filter(fn arg -> arg != [] end)
-      |> Enum.map(&trim_crlf/1)
-      |> Enum.map(&List.to_string/1)
+    |> Enum.reverse
+    |> Enum.filter(fn arg -> arg != [] end)
+    |> Enum.map(&trim_crlf/1)
+    |> Enum.map(&(:unicode.characters_to_binary(&1, :unicode, :latin1)))
     post_process(%{msg | args: args})
   end
 
diff --git a/test/utils_test.exs b/test/utils_test.exs
index 38e343b..33f6907 100644
--- a/test/utils_test.exs
+++ b/test/utils_test.exs
@@ -9,13 +9,13 @@ defmodule ExIrc.UtilsTest do
   doctest ExIrc.Utils
 
   test "Given a local date/time as a tuple, can retrieve get the CTCP formatted time" do
-  	local_time = {{2013,12,6},{14,5,0}} # Mimics output of :calendar.local_time()
-  	assert Utils.ctcp_time(local_time) == "Fri Dec 06 14:05:00 2013"
+    local_time = {{2013,12,6},{14,5,0}} # Mimics output of :calendar.local_time()
+    assert Utils.ctcp_time(local_time) == "Fri Dec 06 14:05:00 2013"
   end
 
   test "Can parse a CTCP command" do
     message = ':pschoenf NOTICE #testchan :' ++ '#{<<0o001>>}' ++ 'ACTION mind explodes!!' ++ '#{<<0o001>>}'
-  	expected = %IrcMessage{
+    expected = %IrcMessage{
       nick: "pschoenf",
       cmd:  "ACTION",
       ctcp: true,
@@ -100,9 +100,9 @@ defmodule ExIrc.UtilsTest do
   test "parse join message" do
     message = ':pschoenf JOIN #elixir-lang'
     assert %IrcMessage{
-      :nick => "pschoenf",
-      :cmd => "JOIN",
-      :args => ["#elixir-lang"]
+      nick: "pschoenf",
+      cmd: "JOIN",
+      args: ["#elixir-lang"]
     } = Utils.parse(message)
   end
 
@@ -121,9 +121,43 @@ defmodule ExIrc.UtilsTest do
     # with 331 at all - they just fall on the floor, no crashes to be seen (ideally)
     message = ':irc.tinyspeck.com 332 jadams #elm-playground-news :'
     assert %IrcMessage{
-      :nick => "jadams",
-      :cmd =>  "331",
-      :args => ["#elm-playground-news", "No topic is set"]
+      nick: "jadams",
+      cmd:  "331",
+      args: ["#elm-playground-news", "No topic is set"]
+    } = Utils.parse(message)
+  end
+
+  test "Can parse simple unicode" do
+    # ':foo!~user@172.17.0.1 PRIVMSG #bar :éáçíóö\r\n'
+    message = [58, 102, 111, 111, 33, 126, 117, 115, 101, 114, 64, 49, 55, 50,
+               46, 49, 55, 46, 48, 46, 49, 32, 80, 82, 73, 86, 77, 83, 71, 32,
+               35, 98, 97, 114, 32, 58, 195, 169, 195, 161, 195, 167, 195, 173,
+               195, 179, 195, 182, 13, 10]
+    assert %IrcMessage{
+      args: ["#bar", "éáçíóö"],
+      cmd:  "PRIVMSG",
+      ctcp: false,
+      host: "172.17.0.1",
+      nick: "foo",
+      server: [],
+      user: "~user"
+    } = Utils.parse(message)
+  end
+
+  test "Can parse complex unicode" do
+    # ':foo!~user@172.17.0.1 PRIVMSG #bar :Ĥélłø 차\r\n'
+    message = [58, 102, 111, 111, 33, 126, 117, 115, 101, 114, 64, 49, 55, 50,
+               46, 49, 55, 46, 48, 46, 49, 32, 80, 82, 73, 86, 77, 83, 71, 32,
+               35, 98, 97, 114, 32, 58, 196, 164, 195, 169, 108, 197, 130, 195,
+               184, 32, 236, 176, 168, 13, 10]
+    assert %IrcMessage{
+      args: ["#bar", "Ĥélłø 차"],
+      cmd:  "PRIVMSG",
+      ctcp: false,
+      host: "172.17.0.1",
+      nick: "foo",
+      server: [],
+      user: "~user"
     } = Utils.parse(message)
   end
 
-- 
cgit v1.2.3