limepotato/akkoma
1
0
Fork 0
Code Pull requests Activity

Revert "Wrap in <p>."

Browse source 
This reverts commit c81d0b6f89.
This commit is contained in:
Roger Braun 2017-07-31 13:27:29 +02:00
parent 3063e3b440
commit 19e8421947
2 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/pleroma/web/twitter_api/utils.ex
View file

@ -44,13 +44,10 @@ defmodule Pleroma.Web.TwitterAPI.Utils do
end) end)
end end
def wrap_in_p(text), do: "<p>#{text}</p>"
def make_content_html(status, mentions, attachments) do def make_content_html(status, mentions, attachments) do
status status
|> format_input(mentions) |> format_input(mentions)
|> add_attachments(attachments) |> add_attachments(attachments)
|> wrap_in_p
end end
def make_context(%Activity{data: %{"context" => context}}), do: context def make_context(%Activity{data: %{"context" => context}}), do: context

2
test/web/twitter_api/twitter_api_test.exs
View file

@ -33,7 +33,7 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPITest do
{ :ok, activity = %Activity{} } = TwitterAPI.create_status(user, input) { :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", "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