diff options
| author | Sean King <seanking2919@protonmail.com> | 2021-06-04 14:42:44 -0600 |
|---|---|---|
| committer | Sean King <seanking2919@protonmail.com> | 2021-06-04 14:42:44 -0600 |
| commit | dc4814f0cdc12a552001e5e22c979060e4f3f865 (patch) | |
| tree | 38f8cb1729338768da447a27ae243c27d301c7bd /lib/pleroma/web/common_api/utils.ex | |
| parent | 2de41770d04cf07ed8775a307b6d457a4750e265 (diff) | |
| parent | 0c56f9de0d607b88fd107e0bd13ef286f0629346 (diff) | |
| download | pleroma-dc4814f0cdc12a552001e5e22c979060e4f3f865.tar.gz | |
Fix merge conflicts with upstream
Diffstat (limited to 'lib/pleroma/web/common_api/utils.ex')
| -rw-r--r-- | lib/pleroma/web/common_api/utils.ex | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/pleroma/web/common_api/utils.ex b/lib/pleroma/web/common_api/utils.ex index 4e6a3feb0..4cc34002d 100644 --- a/lib/pleroma/web/common_api/utils.ex +++ b/lib/pleroma/web/common_api/utils.ex @@ -69,7 +69,7 @@ defmodule Pleroma.Web.CommonAPI.Utils do to = case visibility do "public" -> [Pleroma.Constants.as_public() | draft.mentions] - "local" -> [Pleroma.Constants.as_local_public() | draft.mentions] + "local" -> [Utils.as_local_public() | draft.mentions] end cc = [draft.user.follower_address] @@ -286,7 +286,7 @@ defmodule Pleroma.Web.CommonAPI.Utils do def format_input(text, "text/markdown", options) do text |> Formatter.mentions_escape(options) - |> Earmark.as_html!(%Earmark.Options{renderer: Pleroma.EarmarkRenderer}) + |> Formatter.markdown_to_html() |> Formatter.linkify(options) |> Formatter.html_escape("text/html") end |