moon
/
spc-pleroma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

proxy emojis 

(i fix emojos better than gargon but sshhhhh)
This commit is contained in:
href 2017-12-12 12:30:24 +01:00
parent 8e82547179
commit f909aec050
No known key found for this signature in database
GPG Key ID: EE8296C1A152C325
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/pleroma/formatter.ex
View File

@ -1,5 +1,6 @@
defmodule Pleroma.Formatter do defmodule Pleroma.Formatter do
alias Pleroma.User alias Pleroma.User
alias Pleroma.Web.MediaProxy
@link_regex ~r/https?:\/\/[\w\.\/?=\-#%&@~\(\)]+[\w\/]/u @link_regex ~r/https?:\/\/[\w\.\/?=\-#%&@~\(\)]+[\w\/]/u
def linkify(text) do def linkify(text) do
@ -125,7 +126,7 @@ def emojify(text, additional \\ nil) do
end end
Enum.reduce(all_emoji, text, fn ({emoji, file}, text) -> Enum.reduce(all_emoji, text, fn ({emoji, file}, text) ->
String.replace(text, ":#{emoji}:", "<img height='32px' width='32px' alt='#{emoji}' title='#{emoji}' src='#{file}' />") String.replace(text, ":#{emoji}:", "<img height='32px' width='32px' alt='#{emoji}' title='#{emoji}' src='#{MediaProxy.url(file)}' />")
end) end)
end end

2
lib/pleroma/web/media_proxy/media_proxy.ex
View File

@ -3,6 +3,8 @@ defmodule Pleroma.Web.MediaProxy do
def url(nil), do: nil def url(nil), do: nil
def url(url = "/" <> _), do: url
def url(url) do def url(url) do
config = Application.get_env(:pleroma, :media_proxy, []) config = Application.get_env(:pleroma, :media_proxy, [])
if !Keyword.get(config, :enabled, false) or String.starts_with?(url, Pleroma.Web.base_url) do if !Keyword.get(config, :enabled, false) or String.starts_with?(url, Pleroma.Web.base_url) do