diff options
Diffstat (limited to 'lib/plugins')
-rw-r--r-- | lib/plugins/account.ex | 2 | ||||
-rw-r--r-- | lib/plugins/alcoolog.ex | 12 | ||||
-rw-r--r-- | lib/plugins/alcoolog_announcer.ex | 2 | ||||
-rw-r--r-- | lib/plugins/last_fm.ex | 2 | ||||
-rw-r--r-- | lib/plugins/preums.ex | 4 | ||||
-rw-r--r-- | lib/plugins/tell.ex | 4 | ||||
-rw-r--r-- | lib/plugins/txt.ex | 4 |
7 files changed, 15 insertions, 15 deletions
diff --git a/lib/plugins/account.ex b/lib/plugins/account.ex index 747fbc7..96405bb 100644 --- a/lib/plugins/account.ex +++ b/lib/plugins/account.ex @@ -47,7 +47,7 @@ defmodule Nola.Plugins.Account do end def handle_info({:irc, :text, m = %IRC.Message{account: account, text: "whoami"}}, state) do - users = for user <- IRC.UserTrack.find_by_account(m.account) do + users = for user <- Nola.UserTrack.find_by_account(m.account) do chans = Enum.map(user.privileges, fn({chan, _}) -> chan end) |> Enum.join(" ") "#{user.network} - #{user.nick}!#{user.username}@#{user.host} - #{chans}" diff --git a/lib/plugins/alcoolog.ex b/lib/plugins/alcoolog.ex index 738be71..cc56c4f 100644 --- a/lib/plugins/alcoolog.ex +++ b/lib/plugins/alcoolog.ex @@ -426,7 +426,7 @@ defmodule Nola.Plugins.Alcoolog do m.replyfun.(msg.(m.sender.nick, local_extra)) notify = Nola.Membership.notify_channels(m.account) -- [{m.network,m.channel}] for {net, chan} <- notify do - user = IRC.UserTrack.find_by_account(net, m.account) + user = Nola.UserTrack.find_by_account(net, m.account) nick = if(user, do: user.nick, else: m.account.name) extra = " " <> present_type(name, comment) <> "" IRC.Connection.broadcast_message(net, chan, msg.(nick, extra)) @@ -452,7 +452,7 @@ defmodule Nola.Plugins.Alcoolog do miss = Nola.Plugins.Txt.random("alcoolog.#{to_string(miss)}") if miss do for {net, chan} <- Nola.Membership.notify_channels(m.account) do - user = IRC.UserTrack.find_by_account(net, m.account) + user = Nola.UserTrack.find_by_account(net, m.account) nick = if(user, do: user.nick, else: m.account.name) IRC.Connection.broadcast_message(net, chan, "#{nick}: #{miss}") end @@ -617,7 +617,7 @@ defmodule Nola.Plugins.Alcoolog do end if account do - user = IRC.UserTrack.find_by_account(m.network, account) + user = Nola.UserTrack.find_by_account(m.network, account) nick = if(user, do: user.nick, else: account.name) stats = get_full_statistics(state, account.id) if stats && stats.sober_in > 0 do @@ -785,7 +785,7 @@ defmodule Nola.Plugins.Alcoolog do |> Enum.sort_by(fn({_nick, count}) -> count end, &>/2) |> Enum.map(fn({nick, count}) -> account = Nola.Account.get(nick) - user = IRC.UserTrack.find_by_account(m.network, account) + user = Nola.UserTrack.find_by_account(m.network, account) nick = if(user, do: user.nick, else: account.name) "#{nick}: #{Float.round(count, 4)}" end) @@ -851,7 +851,7 @@ defmodule Nola.Plugins.Alcoolog do Nola.Plugins.Txt.reply_random(m, "alcoolog.delete") notify = Nola.Membership.notify_channels(m.account) -- [{m.network,m.channel}] for {net, chan} <- notify do - user = IRC.UserTrack.find_by_account(net, m.account) + user = Nola.UserTrack.find_by_account(net, m.account) nick = if(user, do: user.nick, else: m.account.name) IRC.Connection.broadcast_message(net, chan, "#{nick} -santai #{points} #{type} #{descr}") end @@ -877,7 +877,7 @@ defmodule Nola.Plugins.Alcoolog do end _ -> nil end - user = IRC.UserTrack.find_by_account(m.network, account) + user = Nola.UserTrack.find_by_account(m.network, account) nick = if(user, do: user.nick, else: account.name) if duration do if duration > 90 do diff --git a/lib/plugins/alcoolog_announcer.ex b/lib/plugins/alcoolog_announcer.ex index 9f66799..937002e 100644 --- a/lib/plugins/alcoolog_announcer.ex +++ b/lib/plugins/alcoolog_announcer.ex @@ -236,7 +236,7 @@ defmodule Nola.Plugins.AlcoologAnnouncer do #IO.puts("#{acct}: #{message}") account = Nola.Account.get(acct) for {net, chan} <- Nola.Membership.notify_channels(account) do - user = IRC.UserTrack.find_by_account(net, account) + user = Nola.UserTrack.find_by_account(net, account) nick = if(user, do: user.nick, else: account.name) IRC.Connection.broadcast_message(net, chan, "#{nick}: #{message}") end diff --git a/lib/plugins/last_fm.ex b/lib/plugins/last_fm.ex index 68c55ee..8e872ea 100644 --- a/lib/plugins/last_fm.ex +++ b/lib/plugins/last_fm.ex @@ -108,7 +108,7 @@ defmodule Nola.Plugins.LastFm do track = fetch_track(username, map) text = format_now_playing(map, track) user = if account = Nola.Account.get(id_or_user) do - user = IRC.UserTrack.find_by_account(message.network, account) + user = Nola.UserTrack.find_by_account(message.network, account) if(user, do: user.nick, else: account.name) else username diff --git a/lib/plugins/preums.ex b/lib/plugins/preums.ex index c55248d..505ce7f 100644 --- a/lib/plugins/preums.ex +++ b/lib/plugins/preums.ex @@ -143,7 +143,7 @@ defmodule Nola.Plugins.Preums do {_, account_id, date, _perfect, text} = item h = "#{date.hour}:#{date.minute}:#{date.second}" account = Nola.Account.get(account_id) - user = IRC.UserTrack.find_by_account(m.network, account) + user = Nola.UserTrack.find_by_account(m.network, account) nick = if(user, do: user.nick, else: account.name) m.replyfun.("preums: #{nick} à #{h}: “#{text}”") end @@ -157,7 +157,7 @@ defmodule Nola.Plugins.Preums do top = topnicks(state.dets, channel, sort_by: :score) |> Enum.map(fn({account_id, {count, score}}) -> account = Nola.Account.get(account_id) - user = IRC.UserTrack.find_by_account(m.network, account) + user = Nola.UserTrack.find_by_account(m.network, account) nick = if(user, do: user.nick, else: account.name) "#{nick}: #{score} (#{count})" end) diff --git a/lib/plugins/tell.ex b/lib/plugins/tell.ex index 2f874d0..43da9e7 100644 --- a/lib/plugins/tell.ex +++ b/lib/plugins/tell.ex @@ -43,7 +43,7 @@ defmodule Nola.Plugins.Tell do if messages != [] do strs = Enum.map(messages, fn({_, from, message, at}) -> account = Nola.Account.get(from) - user = IRC.UserTrack.find_by_account(network, account) + user = Nola.UserTrack.find_by_account(network, account) fromnick = if user, do: user.nick, else: account.name "#{nick}: <#{fromnick}> #{message}" end) @@ -86,7 +86,7 @@ defmodule Nola.Plugins.Tell do with \ {:target, %Nola.Account{} = target} <- {:target, target}, {:same, false} <- {:same, target.id == m.account.id}, - target_user = IRC.UserTrack.find_by_account(m.network, target), + target_user = Nola.UserTrack.find_by_account(m.network, target), target_nick = if(target_user, do: target_user.nick, else: target.name), present? = if(target_user, do: Map.has_key?(target_user.last_active, m.channel)), {:absent, true, _} <- {:absent, !present?, target_nick}, diff --git a/lib/plugins/txt.ex b/lib/plugins/txt.ex index f33aab0..4f9a803 100644 --- a/lib/plugins/txt.ex +++ b/lib/plugins/txt.ex @@ -1,5 +1,5 @@ defmodule Nola.Plugins.Txt do - alias IRC.UserTrack + alias Nola.UserTrack require Logger @moduledoc """ @@ -538,7 +538,7 @@ defmodule Nola.Plugins.Txt do defp can_write?(state = %__MODULE__{rw: rw?, locks: locks}, msg = %{channel: channel, sender: sender}, trigger) do admin? = IRC.admin?(sender) - operator? = IRC.UserTrack.operator?(msg.network, channel, sender.nick) + operator? = Nola.UserTrack.operator?(msg.network, channel, sender.nick) locked? = case :dets.lookup(locks, trigger) do [{trigger}] -> true _ -> false |