aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web/static_fe
diff options
context:
space:
mode:
authorEgor Kislitsyn <egor@kislitsyn.com>2020-03-23 14:03:31 +0400
committerEgor Kislitsyn <egor@kislitsyn.com>2020-03-23 14:03:31 +0400
commit5a34dca8eda46479a3459b60c623d6fa94fc662b (patch)
tree37b86cea0a18a6d286901480e101c451098bc85e /lib/pleroma/web/static_fe
parent7dbf1ffa868e4f5fece298b9ea161e1e11a2ffde (diff)
downloadpleroma-5a34dca8eda46479a3459b60c623d6fa94fc662b.tar.gz
Add emoji support in statuses in staticfe
Diffstat (limited to 'lib/pleroma/web/static_fe')
-rw-r--r--lib/pleroma/web/static_fe/static_fe_controller.ex4
1 files changed, 3 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