PonyMirrors/philomena
1
0
Fork 0
mirror of https://github.com/philomena-dev/philomena.git synced 2025-02-01 03:46:44 +01:00
Code Issues Projects Releases Packages Wiki Activity

normalize search string in filter compilation

Browse source
This commit is contained in:
byte[] 2019-11-14 22:15:25 -05:00
parent ae489ef6ea
commit 4915fb5044
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/philomena_web/plugs/image_filter.ex
View file

@ -1,5 +1,6 @@
defmodule PhilomenaWeb.Plugs.ImageFilter do defmodule PhilomenaWeb.Plugs.ImageFilter do
import Plug.Conn import Plug.Conn
import Search.String
alias Philomena.Images.Query alias Philomena.Images.Query
alias Pow.Plug alias Pow.Plug
@ -13,7 +14,7 @@ defmodule PhilomenaWeb.Plugs.ImageFilter do
filter = conn.assigns[:current_filter] filter = conn.assigns[:current_filter]
tag_exclusion = %{terms: %{tag_ids: filter.hidden_tag_ids}} tag_exclusion = %{terms: %{tag_ids: filter.hidden_tag_ids}}
{:ok, query_exclusion} = Query.compile(user, filter.hidden_complex_str) {:ok, query_exclusion} = Query.compile(user, normalize(filter.hidden_complex_str))
query = %{ query = %{
bool: %{ bool: %{

4
lib/search/string.ex
View file

@ -1,4 +1,8 @@
defmodule Search.String do defmodule Search.String do
def normalize(nil) do
""
end
def normalize(str) do def normalize(str) do
str str
|> String.replace("\r", "") |> String.replace("\r", "")