diff options
| author | lain <lain@soykaf.club> | 2021-01-07 10:06:39 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2021-01-07 10:06:39 +0000 |
| commit | f1ca2ac64bf5a308401f3155360e94a058e99e4e (patch) | |
| tree | 283c7bdbeff9e3bb0a65b9cea1b459f76daaf88d /lib | |
| parent | 5e128a6be30563adc3b8a938aa68d18ac04cdfa0 (diff) | |
| parent | 48cd336a720086695613decc2a1a6852245c1df5 (diff) | |
| download | pleroma-f1ca2ac64bf5a308401f3155360e94a058e99e4e.tar.gz | |
Merge branch 'upstream/remote-emoji-support' into 'develop'
Upstream external emoji support
See merge request pleroma/pleroma!3238
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/emoji/formatter.ex | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/pleroma/emoji/formatter.ex b/lib/pleroma/emoji/formatter.ex index dc45b8a38..992b20e12 100644 --- a/lib/pleroma/emoji/formatter.ex +++ b/lib/pleroma/emoji/formatter.ex @@ -5,6 +5,7 @@ defmodule Pleroma.Emoji.Formatter do alias Pleroma.Emoji alias Pleroma.HTML + alias Pleroma.Web alias Pleroma.Web.MediaProxy def emojify(text) do @@ -43,7 +44,7 @@ defmodule Pleroma.Emoji.Formatter do Emoji.get_all() |> Enum.filter(fn {emoji, %Emoji{}} -> String.contains?(text, ":#{emoji}:") end) |> Enum.reduce(%{}, fn {name, %Emoji{file: file}}, acc -> - Map.put(acc, name, "#{Pleroma.Web.Endpoint.static_url()}#{file}") + Map.put(acc, name, to_string(URI.merge(Web.base_url(), file))) end) end |