diff options
| author | Alex Gleason <alex@alexgleason.me> | 2021-06-17 15:38:10 -0500 |
|---|---|---|
| committer | Alex Gleason <alex@alexgleason.me> | 2021-06-17 15:38:10 -0500 |
| commit | 3a03d9b65f96099e7c7a831469532c2cec7294c6 (patch) | |
| tree | 46d84731c3a53157117fc4c8141fdf6b3d7b8b25 /lib/pleroma/emoji/formatter.ex | |
| parent | a704d5499c03cb5609ea38a5f2ef06095ced3ef3 (diff) | |
| parent | a8adc300d4cfc88ef19f1977e32068437ed4ad00 (diff) | |
| download | pleroma-nsfw-api-mrf.tar.gz | |
Merge remote-tracking branch 'pleroma/develop' into nsfw-api-mrfnsfw-api-mrf
Diffstat (limited to 'lib/pleroma/emoji/formatter.ex')
| -rw-r--r-- | lib/pleroma/emoji/formatter.ex | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/pleroma/emoji/formatter.ex b/lib/pleroma/emoji/formatter.ex index 50150e951..191451952 100644 --- a/lib/pleroma/emoji/formatter.ex +++ b/lib/pleroma/emoji/formatter.ex @@ -5,7 +5,7 @@ defmodule Pleroma.Emoji.Formatter do alias Pleroma.Emoji alias Pleroma.HTML - alias Pleroma.Web + alias Pleroma.Web.Endpoint alias Pleroma.Web.MediaProxy def emojify(text) do @@ -44,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, to_string(URI.merge(Web.base_url(), file))) + Map.put(acc, name, to_string(URI.merge(Endpoint.url(), file))) end) end |