moon
/
honkoma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'remotes/origin/develop' into relations-preloading-for-statuses-rendering

This commit is contained in:
Ivan Tashkinov 2020-03-23 14:34:58 +03:00
parent 3c78e5f327 d931a59072
commit 86f2fbc81e
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/pleroma/web/static_fe/static_fe_controller.ex
View File

@ -60,7 +60,9 @@ defp represent(%Activity{object: %Object{data: data}} = activity, selected) do
content = content =
if data["content"] do if data["content"] do
Pleroma.HTML.filter_tags(data["content"]) data["content"]
|> Pleroma.HTML.filter_tags()
|> Pleroma.Emoji.Formatter.emojify(Map.get(data, "emoji", %{}))
else else
nil nil
end end

BIN
priv/static/static/static-fe.css
View File

Binary file not shown.