mirrors/pleroma
1
0
Fork 0
mirror of https://git.pleroma.social/pleroma/pleroma.git synced 2024-12-24 00:50:29 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'formatting-fixes' into 'develop'

Browse source 
Formatting fixes

Closes #80

See merge request pleroma/pleroma!22
This commit is contained in:
lambda 2017-11-18 15:58:44 +00:00
commit ed3403ad8b
4 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/pleroma/web/common_api/utils.ex
View file

@ -54,13 +54,14 @@ defmodule Pleroma.Web.CommonAPI.Utils do
"<a href=\"#{href}\" class='attachment'>#{shortname(name)}</a>" "<a href=\"#{href}\" class='attachment'>#{shortname(name)}</a>"
_ -> "" _ -> ""
end) end)
Enum.join([text | attachment_text], "<br>\n") Enum.join([text | attachment_text], "<br>")
end end
def format_input(text, mentions, tags) do def format_input(text, mentions, tags) do
HtmlSanitizeEx.strip_tags(text) Phoenix.HTML.html_escape(text)
|> elem(1)
|> Formatter.linkify |> Formatter.linkify
|> String.replace("\n", "<br>\n") |> String.replace("\n", "<br>")
|> add_user_links(mentions) |> add_user_links(mentions)
# |> add_tag_links(tags) # |> add_tag_links(tags)
end end

5
lib/pleroma/web/twitter_api/representers/activity_representer.ex
View file

@ -135,8 +135,9 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenter do
tags = activity.data["object"]["tag"] || [] tags = activity.data["object"]["tag"] || []
possibly_sensitive = Enum.member?(tags, "nsfw") possibly_sensitive = Enum.member?(tags, "nsfw")
content = if activity.data["object"]["summary"] do summary = activity.data["object"]["summary"]
"<span>#{activity.data["object"]["summary"]}</span><br>#{content}</span>" content = if !!summary and summary != "" do
"<span>#{activity.data["object"]["summary"]}</span><br />#{content}</span>"
else else
content content
end end

2
test/web/common_api/common_api_utils_test.exs
View file

@ -11,6 +11,6 @@ defmodule Pleroma.Web.CommonAPI.UtilsTest do
res = Utils.add_attachments("", [attachment]) res = Utils.add_attachments("", [attachment])
assert res == "<br>\n<a href=\"#{name}\" class='attachment'>Sakura Mana – Turned on by a Se…</a>" assert res == "<br><a href=\"#{name}\" class='attachment'>Sakura Mana – Turned on by a Se…</a>"
end end
end end

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

@ -34,7 +34,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"]) == "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"]) == "Hello again, <a href='shp'>@shp</a>.&lt;script&gt;&lt;/script&gt;<br>This is on another line. #2hu #epic #phantasmagoric<br><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