hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

allow external emoji

Browse source
This commit is contained in:
Roger Braun 2019-02-06 18:05:34 +01:00 • committed by Mark Felder
commit 48cd336a72
3 changed files with 16 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
lib/pleroma/emoji/formatter.ex
View file

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