squeegily/pleroma
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'fix-107' into 'develop'

Browse Source 
masto api: run emojis through mediaproxy

Closes #107

See merge request pleroma/pleroma!92
This commit is contained in:
lambda 2018-04-02 11:24:12 +00:00
commit 807d243c64
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/pleroma/web/mastodon_api/views/status_view.ex
View File

@ -125,7 +125,11 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do
(activity.data["object"]["emoji"] || []) (activity.data["object"]["emoji"] || [])
|> Enum.map(fn {name, url} -> |> Enum.map(fn {name, url} ->
name = HtmlSanitizeEx.strip_tags(name) name = HtmlSanitizeEx.strip_tags(name)
url = HtmlSanitizeEx.strip_tags(url)
url =
HtmlSanitizeEx.strip_tags(url)
|> MediaProxy.url()
%{shortcode: name, url: url, static_url: url} %{shortcode: name, url: url, static_url: url}
end) end)