pleroma

commit: e838969495d2ca95406920ceef98d08f01d71192
parent: 65e8d47cfb74e76bf966a0340fd5ced184c74fec
Author: kaniini <nenolod@gmail.com>
Date:   Thu, 30 Aug 2018 23:06:30 +0000

Merge branch 'use-media-proxy-in-suggestions-api' into 'develop'

use media proxy for the suggestions api

See merge request pleroma/pleroma!305
Diffstat:
M
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
7
+++++++

1 file changed, 7 insertions(+), 0 deletions(-)
diff --git a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
@@ -7,6 +7,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
   alias Pleroma.Web.ActivityPub.Utils
   alias Pleroma.Web.CommonAPI
   alias Pleroma.Web.OAuth.{Authorization, Token, App}
+  alias Pleroma.Web.MediaProxy
   alias Comeonin.Pbkdf2
   import Ecto.Query
   require Logger
@@ -1130,6 +1131,12 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
               end
             )
           end)
+          |> Enum.map(fn x ->
+            Map.put(x, "avatar", MediaProxy.url(x["avatar"]))
+          end)
+          |> Enum.map(fn x ->
+            Map.put(x, "avatar_static", MediaProxy.url(x["avatar_static"]))
+          end)
 
         conn
         |> json(data2)