Anon/pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'bugfix/harden_status_output' into 'develop'

Browse Source 
Pleroma.Web.MastodonAPI.StatusView: Content isn’t nullable

See merge request pleroma/pleroma!421
This commit is contained in:
Haelwenn 2018-11-03 13:54:25 +00:00
commit 50f974b83b
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/pleroma/web/mastodon_api/views/status_view.ex
View File

@ -61,7 +61,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do
in_reply_to_id: nil, in_reply_to_id: nil,
in_reply_to_account_id: nil, in_reply_to_account_id: nil,
reblog: reblogged, reblog: reblogged,
content: reblogged[:content], content: reblogged[:content] || "",
created_at: created_at, created_at: created_at,
reblogs_count: 0, reblogs_count: 0,
replies_count: 0, replies_count: 0,
@ -230,7 +230,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do
if !!name and name != "" do if !!name and name != "" do
"<p><a href=\"#{object["id"]}\">#{name}</a></p>#{object["content"]}" "<p><a href=\"#{object["id"]}\">#{name}</a></p>#{object["content"]}"
else else
object["content"] object["content"] || ""
end end
content content
@ -243,11 +243,11 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do
if !!summary and summary != "" and is_bitstring(object["url"]) do if !!summary and summary != "" and is_bitstring(object["url"]) do
"<p><a href=\"#{object["url"]}\">#{summary}</a></p>#{object["content"]}" "<p><a href=\"#{object["url"]}\">#{summary}</a></p>#{object["content"]}"
else else
object["content"] object["content"] || ""
end end
content content
end end
def render_content(object), do: object["content"] def render_content(object), do: object["content"] || ""
end end