user_track: fix find_by_account/2

1 files changed, 9 insertions, 6 deletions

diff --git a/lib/irc/user_track.ex b/lib/irc/user_track.ex
index 1b51266..3eeaec3 100644
--- a/lib/irc/user_track.ex
+++ b/lib/irc/user_track.ex
@@ -81,7 +81,9 @@ defmodule IRC.UserTrack do
           {:==, :"$2", {:const, id}}
        ], [:"$_"]}
     ]
-    for obj <- :ets.select(@ets, spec), do: User.from_tuple(obj)
+    results = :ets.select(@ets, spec)
+    |> Enum.filter(& &1)
+    for obj <- results, do: User.from_tuple(obj)
   end
 
   def find_by_account(network, nil) do
@@ -99,15 +101,16 @@ defmodule IRC.UserTrack do
     ]
     case :ets.select(@ets, spec) do
       results = [_r | _] ->
-        results
-        |> Enum.reject(fn({_, net, _, _, _, _, _, _, _, _, actives, opts}) -> net == "matrix" end)
-        |> Enum.reject(fn({_, net, _, _, _, _, _, _, _, _, actives, opts}) -> net == "telegram" end)
-        |> Enum.reject(fn({_, _, _, _, _, _, _, _, _, _, actives, opts}) -> Map.get(opts, :puppet) end)
+        result = results
+        |> Enum.reject(fn({_, net, _, _, _, _, _, _, _, _, actives, opts}) -> network != "matrix" && net == "matrix" end)
+        |> Enum.reject(fn({_, net, _, _, _, _, _, _, _, _, actives, opts}) -> network != "telegram" && net == "telegram" end)
+        |> Enum.reject(fn({_, _, _, _, _, _, _, _, _, _, actives, opts}) -> network not in ["matrix", "telegram"] && Map.get(opts, :puppet) end)
         |> Enum.sort_by(fn({_, _, _, _, _, _, _, _, _, _, actives, _}) ->
           Map.get(actives, nil)
         end, {:desc, NaiveDateTime})
         |> List.first
-        |> User.from_tuple()
+
+        if result, do: User.from_tuple(result)
       _ -> nil
     end
   end