Browse Source

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

use media proxy for the suggestions api

See merge request pleroma/pleroma!305
tags/v0.9.9
kaniini 5 years ago
parent
commit
e838969495
1 changed files with 7 additions and 0 deletions
  1. +7
    -0
      lib/pleroma/web/mastodon_api/mastodon_api_controller.ex

+ 7
- 0
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex View File

@@ -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)


Loading…
Cancel
Save