CommonAPI: Newlines -> br for chat messages.
This commit is contained in:
parent
8ff3425828
commit
af9090238e
@ -54,6 +54,9 @@ defmodule Pleroma.Web.CommonAPI do
|
|||||||
content
|
content
|
||||||
|> Formatter.html_escape("text/plain")
|
|> Formatter.html_escape("text/plain")
|
||||||
|> Formatter.linkify()
|
|> Formatter.linkify()
|
||||||
|
|> (fn {text, mentions, tags} ->
|
||||||
|
{String.replace(text, ~r/\r?\n/, "<br>"), mentions, tags}
|
||||||
|
end).()
|
||||||
|
|
||||||
text
|
text
|
||||||
end
|
end
|
||||||
|
@ -50,6 +50,26 @@ defmodule Pleroma.Web.CommonAPITest do
|
|||||||
assert activity
|
assert activity
|
||||||
end
|
end
|
||||||
|
|
||||||
|
test "it adds html newlines" do
|
||||||
|
author = insert(:user)
|
||||||
|
recipient = insert(:user)
|
||||||
|
|
||||||
|
other_user = insert(:user)
|
||||||
|
|
||||||
|
{:ok, activity} =
|
||||||
|
CommonAPI.post_chat_message(
|
||||||
|
author,
|
||||||
|
recipient,
|
||||||
|
"uguu\nuguuu"
|
||||||
|
)
|
||||||
|
|
||||||
|
assert other_user.ap_id not in activity.recipients
|
||||||
|
|
||||||
|
object = Object.normalize(activity, false)
|
||||||
|
|
||||||
|
assert object.data["content"] == "uguu<br/>uguuu"
|
||||||
|
end
|
||||||
|
|
||||||
test "it linkifies" do
|
test "it linkifies" do
|
||||||
author = insert(:user)
|
author = insert(:user)
|
||||||
recipient = insert(:user)
|
recipient = insert(:user)
|
||||||
|
Loading…
Reference in New Issue
Block a user