forked from YokaiRick/akkoma
Merge branch 'formatting-fixes' into 'develop'
Formatting fixes Closes #80 See merge request pleroma/pleroma!22
This commit is contained in:
commit
ed3403ad8b
4 changed files with 9 additions and 7 deletions
|
@ -54,13 +54,14 @@ def add_attachments(text, attachments) do
|
|||
"<a href=\"#{href}\" class='attachment'>#{shortname(name)}</a>"
|
||||
_ -> ""
|
||||
end)
|
||||
Enum.join([text | attachment_text], "<br>\n")
|
||||
Enum.join([text | attachment_text], "<br>")
|
||||
end
|
||||
|
||||
def format_input(text, mentions, tags) do
|
||||
HtmlSanitizeEx.strip_tags(text)
|
||||
Phoenix.HTML.html_escape(text)
|
||||
|> elem(1)
|
||||
|> Formatter.linkify
|
||||
|> String.replace("\n", "<br>\n")
|
||||
|> String.replace("\n", "<br>")
|
||||
|> add_user_links(mentions)
|
||||
# |> add_tag_links(tags)
|
||||
end
|
||||
|
|
|
@ -135,8 +135,9 @@ def to_map(%Activity{data: %{"object" => %{"content" => content} = object}} = ac
|
|||
tags = activity.data["object"]["tag"] || []
|
||||
possibly_sensitive = Enum.member?(tags, "nsfw")
|
||||
|
||||
content = if activity.data["object"]["summary"] do
|
||||
"<span>#{activity.data["object"]["summary"]}</span><br>#{content}</span>"
|
||||
summary = activity.data["object"]["summary"]
|
||||
content = if !!summary and summary != "" do
|
||||
"<span>#{activity.data["object"]["summary"]}</span><br />#{content}</span>"
|
||||
else
|
||||
content
|
||||
end
|
||||
|
|
|
@ -11,6 +11,6 @@ test "it adds attachment links to a given text and attachment set" do
|
|||
|
||||
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
|
||||
|
|
|
@ -34,7 +34,7 @@ test "create a status" 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"]) == "Hello again, <a href='shp'>@shp</a>.<script></script><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", "actor"]) == user.ap_id
|
||||
assert get_in(activity.data, ["actor"]) == user.ap_id
|
||||
|
|
Loading…
Reference in a new issue