aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web/metadata/utils.ex
diff options
context:
space:
mode:
authorrinpatch <rinpatch@sdf.org>2020-02-09 12:15:52 +0000
committerrinpatch <rinpatch@sdf.org>2020-02-09 12:15:52 +0000
commit42f76306e7fe69fc51be00285a4fef8569f54989 (patch)
tree416bc4048224a5fc9312c4c5834ea5207497a6b7 /lib/pleroma/web/metadata/utils.ex
parent1629fa2412b877f69c5cf0df09782227827b272b (diff)
parent06fec99e1d8d4be6cb71551089f2d95e936d6990 (diff)
downloadpleroma-1.1.9.tar.gz
Merge branch 'release/1.1.9' into 'stable'v1.1.9
Release/1.1.9 See merge request pleroma/pleroma!2189
Diffstat (limited to 'lib/pleroma/web/metadata/utils.ex')
-rw-r--r--lib/pleroma/web/metadata/utils.ex2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/pleroma/web/metadata/utils.ex b/lib/pleroma/web/metadata/utils.ex
index 720bd4519..e1ad402bc 100644
--- a/lib/pleroma/web/metadata/utils.ex
+++ b/lib/pleroma/web/metadata/utils.ex
@@ -14,6 +14,7 @@ defmodule Pleroma.Web.Metadata.Utils do
|> String.replace(~r/<br\s?\/?>/, " ")
|> HTML.get_cached_stripped_html_for_activity(object, "metadata")
|> Formatter.demojify()
+ |> HtmlEntities.decode()
|> Formatter.truncate()
end
@@ -24,6 +25,7 @@ defmodule Pleroma.Web.Metadata.Utils do
|> String.replace(~r/<br\s?\/?>/, " ")
|> HTML.strip_tags()
|> Formatter.demojify()
+ |> HtmlEntities.decode()
|> Formatter.truncate(max_length)
end