diff options
author | Egor Kislitsyn <egor@kislitsyn.com> | 2019-04-08 18:48:10 +0700 |
---|---|---|
committer | Egor Kislitsyn <egor@kislitsyn.com> | 2019-04-08 18:48:10 +0700 |
commit | 9abf832b034bf3867272bd178d168c641129eff0 (patch) | |
tree | decc2cc28908a79df003ad668fb06cb74fa97159 /lib/pleroma/web/common_api/common_api.ex | |
parent | c3d5c3513a3205313f0a2e28bb328ad5b48f2055 (diff) | |
parent | e19590c93f9adc5d743867b048aad9528810fc53 (diff) | |
download | pleroma-9abf832b034bf3867272bd178d168c641129eff0.tar.gz |
Merge remote-tracking branch 'pleroma/develop' into use-jobs-in-webpush
Diffstat (limited to 'lib/pleroma/web/common_api/common_api.ex')
-rw-r--r-- | lib/pleroma/web/common_api/common_api.ex | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/web/common_api/common_api.ex b/lib/pleroma/web/common_api/common_api.ex index 745d1839b..74babdf14 100644 --- a/lib/pleroma/web/common_api/common_api.ex +++ b/lib/pleroma/web/common_api/common_api.ex @@ -167,7 +167,7 @@ defmodule Pleroma.Web.CommonAPI do object, "emoji", (Formatter.get_emoji(status) ++ Formatter.get_emoji(data["spoiler_text"])) - |> Enum.reduce(%{}, fn {name, file}, acc -> + |> Enum.reduce(%{}, fn {name, file, _}, acc -> Map.put(acc, name, "#{Pleroma.Web.Endpoint.static_url()}#{file}") end) ) do |