Fix filter_by_prefix malformed case

The filter must have the prefix presence, not the other way around
edgurgel · Feb 22, 2015 · a20520b · a20520b
1 parent f16684b
commit a20520b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/lib/poxa/channel.ex b/lib/poxa/channel.ex
@@ -48,9 +48,12 @@ defmodule Poxa.Channel do
   false
   iex> Poxa.Channel.matches?("foo-bar", "")
   false
+  iex> Poxa.Channel.matches?("foo-bar", nil)
+  false
   iex> Poxa.Channel.matches?("foo-bar", "foo-bartman")
   false
   """
+  def matches?(_, nil), do: false
   def matches?(_, ""), do: false
   def matches?(channel, prefix) do
     base = byte_size(prefix)

diff --git a/lib/poxa/channels_handler.ex b/lib/poxa/channels_handler.ex
@@ -43,7 +43,7 @@ defmodule Poxa.ChannelsHandler do
   defp malformed_request_all_channels?(attributes, filter) do
     if Enum.all?(attributes, fn s -> Enum.member?(@valid_attributes, s) end) do
       if Enum.member?(attributes, "user_count") do
-        filter == nil or !Channel.matches?("presence-", filter)
+        !Channel.matches?(filter, "presence-")
       else
         false
       end