diff options
| author | Maksim Pechnikov <parallel588@gmail.com> | 2020-01-13 12:41:07 +0300 |
|---|---|---|
| committer | Maksim Pechnikov <parallel588@gmail.com> | 2020-01-13 12:41:07 +0300 |
| commit | b7908844f24f4ede4244261d43f30ed3724efbb7 (patch) | |
| tree | 1b2f17fbba3cbd006573b8447117cc9e35c09d99 /lib/pleroma/web/metadata | |
| parent | 54c9db38c8035ecc115e136a09a3d991e426959a (diff) | |
| parent | a431e8c9f7033c739e10b0e8b34c75f2cc1d38d4 (diff) | |
| download | pleroma-b7908844f24f4ede4244261d43f30ed3724efbb7.tar.gz | |
Merge branch 'develop' into issue/1383
Diffstat (limited to 'lib/pleroma/web/metadata')
| -rw-r--r-- | lib/pleroma/web/metadata/utils.ex | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/pleroma/web/metadata/utils.ex b/lib/pleroma/web/metadata/utils.ex index 382ecf426..589d11901 100644 --- a/lib/pleroma/web/metadata/utils.ex +++ b/lib/pleroma/web/metadata/utils.ex @@ -15,6 +15,7 @@ defmodule Pleroma.Web.Metadata.Utils do |> String.replace(~r/<br\s?\/?>/, " ") |> HTML.get_cached_stripped_html_for_activity(object, "metadata") |> Emoji.Formatter.demojify() + |> HtmlEntities.decode() |> Formatter.truncate() end @@ -25,6 +26,7 @@ defmodule Pleroma.Web.Metadata.Utils do |> String.replace(~r/<br\s?\/?>/, " ") |> HTML.strip_tags() |> Emoji.Formatter.demojify() + |> HtmlEntities.decode() |> Formatter.truncate(max_length) end |