Cont. wipmaster

1 files changed, 4 insertions, 6 deletions

diff --git a/lib/irc/client/command/join.ex b/lib/irc/client/command/join.ex
index f4728c7..f84dc4a 100644
--- a/lib/irc/client/command/join.ex
+++ b/lib/irc/client/command/join.ex
@@ -1,7 +1,5 @@
 defmodule Irc.Client.Command.Join do
-  alias Irc.Parser.Line
-  require Line
-  import Line
+  alias Irc.Line
 
   @type t :: {:join, channel :: String.t()} | {:join, channel :: String.t(), Irc.User.t()}
 
@@ -10,7 +8,7 @@ defmodule Irc.Client.Command.Join do
   end
 
   # An user joined
-  def handle_line(line = %Line{command: "JOIN", source: source, args: [channel | args]}, conn) do
+  def handle_line(conn, line = %Line{command: "JOIN", source: source, args: [channel | args]}) do
     if Line.self?(line, conn) do
       {:event, {:join, channel}}
     else
@@ -26,12 +24,12 @@ defmodule Irc.Client.Command.Join do
   end
 
   # Join a channel
-  def handle_command(:join, [channel], _conn_info) do
+  def handle_command(_, :join, [channel]) do
     {:send, ['JOIN', channel]}
   end
 
   # Outdated!
-  def handle_buffer(%Line{command: "JOIN", source: %Irc.Mask{nick: nick}, args: [channel]}, buffer = %{channel: channel}, %Irc.Connection{nick: nick}) do
+  def handle_buffer(%Irc.Connection{nick: nick}, %Line{command: "JOIN", source: %Irc.Mask{nick: nick}, args: [channel]}, buffer = %{channel: channel}) do
     {:finish, nil, {:event, {:join, channel}}}
   end