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

API additions for user interactions on single images (#63)

Browse source 
* API additions for user interactions on single images

* removed ability to render without supplying interactions
This commit is contained in:
SomewhatDamaged 2020-03-30 11:51:35 +11:00 committed by GitHub
parent b1de5389eb
commit 196c5e14b6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/philomena_web/controllers/api/json/image/featured_controller.ex
View file

@ -3,10 +3,13 @@ defmodule PhilomenaWeb.Api.Json.Image.FeaturedController do
alias Philomena.ImageFeatures.ImageFeature alias Philomena.ImageFeatures.ImageFeature
alias Philomena.Images.Image alias Philomena.Images.Image
alias Philomena.Interactions
alias Philomena.Repo alias Philomena.Repo
import Ecto.Query import Ecto.Query
def show(conn, _params) do def show(conn, _params) do
user = conn.assigns.current_user
featured_image = featured_image =
Image Image
|> join(:inner, [i], f in ImageFeature, on: [image_id: i.id]) |> join(:inner, [i], f in ImageFeature, on: [image_id: i.id])
@ -22,9 +25,11 @@ defmodule PhilomenaWeb.Api.Json.Image.FeaturedController do
|> text("") |> text("")
_ -> _ ->
interactions = Interactions.user_interactions([featured_image], user)
conn conn
|> put_view(PhilomenaWeb.Api.Json.ImageView) |> put_view(PhilomenaWeb.Api.Json.ImageView)
|> render("show.json", image: featured_image) |> render("show.json", image: featured_image, interactions: interactions)
end end
end end
end end

7
lib/philomena_web/controllers/api/json/image_controller.ex
View file

@ -2,10 +2,13 @@ defmodule PhilomenaWeb.Api.Json.ImageController do
use PhilomenaWeb, :controller use PhilomenaWeb, :controller
alias Philomena.Images.Image alias Philomena.Images.Image
alias Philomena.Interactions
alias Philomena.Repo alias Philomena.Repo
import Ecto.Query import Ecto.Query
def show(conn, %{"id" => id}) do def show(conn, %{"id" => id}) do
user = conn.assigns.current_user
image = image =
Image Image
|> where(id: ^id) |> where(id: ^id)
@ -19,7 +22,9 @@ defmodule PhilomenaWeb.Api.Json.ImageController do
|> text("") |> text("")
_ -> _ ->
render(conn, "show.json", image: image) interactions = Interactions.user_interactions([image], user)
render(conn, "show.json", image: image, interactions: interactions)
end end
end end
end end

11
lib/philomena_web/views/api/json/image_view.ex
View file

@ -10,11 +10,16 @@ defmodule PhilomenaWeb.Api.Json.ImageView do
} }
end end
def render("show.json", %{image: image} = assigns) do def render("show.json", %{image: image, interactions: interactions} = assigns) do
%{image: render_one(image, PhilomenaWeb.Api.Json.ImageView, "image.json", assigns)} %{
image: render_one(image, PhilomenaWeb.Api.Json.ImageView, "image.json", assigns),
interactions: interactions
}
end end
def render("image.json", %{image: %{hidden_from_users: true, duplicate_id: duplicate_id} = image}) def render("image.json", %{
image: %{hidden_from_users: true, duplicate_id: duplicate_id} = image
})
when not is_nil(duplicate_id) do when not is_nil(duplicate_id) do
%{ %{
id: image.id, id: image.id,