From 19e8421947472eb2207caa299bc4bf5947ce3cca Mon Sep 17 00:00:00 2001
From: Roger Braun <roger@rogerbraun.net>
Date: Mon, 31 Jul 2017 13:27:29 +0200
Subject: [PATCH] Revert "Wrap in <p>."
This reverts commit c81d0b6f898c36ebcad5371caeebc0f789cb7a67.
---
lib/pleroma/web/twitter_api/utils.ex | 3 ---
test/web/twitter_api/twitter_api_test.exs | 2 +-
2 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/lib/pleroma/web/twitter_api/utils.ex b/lib/pleroma/web/twitter_api/utils.ex
index f02c8ad6d..7f305c863 100644
--- a/lib/pleroma/web/twitter_api/utils.ex
+++ b/lib/pleroma/web/twitter_api/utils.ex
@@ -44,13 +44,10 @@ def add_user_links(text, mentions) 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 1dd8ba2e6..4903b52c5 100644
--- a/test/web/twitter_api/twitter_api_test.exs
+++ b/test/web/twitter_api/twitter_api_test.exs
@@ -33,7 +33,7 @@ test "create a status" 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
--
GitLab