diff options
| author | lambda <pleromagit@rogerbraun.net> | 2017-12-20 14:22:24 +0000 |
|---|---|---|
| committer | lambda <pleromagit@rogerbraun.net> | 2017-12-20 14:22:24 +0000 |
| commit | 35ac549a99f325d2e73c03d7c2951f3d6570b7b4 (patch) | |
| tree | d79e7f5b5d82e3c4098895dcdec2e872ad84fc3e /lib/pleroma/formatter.ex | |
| parent | 2a744cdff8a94d92683ab1a16f89bb51112006f8 (diff) | |
| parent | f909aec050498a366d8b0ed6c1b5439b5b0891f1 (diff) | |
| download | pleroma-35ac549a99f325d2e73c03d7c2951f3d6570b7b4.tar.gz | |
Merge branch 'media-proxy' into 'develop'
Media proxy
See merge request pleroma/pleroma!34
Diffstat (limited to 'lib/pleroma/formatter.ex')
| -rw-r--r-- | lib/pleroma/formatter.ex | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/pleroma/formatter.ex b/lib/pleroma/formatter.ex index 2cf4b9ca4..8b736797b 100644 --- a/lib/pleroma/formatter.ex +++ b/lib/pleroma/formatter.ex @@ -1,5 +1,6 @@ defmodule Pleroma.Formatter do alias Pleroma.User + alias Pleroma.Web.MediaProxy @link_regex ~r/https?:\/\/[\w\.\/?=\-#%&@~\(\)]+[\w\/]/u def linkify(text) do @@ -125,7 +126,7 @@ defmodule Pleroma.Formatter do end 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 |