diff options
| author | kPherox <admin@mail.kr-kp.com> | 2019-10-01 01:39:22 +0900 |
|---|---|---|
| committer | kPherox <admin@mail.kr-kp.com> | 2019-10-01 01:40:33 +0900 |
| commit | a0f101ee806af06bcd4271cd8d57d11ff85ea11a (patch) | |
| tree | 2cd3c5d1a645be1395c57ec5616f31afb4b68da7 /lib/pleroma/web/metadata | |
| parent | 8ca4f145a51e92c9f3a6c374ceddfac22ea300d9 (diff) | |
| parent | 7c9b023a918c84b60ae6547289a083c671a3659b (diff) | |
| download | pleroma-a0f101ee806af06bcd4271cd8d57d11ff85ea11a.tar.gz | |
Merge remote-tracking branch 'upstream/develop' into fix-prameter-name-of-accounts-update-credentials
Diffstat (limited to 'lib/pleroma/web/metadata')
| -rw-r--r-- | lib/pleroma/web/metadata/utils.ex | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/pleroma/web/metadata/utils.ex b/lib/pleroma/web/metadata/utils.ex index 720bd4519..382ecf426 100644 --- a/lib/pleroma/web/metadata/utils.ex +++ b/lib/pleroma/web/metadata/utils.ex @@ -3,6 +3,7 @@ # SPDX-License-Identifier: AGPL-3.0-only defmodule Pleroma.Web.Metadata.Utils do + alias Pleroma.Emoji alias Pleroma.Formatter alias Pleroma.HTML alias Pleroma.Web.MediaProxy @@ -13,7 +14,7 @@ defmodule Pleroma.Web.Metadata.Utils do |> HtmlEntities.decode() |> String.replace(~r/<br\s?\/?>/, " ") |> HTML.get_cached_stripped_html_for_activity(object, "metadata") - |> Formatter.demojify() + |> Emoji.Formatter.demojify() |> Formatter.truncate() end @@ -23,7 +24,7 @@ defmodule Pleroma.Web.Metadata.Utils do |> HtmlEntities.decode() |> String.replace(~r/<br\s?\/?>/, " ") |> HTML.strip_tags() - |> Formatter.demojify() + |> Emoji.Formatter.demojify() |> Formatter.truncate(max_length) end |