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

Add emoji support in statuses in staticfe

Browse Source
This commit is contained in:
Egor Kislitsyn 2020-03-23 14:03:31 +04:00
parent 7dbf1ffa86
commit 5a34dca8ed
No known key found for this signature in database
GPG Key ID: 1B49CB15B71E7805
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 = 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

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

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