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

*D (only deleted, no merges) search opt

Browse source
This commit is contained in:
Luna D 2019-12-19 17:39:34 -05:00
parent ae476b45d8
commit 45e3d2801d
No known key found for this signature in database
GPG key ID: D0F46C94720BAA4B
5 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/philomena/images/elasticsearch.ex
View file

@ -24,6 +24,7 @@ defmodule Philomena.Images.Elasticsearch do
downvoter_ids: %{type: "keyword"}, downvoter_ids: %{type: "keyword"},
downvoters: %{type: "keyword"}, downvoters: %{type: "keyword"},
downvotes: %{type: "integer"}, downvotes: %{type: "integer"},
duplicate_id: %{type: "integer"},
faves: %{type: "integer"}, faves: %{type: "integer"},
favourited_by_user_ids: %{type: "keyword"}, favourited_by_user_ids: %{type: "keyword"},
favourited_by_users: %{type: "keyword"}, favourited_by_users: %{type: "keyword"},
@ -118,6 +119,7 @@ defmodule Philomena.Images.Elasticsearch do
upvoter_ids: image.upvoters |> Enum.map(& &1.id), upvoter_ids: image.upvoters |> Enum.map(& &1.id),
downvoter_ids: image.downvoters |> Enum.map(& &1.id), downvoter_ids: image.downvoters |> Enum.map(& &1.id),
deleted_by_user_id: image.deleter_id, deleted_by_user_id: image.deleter_id,
duplicate_id: image.duplicate_id,
galleries: galleries:
image.gallery_interactions |> Enum.map(&%{id: &1.gallery_id, position: &1.position}), image.gallery_interactions |> Enum.map(&%{id: &1.gallery_id, position: &1.position}),
namespaced_tags: %{ namespaced_tags: %{

3
lib/philomena_web/image_loader.ex
View file

@ -73,6 +73,9 @@ defmodule PhilomenaWeb.ImageLoader do
defp maybe_show_deleted(filters, true, "only"), defp maybe_show_deleted(filters, true, "only"),
do: [%{term: %{hidden_from_users: false}} | filters] do: [%{term: %{hidden_from_users: false}} | filters]
defp maybe_show_deleted(filters, true, "deleted"),
do: [%{term: %{hidden_from_users: false}}, %{exists: %{field: :duplicate_id}} | filters]
defp maybe_show_deleted(filters, true, _param), defp maybe_show_deleted(filters, true, _param),
do: [%{term: %{hidden_from_users: true}} | filters] do: [%{term: %{hidden_from_users: true}} | filters]

6
lib/philomena_web/templates/image/_deleted_toggle.html.slime
View file

@ -23,3 +23,9 @@
i.fa.fa-minus i.fa.fa-minus
i.fa.fa-exclamation> i.fa.fa-exclamation>
span.hide-mobile.hide-limited-desktop Hide Deleted span.hide-mobile.hide-limited-desktop Hide Deleted
= if del != "deleted" do
a href=@route.(Keyword.put(@params, :del, "deleted")) title="Only Deleted (Strict)"
i.fa.fa-minus
i.fa.fa-object-group>
span.hide-mobile.hide-limited-desktop Exclude Merges

2
lib/philomena_web/templates/layout/_header.html.slime
View file

@ -20,7 +20,7 @@ header.header
input type="hidden" name="sd" value=@conn.params["sd"] input type="hidden" name="sd" value=@conn.params["sd"]
= if hides_images?(@conn) do = if hides_images?(@conn) do
= select f, :del, [{"-D", ""}, {"+D", 1}, {"DO", "only"}], name: "del", class: "input header__input", autocomplete: "off" = select f, :del, [{"-D", ""}, {"+D", 1}, {"*D", "deleted"}, {"DO", "only"}], name: "del", class: "input header__input", autocomplete: "off"
button.header__search__button type="submit" title="Search" button.header__search__button type="submit" title="Search"
i.fa-embedded--search i.fa-embedded--search