projects
/
akkoma
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
cdb3dd4
)
fix test for converting bio \r\n to <br>.
author
ensra
<ensra@users.noreply.github.com>
Tue, 21 Aug 2018 13:51:27 +0000
(14:51 +0100)
committer
ensra
<ensra@users.noreply.github.com>
Tue, 21 Aug 2018 13:51:27 +0000
(14:51 +0100)
lib/pleroma/web/common_api/utils.ex
patch
|
blob
|
history
diff --git
a/lib/pleroma/web/common_api/utils.ex
b/lib/pleroma/web/common_api/utils.ex
index c7b0d7935f1ed6f74287fcf05100f576075c4f02..869f4c5661c5cef438ee3a3cf7b45dd7745d0d93 100644
(file)
--- a/
lib/pleroma/web/common_api/utils.ex
+++ b/
lib/pleroma/web/common_api/utils.ex
@@
-64,7
+64,6
@@
defmodule Pleroma.Web.CommonAPI.Utils do
def make_content_html(status, mentions, attachments, tags, no_attachment_links \\ false) do
status
- |> String.replace("\r", "")
|> format_input(mentions, tags)
|> maybe_add_attachments(attachments, no_attachment_links)
end
@@
-95,7
+94,7
@@
defmodule Pleroma.Web.CommonAPI.Utils do
def format_input(text, mentions, tags) do
text
|> Formatter.html_escape()
- |> String.replace(
"\n"
, "<br>")
+ |> String.replace(
~r/\r?\n/
, "<br>")
|> (&{[], &1}).()
|> Formatter.add_links()
|> Formatter.add_user_links(mentions)