mirrors/pleroma
1
0
Fork 0
mirror of https://git.pleroma.social/pleroma/pleroma.git synced 2024-12-23 00:26:30 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'support-emoji-staticfe' into 'develop'

Browse source 
Add emoji support in statuses in staticfe

Closes #1453

See merge request pleroma/pleroma!2324
This commit is contained in:
rinpatch 2020-03-23 10:43:20 +00:00
commit d931a59072
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;
}