1 files changed, 44 insertions, 12 deletions
diff --git a/lib/lsg_web/controllers/alcoolog_controller.ex b/lib/lsg_web/controllers/alcoolog_controller.ex
index 9d5d9d9..b88faa3 100644
--- a/lib/lsg_web/controllers/alcoolog_controller.ex
+++ b/lib/lsg_web/controllers/alcoolog_controller.ex
@@ -2,9 +2,12 @@ defmodule LSGWeb.AlcoologController do
   use LSGWeb, :controller
   require Logger
 
-  def index(conn, %{"channel" => channel}) do
-    case LSG.Token.lookup(channel) do
-      {:ok, obj} -> index(conn, obj)
+  plug LSGWeb.ContextPlug when action not in [:token]
+  plug LSGWeb.ContextPlug, [restrict: :public] when action in [:token]
+
+  def token(conn, %{"token" => token}) do
+    case LSG.Token.lookup(token) do
+      {:ok, {:alcoolog, :index, network, channel}} -> index(conn, nil, network, channel)
       err ->
         Logger.debug("AlcoologControler: token #{inspect err} invalid")
         conn
@@ -13,8 +16,31 @@ defmodule LSGWeb.AlcoologController do
     end
   end
 
-  def index(conn, {:alcoolog, :index, channel}) do
-    aday = 7*((24 * 60)*60)
+  def index(conn = %{assigns: %{account: account}}, %{"network" => network, "chan" => channel}) do
+    index(conn, account, network, LSGWeb.reformat_chan(channel))
+  end
+
+  def index(conn = %{assigns: %{account: account}}, _) do
+    index(conn, account, nil, nil)
+  end
+
+  #def index(conn, params) do
+  #  network = Map.get(params, "network")
+  #  chan = if c = Map.get(params, "chan") do
+  #    LSGWeb.reformat_chan(c)
+  #  end
+  #  irc_conn = if network do
+  #    IRC.Connection.get_network(network, chan)
+  #  end
+  #  bot = if(irc_conn, do: irc_conn.nick)#
+  #
+  #  conn
+  #  |> put_status(403)
+  #  |> render("auth.html", network: network, channel: chan, irc_conn: conn, bot: bot)
+  #end
+
+  def index(conn, account, network, channel) do
+    aday = 18*((24 * 60)*60)
     now = DateTime.utc_now()
     before = now
              |> DateTime.add(-aday, :second)
@@ -27,22 +53,28 @@ defmodule LSGWeb.AlcoologController do
    ], [:"$_"]}
     ]
 
-    nicks_in_channel = IRC.UserTrack.channel(channel)
-                       |> Enum.map(fn({_, nick, _, _, _, _, _}) -> String.downcase(nick) end)
   # tuple ets:  {{nick, date}, volumes, current, nom, commentaire}
+    members = IRC.Membership.expanded_members_or_friends(account, network, channel)
+    members_ids = Enum.map(members, fn({account, _, nick}) -> account.id end)
+    member_names = Enum.reduce(members, %{}, fn({account, _, nick}, acc) -> Map.put(acc, account.id, nick) end)
     drinks = :ets.select(LSG.IRC.AlcoologPlugin.ETS, match)
-    #|> Enum.filter(fn({{nick, _}, _, _, _, _}) -> Enum.member?(nicks_in_channel, nick) end)
-             |> Enum.sort_by(fn({{_, ts}, _, _, _, _}) -> ts end, &>/2)
+             |> Enum.filter(fn({{account, _}, _, _, _, _}) -> Enum.member?(members_ids, account) end)
+             |> Enum.map(fn({{account, _}, _, _, _, _} = object) -> {object, Map.get(member_names, account)} end)
+    |> Enum.sort_by(fn({{{_, ts}, _, _, _, _}, _}) -> ts end, &>/2)
 
-    stats = LSG.IRC.AlcoologPlugin.get_channel_statistics(channel)
+    stats = LSG.IRC.AlcoologPlugin.get_channel_statistics(account, network, channel)
 
-    top = Enum.reduce(drinks, %{}, fn({{nick, _}, vol, _, _, _}, acc) ->
+    top = Enum.reduce(drinks, %{}, fn({{{account_id, _}, vol, _, _, _}, _}, acc) ->
+      nick = Map.get(member_names, account_id)
       all = Map.get(acc, nick, 0)
       Map.put(acc, nick, all + vol)
     end)
     |> Enum.sort_by(fn({_nick, count}) -> count end, &>/2)
     # {date, single_peak}
-    render(conn, "index.html", channel: channel, drinks: drinks, top: top, stats: stats)
+    #
+    conn
+    |> assign(:title, "alcoolog")
+    |> render("index.html", network: network, channel: channel, drinks: drinks, top: top, stats: stats)
   end
 
 end