squeegily/pleroma
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Preserve newlines in messages.

Browse Source
This commit is contained in:
Roger Braun 2017-04-16 11:51:00 +02:00
parent ca4d7f4607
commit b41f3eff84
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/pleroma/web/twitter_api/twitter_api.ex
View File

@ -13,6 +13,7 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
context = ActivityPub.generate_context_id context = ActivityPub.generate_context_id
content = HtmlSanitizeEx.strip_tags(data["status"]) content = HtmlSanitizeEx.strip_tags(data["status"])
|> String.replace("\n", "<br>")
mentions = parse_mentions(content) mentions = parse_mentions(content)

4
test/web/twitter_api/twitter_api_test.exs
View File

@ -27,13 +27,13 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPITest do
object = Repo.insert!(%Object{data: object_data}) object = Repo.insert!(%Object{data: object_data})
input = %{ input = %{
"status" => "Hello again, @shp.<script></script>", "status" => "Hello again, @shp.<script></script>\nThis is on another line.",
"media_ids" => [object.id] "media_ids" => [object.id]
} }
{ :ok, activity = %Activity{} } = TwitterAPI.create_status(user, input) { :ok, activity = %Activity{} } = TwitterAPI.create_status(user, input)
assert get_in(activity.data, ["object", "content"]) == "Hello again, <a href='shp'>@shp</a>." assert get_in(activity.data, ["object", "content"]) == "Hello again, <a href='shp'>@shp</a>.<br>This is on another line."
assert get_in(activity.data, ["object", "type"]) == "Note" assert get_in(activity.data, ["object", "type"]) == "Note"
assert get_in(activity.data, ["object", "actor"]) == user.ap_id assert get_in(activity.data, ["object", "actor"]) == user.ap_id
assert get_in(activity.data, ["actor"]) == user.ap_id assert get_in(activity.data, ["actor"]) == user.ap_id