Rename IRC.Account to Nola.Account, refs T77

9 files changed, 47 insertions, 47 deletions

diff --git a/lib/plugins/account.ex b/lib/plugins/account.ex
index 245710a..747fbc7 100644
--- a/lib/plugins/account.ex
+++ b/lib/plugins/account.ex
@@ -40,7 +40,7 @@ defmodule Nola.Plugins.Account do
 
     def handle_info({:irc, :text, m = %IRC.Message{account: account, text: "auth"}}, state) do
       spec = [{{:"$1", :"$2"}, [{:==, :"$2", {:const, account.id}}], [:"$1"]}]
-      predicates = :dets.select(IRC.Account.file("predicates"), spec)
+      predicates = :dets.select(Nola.Account.file("predicates"), spec)
       text = for {net, {key, value}} <- predicates, do: "#{net}: #{to_string(key)}: #{value}"
       m.replyfun.(text)
       {:noreply, state}
@@ -57,7 +57,7 @@ defmodule Nola.Plugins.Account do
     end
 
     def handle_info({:irc, :text, m = %IRC.Message{account: account, text: "account"}}, state) do
-      account = IRC.Account.lookup(m.sender)
+      account = Nola.Account.lookup(m.sender)
       text = ["Account Id: #{account.id}",
         "Authenticate to this account from another network: \"auth #{account.id} #{account.token}\" to the other bot!"]
       m.replyfun.(text)
@@ -65,7 +65,7 @@ defmodule Nola.Plugins.Account do
     end
 
     def handle_info({:irc, :text, m = %IRC.Message{sender: sender, text: "auth"<>_}}, state) do
-      #account = IRC.Account.lookup(m.sender)
+      #account = Nola.Account.lookup(m.sender)
       case String.split(m.text, " ") do
         ["auth", id, token] ->
           join_account(m, id, token)
@@ -76,14 +76,14 @@ defmodule Nola.Plugins.Account do
     end
 
     def handle_info({:irc, :text, m = %IRC.Message{account: account, text: "set-name "<>name}}, state) do
-      IRC.Account.update_account_name(account, name)
+      Nola.Account.update_account_name(account, name)
       m.replyfun.("Name changed: #{name}")
       {:noreply, state}
     end
 
     def handle_info({:irc, :text, m = %IRC.Message{text: "disable-sms"}}, state) do
-      if IRC.Account.get_meta(m.account, "sms-number") do
-        IRC.Account.delete_meta(m.account, "sms-number")
+      if Nola.Account.get_meta(m.account, "sms-number") do
+        Nola.Account.delete_meta(m.account, "sms-number")
         m.replfyun.("SMS disabled.")
       else
         m.replyfun.("SMS already disabled.")
@@ -100,8 +100,8 @@ defmodule Nola.Plugins.Account do
 
     def handle_info({:irc, :text, m = %IRC.Message{text: "enable-sms"}}, state) do
       code = String.downcase(EntropyString.small_id())
-      IRC.Account.put_meta(m.account, "sms-validation-code", code)
-      IRC.Account.put_meta(m.account, "sms-validation-target", m.network)
+      Nola.Account.put_meta(m.account, "sms-validation-code", code)
+      Nola.Account.put_meta(m.account, "sms-validation-target", m.network)
       number = Nola.IRC.Sms.my_number()
       text = "To enable or change your number for SMS messaging, please send:"
              <> " \"enable #{code}\" to #{number}"
@@ -111,9 +111,9 @@ defmodule Nola.Plugins.Account do
 
     def handle_info({:irc, :text, m = %IRC.Message{text: "enable-telegram"}}, state) do
       code = String.downcase(EntropyString.small_id())
-      IRC.Account.delete_meta(m.account, "telegram-id")
-      IRC.Account.put_meta(m.account, "telegram-validation-code", code)
-      IRC.Account.put_meta(m.account, "telegram-validation-target", m.network)
+      Nola.Account.delete_meta(m.account, "telegram-id")
+      Nola.Account.put_meta(m.account, "telegram-validation-code", code)
+      Nola.Account.put_meta(m.account, "telegram-validation-target", m.network)
       text = "To enable or change your number for telegram messaging, please open #{Nola.Telegram.my_path()} and send:"
              <> " \"/enable #{code}\""
       m.replyfun.(text)
@@ -130,14 +130,14 @@ defmodule Nola.Plugins.Account do
     def handle_info({:irc, :text, m = %IRC.Message{text: "getmeta"<>_}}, state) do
       result = case String.split(m.text, " ") do
         ["getmeta"] ->
-          for {k, v} <- IRC.Account.get_all_meta(m.account) do
+          for {k, v} <- Nola.Account.get_all_meta(m.account) do
             case k do
               "u:"<>key -> "(user) #{key}: #{v}"
               key -> "#{key}: #{v}"
             end
           end
         ["getmeta", key] ->
-          value = IRC.Account.get_meta(m.account, key)
+          value = Nola.Account.get_meta(m.account, key)
           text = if value do
             "#{key}: #{value}"
           else
@@ -153,7 +153,7 @@ defmodule Nola.Plugins.Account do
     def handle_info({:irc, :text, m = %IRC.Message{text: "setusermeta"<>_}}, state) do
       result = case String.split(m.text, " ") do
         ["setusermeta", key, value] ->
-          IRC.Account.put_user_meta(m.account, key, value)
+          Nola.Account.put_user_meta(m.account, key, value)
           "ok"
         _ ->
           "usage: setusermeta <key> <value>"
@@ -167,10 +167,10 @@ defmodule Nola.Plugins.Account do
     end
 
     defp join_account(m, id, token) do
-      old_account = IRC.Account.lookup(m.sender)
-      new_account = IRC.Account.get(id)
+      old_account = Nola.Account.lookup(m.sender)
+      new_account = Nola.Account.get(id)
       if new_account && token == new_account.token do
-        case IRC.Account.merge_account(old_account.id, new_account.id) do
+        case Nola.Account.merge_account(old_account.id, new_account.id) do
           :ok ->
             if old_account.id == new_account.id do
               m.replyfun.("Already authenticated, but hello")
diff --git a/lib/plugins/alcoolog.ex b/lib/plugins/alcoolog.ex
index 8ef83fa..9958889 100644
--- a/lib/plugins/alcoolog.ex
+++ b/lib/plugins/alcoolog.ex
@@ -467,7 +467,7 @@ defmodule Nola.Plugins.Alcoolog do
   end
 
   def get_all_stats() do
-    IRC.Account.all_accounts()
+    Nola.Account.all_accounts()
     |> Enum.map(fn(account) -> {account.id, get_full_statistics(account.id)} end)
     |> Enum.filter(fn({_nick, status}) -> status && (status.active > 0 || status.active30m > 0) end)
     |> Enum.sort_by(fn({_, status}) -> status.active end, &>/2)
@@ -489,7 +489,7 @@ defmodule Nola.Plugins.Alcoolog do
     |> Enum.sort_by(fn({_, status}) -> status.active end, &>/2)
   end
 
-  @spec since() :: %{IRC.Account.id() => DateTime.t()}
+  @spec since() :: %{Nola.Account.id() => DateTime.t()}
   @doc "Returns the last time the user was at 0 g/l"
   def since() do
     :ets.foldr(fn({{acct, timestamp_or_date}, _vol, current, _cl, _deg, _name, _comment, _m}, acc) ->
@@ -612,7 +612,7 @@ defmodule Nola.Plugins.Alcoolog do
 
   def handle_info({:irc, :trigger, "sobre", m = %IRC.Message{trigger: %IRC.Trigger{args: args, type: :bang}}}, state) do
     account = case args do
-      [nick] -> IRC.Account.find_always_by_nick(m.network, m.channel, nick)
+      [nick] -> Nola.Account.find_always_by_nick(m.network, m.channel, nick)
       [] -> m.account
     end
 
@@ -784,7 +784,7 @@ defmodule Nola.Plugins.Alcoolog do
     end)
     |> Enum.sort_by(fn({_nick, count}) -> count end, &>/2)
     |> Enum.map(fn({nick, count}) ->
-      account = IRC.Account.get(nick)
+      account = Nola.Account.get(nick)
       user = IRC.UserTrack.find_by_account(m.network, account)
       nick = if(user, do: user.nick, else: account.name)
       "#{nick}: #{Float.round(count, 4)}"
@@ -864,7 +864,7 @@ defmodule Nola.Plugins.Alcoolog do
 
   def handle_info({:irc, :trigger, "alcoolisme", m = %IRC.Message{trigger: %IRC.Trigger{args: args, type: :bang}}}, state) do
     {account, duration} = case args do
-      [nick | rest] -> {IRC.Account.find_always_by_nick(m.network, m.channel, nick), rest}
+      [nick | rest] -> {Nola.Account.find_always_by_nick(m.network, m.channel, nick), rest}
       [] -> {m.account, []}
     end
     if account do
diff --git a/lib/plugins/alcoolog_announcer.ex b/lib/plugins/alcoolog_announcer.ex
index 167fc01..2baa999 100644
--- a/lib/plugins/alcoolog_announcer.ex
+++ b/lib/plugins/alcoolog_announcer.ex
@@ -234,7 +234,7 @@ defmodule Nola.Plugins.AlcoologAnnouncer do
       end
       if message do
         #IO.puts("#{acct}: #{message}")
-        account = IRC.Account.get(acct)
+        account = Nola.Account.get(acct)
         for {net, chan} <- IRC.Membership.notify_channels(account) do
           user = IRC.UserTrack.find_by_account(net, account)
           nick = if(user, do: user.nick, else: account.name)
diff --git a/lib/plugins/last_fm.ex b/lib/plugins/last_fm.ex
index ae4b1ee..4607cbe 100644
--- a/lib/plugins/last_fm.ex
+++ b/lib/plugins/last_fm.ex
@@ -90,7 +90,7 @@ defmodule Nola.Plugins.LastFm do
   defp irc_now_playing(nick_or_user, message, state) do
     nick_or_user = String.strip(nick_or_user)
 
-    id_or_user = if account = IRC.Account.get(nick_or_user) || IRC.Account.find_always_by_nick(message.network, message.channel, nick_or_user) do
+    id_or_user = if account = Nola.Account.get(nick_or_user) || Nola.Account.find_always_by_nick(message.network, message.channel, nick_or_user) do
       account.id
     else
       nick_or_user
@@ -107,7 +107,7 @@ defmodule Nola.Plugins.LastFm do
       {:ok, map} when is_map(map) ->
         track = fetch_track(username, map)
         text = format_now_playing(map, track)
-        user = if account = IRC.Account.get(id_or_user) do
+        user = if account = Nola.Account.get(id_or_user) do
           user = IRC.UserTrack.find_by_account(message.network, account)
           if(user, do: user.nick, else: account.name)
         else
diff --git a/lib/plugins/preums.ex b/lib/plugins/preums.ex
index f7738ad..c55248d 100644
--- a/lib/plugins/preums.ex
+++ b/lib/plugins/preums.ex
@@ -95,10 +95,10 @@ defmodule Nola.Plugins.Preums do
       case key do
         {{net, {bork,chan}}, date} ->
           :dets.delete(table, key)
-          nick = if IRC.Account.get(nick) do
+          nick = if Nola.Account.get(nick) do
             nick
           else
-            if acct = IRC.Account.find_always_by_nick(net, nil, nick) do
+            if acct = Nola.Account.find_always_by_nick(net, nil, nick) do
               acct.id
             else
               nick
@@ -108,8 +108,8 @@ defmodule Nola.Plugins.Preums do
         {{_net, nil}, _} ->
           :dets.delete(table, key)
         {{net, chan}, date} ->
-          if !IRC.Account.get(nick) do
-            if acct = IRC.Account.find_always_by_nick(net, chan, nick) do
+          if !Nola.Account.get(nick) do
+            if acct = Nola.Account.find_always_by_nick(net, chan, nick) do
               :dets.delete(table, key)
               :dets.insert(table, { { {net,chan}, date }, acct.id, now, perfect, text})
             end
@@ -142,7 +142,7 @@ defmodule Nola.Plugins.Preums do
     if item do
       {_, account_id, date, _perfect, text} = item
       h = "#{date.hour}:#{date.minute}:#{date.second}"
-      account = IRC.Account.get(account_id)
+      account = Nola.Account.get(account_id)
       user = IRC.UserTrack.find_by_account(m.network, account)
       nick = if(user, do: user.nick, else: account.name)
       m.replyfun.("preums: #{nick} à #{h}: “#{text}”")
@@ -156,7 +156,7 @@ defmodule Nola.Plugins.Preums do
     state = handle_preums(m, state)
     top = topnicks(state.dets, channel, sort_by: :score)
           |> Enum.map(fn({account_id, {count, score}}) ->
-            account = IRC.Account.get(account_id)
+            account = Nola.Account.get(account_id)
             user = IRC.UserTrack.find_by_account(m.network, account)
             nick = if(user, do: user.nick, else: account.name)
             "#{nick}: #{score} (#{count})"
diff --git a/lib/plugins/quatre_cent_vingt.ex b/lib/plugins/quatre_cent_vingt.ex
index 59b2dea..254f5ce 100644
--- a/lib/plugins/quatre_cent_vingt.ex
+++ b/lib/plugins/quatre_cent_vingt.ex
@@ -65,7 +65,7 @@ defmodule Nola.Plugins.QuatreCentVingt do
   end
 
   def handle_info({:irc, :trigger, "420", m = %IRC.Message{trigger: %IRC.Trigger{args: [nick], type: :bang}}}, dets) do
-    account = IRC.Account.find_by_nick(m.network, nick)
+    account = Nola.Account.find_by_nick(m.network, nick)
     if account do
       text = case get_statistics_for_nick(dets, m.account.id) do
         {0, _} -> "#{nick} n'a jamais !420 ... honte à lui."
diff --git a/lib/plugins/sms.ex b/lib/plugins/sms.ex
index bc666b2..afc1eb1 100644
--- a/lib/plugins/sms.ex
+++ b/lib/plugins/sms.ex
@@ -10,20 +10,20 @@ defmodule Nola.Plugins.Sms do
 
   def incoming(from, "enable "<>key) do
     key = String.trim(key)
-    account = IRC.Account.find_meta_account("sms-validation-code", String.downcase(key))
+    account = Nola.Account.find_meta_account("sms-validation-code", String.downcase(key))
     if account do
-      net = IRC.Account.get_meta(account, "sms-validation-target")
-      IRC.Account.put_meta(account, "sms-number", from)
-      IRC.Account.delete_meta(account, "sms-validation-code")
-      IRC.Account.delete_meta(account, "sms-validation-number")
-      IRC.Account.delete_meta(account, "sms-validation-target")
+      net = Nola.Account.get_meta(account, "sms-validation-target")
+      Nola.Account.put_meta(account, "sms-number", from)
+      Nola.Account.delete_meta(account, "sms-validation-code")
+      Nola.Account.delete_meta(account, "sms-validation-number")
+      Nola.Account.delete_meta(account, "sms-validation-target")
       IRC.Connection.broadcast_message(net, account, "SMS Number #{from} added!")
       send_sms(from, "Yay! Number linked to account #{account.name}")
     end
   end
 
   def incoming(from, message) do
-    account = IRC.Account.find_meta_account("sms-number", from)
+    account = Nola.Account.find_meta_account("sms-number", from)
     if account do
       reply_fun = fn(text) ->
         send_sms(from, text)
@@ -98,8 +98,8 @@ defmodule Nola.Plugins.Sms do
   def handle_info({:irc, :trigger, "sms", m = %IRC.Message{trigger: %IRC.Trigger{type: :bang, args: [nick | text]}}}, state) do
     with \
         {:tree, false} <- {:tree, m.sender.nick == "Tree"},
-        {_, %IRC.Account{} = account} <- {:account, IRC.Account.find_always_by_nick(m.network, m.channel, nick)},
-        {_, number} when not is_nil(number) <- {:number, IRC.Account.get_meta(account, "sms-number")}
+        {_, %Nola.Account{} = account} <- {:account, Nola.Account.find_always_by_nick(m.network, m.channel, nick)},
+        {_, number} when not is_nil(number) <- {:number, Nola.Account.get_meta(account, "sms-number")}
     do
       text = Enum.join(text, " ")
       sender = if m.channel do
diff --git a/lib/plugins/tell.ex b/lib/plugins/tell.ex
index 34e9f94..2f874d0 100644
--- a/lib/plugins/tell.ex
+++ b/lib/plugins/tell.ex
@@ -42,7 +42,7 @@ defmodule Nola.Plugins.Tell do
     messages = :dets.lookup(state.dets, {network, channel, account_id})
     if messages != [] do
       strs = Enum.map(messages, fn({_, from, message, at}) ->
-        account = IRC.Account.get(from)
+        account = Nola.Account.get(from)
         user = IRC.UserTrack.find_by_account(network, account)
         fromnick = if user, do: user.nick, else: account.name
         "#{nick}: <#{fromnick}> #{message}"
@@ -81,10 +81,10 @@ defmodule Nola.Plugins.Tell do
   end
 
   defp do_tell(state, m, nick_target, message) do
-    target = IRC.Account.find_always_by_nick(m.network, m.channel, nick_target)
+    target = Nola.Account.find_always_by_nick(m.network, m.channel, nick_target)
     message = Enum.join(message, " ")
     with \
-         {:target, %IRC.Account{} = target} <- {:target, target},
+         {: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_nick = if(target_user, do: target_user.nick, else: target.name),
diff --git a/lib/plugins/user_mention.ex b/lib/plugins/user_mention.ex
index a9a2d24..f26f1d6 100644
--- a/lib/plugins/user_mention.ex
+++ b/lib/plugins/user_mention.ex
@@ -23,10 +23,10 @@ defmodule Nola.Plugins.UserMention do
     nick = nick
     |> String.trim(":")
     |> String.trim(",")
-    target = IRC.Account.find_always_by_nick(network, channel, nick)
+    target = Nola.Account.find_always_by_nick(network, channel, nick)
     if target do
-      telegram = IRC.Account.get_meta(target, "telegram-id")
-      sms = IRC.Account.get_meta(target, "sms-number")
+      telegram = Nola.Account.get_meta(target, "telegram-id")
+      sms = Nola.Account.get_meta(target, "sms-number")
       text = "#{channel} <#{sender.nick}> #{Enum.join(content, " ")}"
 
       cond do