diff options
| -rw-r--r-- | lib/pleroma/web/twitter_api/utils.ex | 3 | ||||
| -rw-r--r-- | test/web/twitter_api/twitter_api_test.exs | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/lib/pleroma/web/twitter_api/utils.ex b/lib/pleroma/web/twitter_api/utils.ex index 7f305c863..f02c8ad6d 100644 --- a/lib/pleroma/web/twitter_api/utils.ex +++ b/lib/pleroma/web/twitter_api/utils.ex @@ -44,10 +44,13 @@ defmodule Pleroma.Web.TwitterAPI.Utils do end) end + def wrap_in_p(text), do: "<p>#{text}</p>" + def make_content_html(status, mentions, attachments) do status |> format_input(mentions) |> add_attachments(attachments) + |> wrap_in_p end def make_context(%Activity{data: %{"context" => context}}), do: context diff --git a/test/web/twitter_api/twitter_api_test.exs b/test/web/twitter_api/twitter_api_test.exs index 4903b52c5..1dd8ba2e6 100644 --- a/test/web/twitter_api/twitter_api_test.exs +++ b/test/web/twitter_api/twitter_api_test.exs @@ -33,7 +33,7 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPITest do { :ok, activity = %Activity{} } = TwitterAPI.create_status(user, input) - assert get_in(activity.data, ["object", "content"]) == "Hello again, <a href='shp'>@shp</a>.<br />\nThis is on another line. #2hu #epic #phantasmagoric<br />\n<a href=\"http://example.org/image.jpg\" class='attachment'>image.jpg</a>" + assert get_in(activity.data, ["object", "content"]) == "<p>Hello again, <a href='shp'>@shp</a>.<br />\nThis is on another line. #2hu #epic #phantasmagoric<br />\n<a href=\"http://example.org/image.jpg\" class='attachment'>image.jpg</a></p>" assert get_in(activity.data, ["object", "type"]) == "Note" assert get_in(activity.data, ["object", "actor"]) == user.ap_id assert get_in(activity.data, ["actor"]) == user.ap_id |