PonyMirrors/philomena
1
0
Fork 0
mirror of https://github.com/philomena-dev/philomena.git synced 2024-11-27 13:47:58 +01:00
Code Issues Projects Releases Packages Wiki Activity

flesh out my:watched

Browse source
This commit is contained in:
Liam P. White 2019-08-27 21:20:12 -04:00
parent 287556cca7
commit 4b52640efc
2 changed files with 87 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

84
lib/philomena/images/query.ex
View file

@ -1,5 +1,7 @@
defmodule Philomena.Images.Query do
import Philomena.Search.Parser
import Philomena.Search.String
alias Philomena.Repo
defparser("anonymous",
int:
@ -43,9 +45,44 @@ defmodule Philomena.Images.Query do
%{user: %{id: id}}, "downvotes" ->
%{term: %{downvoter_ids: id}}
%{user: _u}, "watched" ->
# todo
%{query: %{match_all: %{}}}
%{watch: true}, "watched" ->
raise ArgumentError, "Recursive watchlists are not allowed."
%{user: user} = ctx, "watched" ->
ctx = Map.merge(ctx, %{watch: true})
tag_include = %{terms: %{tag_ids: user.watched_tag_ids}}
{:ok, include_query} =
Philomena.Images.Query.user_parser(ctx, user.watched_images_query |> normalize())
{:ok, exclude_query} =
Philomena.Images.Query.user_parser(
ctx,
user.watched_images_exclude_query |> normalize()
)
should = [tag_include, include_query]
must_not = [exclude_query]
must_not =
if user.no_spoilered_in_watched do
user = user |> Repo.preload(:current_filter)
tag_exclude = %{terms: %{tag_ids: user.current_filter.spoilered_tag_ids}}
{:ok, spoiler_query} =
Philomena.Images.Query.user_parser(
ctx,
user.current_filter.spoilered_complex_str |> normalize()
)
[tag_exclude, spoiler_query | must_not]
else
must_not
end
%{bool: %{should: should, must_not: must_not}}
end
},
aliases: %{
@ -80,9 +117,44 @@ defmodule Philomena.Images.Query do
%{user: %{id: id}}, "downvotes" ->
%{term: %{downvoter_ids: id}}
%{user: _u}, "watched" ->
# todo
%{query: %{match_all: %{}}}
%{watch: true}, "watched" ->
raise ArgumentError, "Recursive watchlists are not allowed."
%{user: user} = ctx, "watched" ->
ctx = Map.merge(ctx, %{watch: true})
tag_include = %{terms: %{tag_ids: user.watched_tag_ids}}
{:ok, include_query} =
Philomena.Images.Query.moderator_parser(ctx, user.watched_images_query |> normalize())
{:ok, exclude_query} =
Philomena.Images.Query.moderator_parser(
ctx,
user.watched_images_exclude_query |> normalize()
)
should = [tag_include, include_query]
must_not = [exclude_query]
must_not =
if user.no_spoilered_in_watched do
user = user |> Repo.preload(:current_filter)
tag_exclude = %{terms: %{tag_ids: user.current_filter.spoilered_tag_ids}}
{:ok, spoiler_query} =
Philomena.Images.Query.moderator_parser(
ctx,
user.current_filter.spoilered_complex_str |> normalize()
)
[tag_exclude, spoiler_query | must_not]
else
must_not
end
%{bool: %{should: should, must_not: must_not}}
end
},
aliases: %{

9
lib/philomena/search/string.ex Normal file
View file

@ -0,0 +1,9 @@
defmodule Philomena.Search.String do
def normalize(str) do
str
|> String.replace("\r", "")
|> String.split("\n")
|> Enum.map(fn s -> "(#{s})" end)
|> Enum.join(" || ")
end
end