summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorPaul Schoenfelder <paulschoenfelder@gmail.com>2014-02-19 18:39:41 -0600
committerPaul Schoenfelder <paulschoenfelder@gmail.com>2014-02-19 18:39:41 -0600
commitd42f28a337f591bfa2c87a5d84204fa772c2a8ef (patch)
treebff4bc61ac09fb7cc78a7354a7ed54e1780fb87e /lib
parentVersion 0.2.1 (diff)
Add support for Elixir 0.12.4+
Diffstat (limited to 'lib')
-rw-r--r--lib/exirc/client.ex28
-rw-r--r--lib/exirc/commands.ex4
-rw-r--r--lib/exirc/utils.ex4
3 files changed, 18 insertions, 18 deletions
diff --git a/lib/exirc/client.ex b/lib/exirc/client.ex
index 9d40e3d..9f5f219 100644
--- a/lib/exirc/client.ex
+++ b/lib/exirc/client.ex
@@ -48,7 +48,7 @@ defmodule ExIrc.Client do
Returns either {:ok, pid} or {:error, reason}
"""
@spec start!(options :: list() | nil) :: {:ok, pid} | {:error, term}
- def start!(options // []) do
+ def start!(options \\ []) do
start_link(options)
end
@doc """
@@ -57,7 +57,7 @@ defmodule ExIrc.Client do
Returns either {:ok, pid} or {:error, reason}
"""
@spec start!(options :: list() | nil) :: {:ok, pid} | {:error, term}
- def start_link(options // []) do
+ def start_link(options \\ []) do
:gen_server.start_link(__MODULE__, options, [])
end
@doc """
@@ -130,7 +130,7 @@ defmodule ExIrc.Client do
Join a channel, with an optional password
"""
@spec join(client :: pid, channel :: binary, key :: binary | nil) :: :ok | {:error, atom}
- def join(client, channel, key // "") do
+ def join(client, channel, key \\ "") do
:gen_server.call(client, {:join, channel, key}, :infinity)
end
@doc """
@@ -144,7 +144,7 @@ defmodule ExIrc.Client do
Quit the server, with an optional part message
"""
@spec quit(client :: pid, msg :: binary | nil) :: :ok | {:error, atom}
- def quit(client, msg // "Leaving..") do
+ def quit(client, msg \\ "Leaving..") do
:gen_server.call(client, {:quit, msg}, :infinity)
end
@doc """
@@ -242,7 +242,7 @@ defmodule ExIrc.Client do
Called when :gen_server initializes the client
"""
@spec init(list(any) | []) :: {:ok, ClientState.t}
- def init(options // []) do
+ def init(options \\ []) do
autoping = Keyword.get(options, :autoping, true)
debug = Keyword.get(options, :debug, false)
# Add event handlers
@@ -433,14 +433,14 @@ defmodule ExIrc.Client do
end
# Called when the client enters a channel
def handle_data(IrcMessage[nick: nick, cmd: "JOIN"] = msg, ClientState[nick: nick] = state) do
- if state.debug?, do: debug "JOINED A CHANNEL #{Enum.first(msg.args)}"
- channels = Channels.join(state.channels, Enum.first(msg.args))
+ if state.debug?, do: debug "JOINED A CHANNEL #{List.first(msg.args)}"
+ channels = Channels.join(state.channels, List.first(msg.args))
{:noreply, state.channels(channels)}
end
# Called when another user joins a channel the client is in
def handle_data(IrcMessage[nick: user_nick, cmd: "JOIN"] = msg, state) do
- if state.debug?, do: debug "ANOTHER USER JOINED A CHANNEL: #{Enum.first(msg.args)} - #{user_nick}"
- channels = Channels.user_join(state.channels, Enum.first(msg.args), user_nick)
+ if state.debug?, do: debug "ANOTHER USER JOINED A CHANNEL: #{List.first(msg.args)} - #{user_nick}"
+ channels = Channels.user_join(state.channels, List.first(msg.args), user_nick)
{:noreply, state.channels(channels)}
end
# Called on joining a channel, to tell us the channel topic
@@ -487,14 +487,14 @@ defmodule ExIrc.Client do
end
# Called when we leave a channel
def handle_data(IrcMessage[cmd: "PART", nick: nick] = msg, ClientState[nick: nick] = state) do
- if state.debug?, do: debug "WE LEFT A CHANNEL: #{Enum.first(msg.args)}"
- channels = Channels.part(state.channels, Enum.first(msg.args))
+ if state.debug?, do: debug "WE LEFT A CHANNEL: #{List.first(msg.args)}"
+ channels = Channels.part(state.channels, List.first(msg.args))
{:noreply, state.channels(channels)}
end
# Called when someone else in our channel leaves
def handle_data(IrcMessage[cmd: "PART", nick: user_nick] = msg, state) do
- if state.debug?, do: debug "#{user_nick} LEFT A CHANNEL: #{Enum.first(msg.args)}"
- channels = Channels.user_part(state.channels, Enum.first(msg.args), user_nick)
+ if state.debug?, do: debug "#{user_nick} LEFT A CHANNEL: #{List.first(msg.args)}"
+ channels = Channels.user_part(state.channels, List.first(msg.args), user_nick)
{:noreply, state.channels(channels)}
end
# Called when we receive a PING
@@ -516,7 +516,7 @@ defmodule ExIrc.Client do
# Internal API
###############
defp send_event(msg, ClientState[event_handlers: handlers]) when is_list(handlers) do
- Enum.each(handlers, fn({pid, _}) -> pid <- msg end)
+ Enum.each(handlers, fn({pid, _}) -> Kernel.send(pid, msg) end)
end
defp do_add_handler(pid, handlers) do
diff --git a/lib/exirc/commands.ex b/lib/exirc/commands.ex
index d7e425e..88c0541 100644
--- a/lib/exirc/commands.ex
+++ b/lib/exirc/commands.ex
@@ -235,7 +235,7 @@ defmodule Irc.Commands do
"""
def join!(channel, key) when is_binary(channel), do: join!(String.to_char_list!(channel), key)
def join!(channel, key) when is_binary(key), do: join!(channel, String.to_char_list!(key))
- def join!(channel, key // ''), do: command! ['JOIN ', channel, ' ', key]
+ def join!(channel, key \\ ''), do: command! ['JOIN ', channel, ' ', key]
@doc """
Send part command to server (leave a channel)
"""
@@ -245,6 +245,6 @@ defmodule Irc.Commands do
Send quit command to server (disconnect from server)
"""
def quit!(msg) when is_binary(msg), do: quit! String.to_char_list!(msg)
- def quit!(msg // 'Leaving'), do: command! ['QUIT :', msg]
+ def quit!(msg \\ 'Leaving'), do: command! ['QUIT :', msg]
end
diff --git a/lib/exirc/utils.ex b/lib/exirc/utils.ex
index 9c2d518..c7d5e67 100644
--- a/lib/exirc/utils.ex
+++ b/lib/exirc/utils.ex
@@ -30,7 +30,7 @@ defmodule ExIrc.Utils do
end
defp parse_from(from, msg) do
- case Regex.split(%r/(!|@|\.)/, from) do
+ case Regex.split(~r/(!|@|\.)/, from) do
[nick, '!', user, '@', host | host_rest] ->
msg.nick(from_char_list!(nick)).user(from_char_list!(user)).host(from_char_list!(host ++ host_rest))
[nick, '@', host | host_rest] ->
@@ -121,7 +121,7 @@ defmodule ExIrc.Utils do
state.network(network)
end
defp isup_param("PREFIX=" <> user_prefixes, state) do
- prefixes = Regex.run(%r/\((.*)\)(.*)/, user_prefixes, capture: :all_but_first)
+ prefixes = Regex.run(~r/\((.*)\)(.*)/, user_prefixes, capture: :all_but_first)
|> Enum.map(&String.to_char_list!/1)
|> List.zip
state.user_prefixes(prefixes)