diff options
| author | Alex Gleason <alex@alexgleason.me> | 2022-01-03 13:40:19 -0600 |
|---|---|---|
| committer | Alex Gleason <alex@alexgleason.me> | 2022-01-03 13:40:19 -0600 |
| commit | 4081be0001332bac402faec7565807df088b0117 (patch) | |
| tree | a5305404e9bb31b3613dbc9631d36f8827be81c2 /lib/pleroma/web/metadata/utils.ex | |
| parent | d00f74e036735c1c238f661076f2925b39daa6ac (diff) | |
| parent | a3094b64df344622f1bcb03091ef2ff4dce6da82 (diff) | |
| download | pleroma-matrix.tar.gz | |
Merge remote-tracking branch 'origin/develop' into matrixmatrix
Diffstat (limited to 'lib/pleroma/web/metadata/utils.ex')
| -rw-r--r-- | lib/pleroma/web/metadata/utils.ex | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/lib/pleroma/web/metadata/utils.ex b/lib/pleroma/web/metadata/utils.ex index 2f0dfb474..caca42934 100644 --- a/lib/pleroma/web/metadata/utils.ex +++ b/lib/pleroma/web/metadata/utils.ex @@ -1,19 +1,19 @@ # Pleroma: A lightweight social networking server -# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/> +# Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/> # 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.url(url) - end - def user_name_string(user) do "#{user.name} " <> if user.local do |