diff options
| author | rinpatch <rinpatch@sdf.org> | 2019-01-13 13:38:28 +0300 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2019-01-13 13:38:28 +0300 |
| commit | e4dc3f71aea900e566c0d66ddffc5cd57e3920dd (patch) | |
| tree | d0b0edfd3c7aa4c2015b0b461a4c40895e16eba9 /lib/pleroma/web/common_api/utils.ex | |
| parent | 9a6236e69d2709c0df374574fd77c4b2bc3d68fb (diff) | |
| parent | 19b6a8239387869c69c6885044ee488d097b723f (diff) | |
| download | pleroma-e4dc3f71aea900e566c0d66ddffc5cd57e3920dd.tar.gz | |
Resolve merge conflict
Diffstat (limited to 'lib/pleroma/web/common_api/utils.ex')
| -rw-r--r-- | lib/pleroma/web/common_api/utils.ex | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/pleroma/web/common_api/utils.ex b/lib/pleroma/web/common_api/utils.ex index 142283684..7e30d224c 100644 --- a/lib/pleroma/web/common_api/utils.ex +++ b/lib/pleroma/web/common_api/utils.ex @@ -1,3 +1,7 @@ +# Pleroma: A lightweight social networking server +# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/> +# SPDX-License-Identifier: AGPL-3.0-only + defmodule Pleroma.Web.CommonAPI.Utils do alias Calendar.Strftime alias Comeonin.Pbkdf2 @@ -132,7 +136,6 @@ defmodule Pleroma.Web.CommonAPI.Utils do def format_input(text, mentions, _tags, "text/html") do text |> Formatter.html_escape("text/html") - |> String.replace(~r/\r?\n/, "<br>") |> (&{[], &1}).() |> Formatter.add_user_links(mentions) |> Formatter.finalize() @@ -146,7 +149,6 @@ defmodule Pleroma.Web.CommonAPI.Utils do |> Formatter.mentions_escape(mentions) |> Earmark.as_html!() |> Formatter.html_escape("text/html") - |> String.replace(~r/\r?\n/, "") |> (&{[], &1}).() |> Formatter.add_user_links(mentions) |> Formatter.add_hashtag_links(tags) |