aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web/common_api/utils.ex
diff options
context:
space:
mode:
authorMaksim Pechnikov <parallel588@gmail.com>2020-02-06 10:53:08 +0300
committerMaksim Pechnikov <parallel588@gmail.com>2020-02-06 10:53:08 +0300
commit2d232f0aa66c41a97928952093d02ad688625fc9 (patch)
tree4f468909d69e7c6d1e253de3c25df2ed16b74a81 /lib/pleroma/web/common_api/utils.ex
parent0ffad24e2d66a98e0fae768d754d3670425b6412 (diff)
downloadpleroma-2d232f0aa66c41a97928952093d02ad688625fc9.tar.gz
updated generate urls
Diffstat (limited to 'lib/pleroma/web/common_api/utils.ex')
-rw-r--r--lib/pleroma/web/common_api/utils.ex4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/pleroma/web/common_api/utils.ex b/lib/pleroma/web/common_api/utils.ex
index a9b164d9a..f80cd04ec 100644
--- a/lib/pleroma/web/common_api/utils.ex
+++ b/lib/pleroma/web/common_api/utils.ex
@@ -16,9 +16,9 @@ defmodule Pleroma.Web.CommonAPI.Utils do
alias Pleroma.Plugs.AuthenticationPlug
alias Pleroma.Repo
alias Pleroma.User
+ alias Pleroma.Web
alias Pleroma.Web.ActivityPub.Utils
alias Pleroma.Web.ActivityPub.Visibility
- alias Pleroma.Web.Endpoint
alias Pleroma.Web.MediaProxy
require Logger
@@ -438,7 +438,7 @@ defmodule Pleroma.Web.CommonAPI.Utils do
|> Enum.map(fn {shortcode, %Emoji{file: path}} ->
%{
"type" => "Emoji",
- "icon" => %{"type" => "Image", "url" => "#{Endpoint.url()}#{path}"},
+ "icon" => %{"type" => "Image", "url" => Web.base_url(%{path: path})},
"name" => ":#{shortcode}:"
}
end)