diff options
| author | rinpatch <rinpatch@sdf.org> | 2020-03-23 10:43:20 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2020-03-23 10:43:20 +0000 |
| commit | d931a59072de0861e889c6349eacc3d7f1f41fd9 (patch) | |
| tree | 37b86cea0a18a6d286901480e101c451098bc85e | |
| parent | 7dbf1ffa868e4f5fece298b9ea161e1e11a2ffde (diff) | |
| parent | 5a34dca8eda46479a3459b60c623d6fa94fc662b (diff) | |
Merge branch 'support-emoji-staticfe' into 'develop'
Add emoji support in statuses in staticfe
Closes #1453
See merge request pleroma/pleroma!2324
| -rw-r--r-- | lib/pleroma/web/static_fe/static_fe_controller.ex | 4 | ||||
| -rw-r--r-- | priv/static/static/static-fe.css | 7 |
2 files changed, 10 insertions, 1 deletions
diff --git a/lib/pleroma/web/static_fe/static_fe_controller.ex b/lib/pleroma/web/static_fe/static_fe_controller.ex index 7f9464268..7a35238d7 100644 --- a/lib/pleroma/web/static_fe/static_fe_controller.ex +++ b/lib/pleroma/web/static_fe/static_fe_controller.ex @@ -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 diff --git a/priv/static/static/static-fe.css b/priv/static/static/static-fe.css index 19c56387b..db61ff266 100644 --- a/priv/static/static/static-fe.css +++ b/priv/static/static/static-fe.css @@ -174,3 +174,10 @@ button { font-weight: 500; font-size: 16px; } + +img.emoji { + width: 32px; + height: 32px; + padding: 0; + vertical-align: middle; +} |