diff --git a/lib/philomena_web/controllers/api/json/image_controller.ex b/lib/philomena_web/controllers/api/json/image_controller.ex index c68c72e2..f07d773e 100644 --- a/lib/philomena_web/controllers/api/json/image_controller.ex +++ b/lib/philomena_web/controllers/api/json/image_controller.ex @@ -4,9 +4,9 @@ defmodule PhilomenaWeb.Api.Json.ImageController do alias PhilomenaWeb.ImageJson alias Philomena.Images.Image - plug :load_and_authorize_resource, model: Image, only: [:show], preload: [:tags, :user] + plug :load_and_authorize_resource, model: Image, only: [:show], preload: [:tags, :user, :intensity] def show(conn, _params) do json(conn, %{image: ImageJson.as_json(conn, conn.assigns.image)}) end -end \ No newline at end of file +end diff --git a/lib/philomena_web/controllers/api/json/search/image_controller.ex b/lib/philomena_web/controllers/api/json/search/image_controller.ex index 7d0f7d2c..0fafc7b4 100644 --- a/lib/philomena_web/controllers/api/json/search/image_controller.ex +++ b/lib/philomena_web/controllers/api/json/search/image_controller.ex @@ -9,7 +9,7 @@ defmodule PhilomenaWeb.Api.Json.Search.ImageController do import Ecto.Query def index(conn, params) do - queryable = Image |> preload([:tags, :user]) + queryable = Image |> preload([:tags, :user, :intensity]) user = conn.assigns.current_user sort = ImageSorter.parse_sort(params) @@ -31,4 +31,4 @@ defmodule PhilomenaWeb.Api.Json.Search.ImageController do |> json(%{error: msg}) end end -end \ No newline at end of file +end diff --git a/lib/philomena_web/image_json.ex b/lib/philomena_web/image_json.ex index 15078aa8..82971fee 100644 --- a/lib/philomena_web/image_json.ex +++ b/lib/philomena_web/image_json.ex @@ -20,6 +20,7 @@ defmodule PhilomenaWeb.ImageJson do uploader: if(!!image.user and !image.anonymous, do: image.user.name), uploader_id: if(!!image.user and !image.anonymous, do: image.user.id), wilson_score: Philomena.Images.ElasticsearchIndex.wilson_score(image), + intensities: intensities(image), score: image.score, upvotes: image.upvotes_count, downvotes: image.downvotes_count, @@ -35,4 +36,7 @@ defmodule PhilomenaWeb.ImageJson do processed: image.processed } end + + defp intensities(%{intensity: %{nw: nw, ne: ne, sw: sw, se: se}}), do: %{nw: nw, ne: ne, sw: sw, se: se} + defp intensities(_), do: nil end diff --git a/lib/philomena_web/image_reverse.ex b/lib/philomena_web/image_reverse.ex index 7b0f28a1..039eefcc 100644 --- a/lib/philomena_web/image_reverse.ex +++ b/lib/philomena_web/image_reverse.ex @@ -20,7 +20,7 @@ defmodule PhilomenaWeb.ImageReverse do dist = normalize_dist(image_params) DuplicateReports.duplicates_of(intensities, aspect, dist, dist) - |> preload([:tags, :user]) + |> preload([:tags, :user, :intensity]) |> Repo.all() end end @@ -45,4 +45,4 @@ defmodule PhilomenaWeb.ImageReverse do |> min(1.0) end defp normalize_dist(_dist), do: 0.25 -end \ No newline at end of file +end