diff options
Diffstat (limited to 'lib/irc/connection.ex')
-rw-r--r-- | lib/irc/connection.ex | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/lib/irc/connection.ex b/lib/irc/connection.ex index 9bb09ed..037b7d6 100644 --- a/lib/irc/connection.ex +++ b/lib/irc/connection.ex @@ -24,9 +24,9 @@ defmodule IRC.Connection do * `triggers` -- all triggers * `trigger:TRIGGER` -- any message with a trigger `TRIGGER` - ## Replying to %IRC.Message{} + ## Replying to %Nola.Message{} - Each `IRC.Message` comes with a dedicated `replyfun`, to which you only have to pass either: + Each `Nola.Message` comes with a dedicated `replyfun`, to which you only have to pass either: """ def irc_doc, do: nil @@ -294,7 +294,7 @@ defmodule IRC.Connection do if !Map.get(user.options, :puppet) do reply_fun = fn(text) -> irc_reply(state, {chan, sender}, text) end account = Nola.Account.lookup(sender) - message = %IRC.Message{id: FlakeId.get(), transport: :irc, at: NaiveDateTime.utc_now(), text: text, network: state.network, + message = %Nola.Message{id: FlakeId.get(), transport: :irc, at: NaiveDateTime.utc_now(), text: text, network: state.network, account: account, sender: sender, channel: chan, replyfun: reply_fun, trigger: extract_trigger(text)} message = case Nola.UserTrack.messaged(message) do @@ -311,7 +311,7 @@ defmodule IRC.Connection do def handle_info({:received, text, sender}, state) do reply_fun = fn(text) -> irc_reply(state, {sender.nick, sender}, text) end account = Nola.Account.lookup(sender) - message = %IRC.Message{id: FlakeId.get(), transport: :irc, text: text, network: state.network, at: NaiveDateTime.utc_now(), + message = %Nola.Message{id: FlakeId.get(), transport: :irc, text: text, network: state.network, at: NaiveDateTime.utc_now(), account: account, sender: sender, replyfun: reply_fun, trigger: extract_trigger(text)} message = case Nola.UserTrack.messaged(message) do :ok -> message @@ -401,11 +401,11 @@ defmodule IRC.Connection do def publish(pub), do: publish(pub, []) - def publish(m = %IRC.Message{trigger: nil}, keys) do + def publish(m = %Nola.Message{trigger: nil}, keys) do dispatch(["messages"] ++ keys, {:irc, :text, m}) end - def publish(m = %IRC.Message{trigger: t = %IRC.Trigger{trigger: trigger}}, keys) do + def publish(m = %Nola.Message{trigger: t = %Nola.Trigger{trigger: trigger}}, keys) do dispatch(["triggers", "#{m.network}/#{m.channel}:triggers", "trigger:"<>trigger], {:irc, :trigger, trigger, m}) end @@ -445,7 +445,7 @@ defmodule IRC.Connection do def extract_trigger(unquote(trigger)<>text) do text = String.strip(text) [trigger | args] = String.split(text, " ") - %IRC.Trigger{type: unquote(name), trigger: String.downcase(trigger), args: args} + %Nola.Trigger{type: unquote(name), trigger: String.downcase(trigger), args: args} end end @@ -463,7 +463,7 @@ defmodule IRC.Connection do |> List.flatten() outputs = for line <- lines do ExIRC.Client.msg(client, :privmsg, target, line) - {:irc, :out, %IRC.Message{id: FlakeId.get(), transport: :irc, network: network, + {:irc, :out, %Nola.Message{id: FlakeId.get(), transport: :irc, network: network, channel: target, text: line, sender: %ExIRC.SenderInfo{nick: state.conn.nick}, at: NaiveDateTime.utc_now(), meta: %{self: true}}} end for f <- outputs, do: dispatch(["irc:outputs", "#{network}/#{target}:outputs"], f) |