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

add interactions, proper filtering to tag controller

Browse source
This commit is contained in:
byte[] 2019-11-27 19:24:09 -05:00
parent a489d00aed
commit 06c48f6916
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/philomena_web/controllers/tag_controller.ex
View file

@ -2,6 +2,7 @@ defmodule PhilomenaWeb.TagController do
use PhilomenaWeb, :controller use PhilomenaWeb, :controller
alias Philomena.{Images.Image, Tags, Tags.Tag} alias Philomena.{Images.Image, Tags, Tags.Tag}
alias Philomena.Interactions
import Ecto.Query import Ecto.Query
def index(conn, params) do def index(conn, params) do
@ -25,13 +26,14 @@ defmodule PhilomenaWeb.TagController do
tag = Tags.get_tag!(slug) tag = Tags.get_tag!(slug)
query = conn.assigns.compiled_filter query = conn.assigns.compiled_filter
user = conn.assigns.current_user
images = images =
Image.search_records( Image.search_records(
%{ %{
query: %{ query: %{
bool: %{ bool: %{
must_not: query, must_not: [query, %{term: %{hidden_from_users: true}}],
must: %{term: %{"namespaced_tags.name": tag.name}} must: %{term: %{"namespaced_tags.name": tag.name}}
} }
}, },
@ -41,6 +43,9 @@ defmodule PhilomenaWeb.TagController do
Image |> preload([:tags, :user]) Image |> preload([:tags, :user])
) )
render(conn, "show.html", tag: tag, images: images, layout_class: "layout--wide") interactions =
Interactions.user_interactions(images, user)
render(conn, "show.html", tag: tag, interactions: interactions, images: images, layout_class: "layout--wide")
end end
end end