diff options
| author | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2021-08-08 14:37:15 +0000 |
|---|---|---|
| committer | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2021-08-08 14:37:15 +0000 |
| commit | dc63aaf84f07a6f8042f43617d8ec356fed85cec (patch) | |
| tree | 5d12a05bce5dc1a23736fd37e7ca8c64580acd34 /lib/pleroma/web/metadata/utils.ex | |
| parent | b221d77a6da07c684bdbc63ddf4500e0d7ffeae8 (diff) | |
| parent | 0910777d41f8b4b3096c35c5fc97fc357e5d8c8c (diff) | |
| download | pleroma-2.4.0.tar.gz | |
Merge branch 'release/2.4.0' into 'stable'v2.4.0
Release/2.4.0
See merge request pleroma/pleroma!3493
Diffstat (limited to 'lib/pleroma/web/metadata/utils.ex')
| -rw-r--r-- | lib/pleroma/web/metadata/utils.ex | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/lib/pleroma/web/metadata/utils.ex b/lib/pleroma/web/metadata/utils.ex index de7195435..caca42934 100644 --- a/lib/pleroma/web/metadata/utils.ex +++ b/lib/pleroma/web/metadata/utils.ex @@ -3,17 +3,17 @@ # SPDX-License-Identifier: AGPL-3.0-only defmodule Pleroma.Web.Metadata.Utils do + alias Pleroma.Activity alias Pleroma.Emoji alias Pleroma.Formatter alias Pleroma.HTML - alias Pleroma.Web.MediaProxy def scrub_html_and_truncate(%{data: %{"content" => content}} = object) do content # html content comes from DB already encoded, decode first and scrub after |> HtmlEntities.decode() |> String.replace(~r/<br\s?\/?>/, " ") - |> HTML.get_cached_stripped_html_for_activity(object, "metadata") + |> Activity.HTML.get_cached_stripped_html_for_activity(object, "metadata") |> Emoji.Formatter.demojify() |> HtmlEntities.decode() |> Formatter.truncate() @@ -37,10 +37,6 @@ defmodule Pleroma.Web.Metadata.Utils do def scrub_html(content), do: content - def attachment_url(url) do - MediaProxy.preview_url(url) - end - def user_name_string(user) do "#{user.name} " <> if user.local do |