sjw/pleroma
1
0
Fork 0
mirror of https://git.pleroma.social/sjw/pleroma.git synced 2024-12-27 04:35:10 +01:00
Code Issues Releases Wiki Activity

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

Browse Source
This commit is contained in:
Ivan Tashkinov 2020-03-23 14:34:58 +03:00
commit 86f2fbc81e
2 changed files with 10 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 @@ defmodule Pleroma.Web.StaticFE.StaticFEController do
content =
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
nil
end

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

@ -174,3 +174,10 @@ button {
font-weight: 500;
font-size: 16px;
}
img.emoji {
width: 32px;
height: 32px;
padding: 0;
vertical-align: middle;
}