Revert "Wrap in <p>."

This reverts commit c81d0b6f898c36ebcad5371caeebc0f789cb7a67.

diff --git a/lib/pleroma/web/twitter_api/utils.ex b/lib/pleroma/web/twitter_api/utils.ex
index f02c8ad6da2b83977c3e0e8ed4808872f518f28a..7f305c863a9ab6fbdee311fed07adfae66818387 100644 (file)
--- a/lib/pleroma/web/twitter_api/utils.ex
+++ b/lib/pleroma/web/twitter_api/utils.ex
@@ -44,13 +44,10 @@ 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 1dd8ba2e6b222de08968d8b983a7bac023f1ae31..4903b52c55b55b48ba0fb27e889edb672a4b82fe 100644 (file)
--- 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"]) == "<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", "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", "type"]) == "Note"
     assert get_in(activity.data, ["object", "actor"]) == user.ap_id
     assert get_in(activity.data, ["actor"]) == user.ap_id