sam/pleroma
sam/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 @@ def render(
in_reply_to_id: nil,
in_reply_to_account_id: nil,
reblog: reblogged,
content: reblogged[:content],
content: reblogged[:content] || "",
created_at: created_at,
reblogs_count: 0,
replies_count: 0,
@ -230,7 +230,7 @@ def render_content(%{"type" => "Video"} = object) do
if !!name and name != "" do
"<p><a href=\"#{object["id"]}\">#{name}</a></p>#{object["content"]}"
else
object["content"]
object["content"] || ""
end
content
@ -243,11 +243,11 @@ def render_content(%{"type" => object_type} = object) when object_type in ["Arti
if !!summary and summary != "" and is_bitstring(object["url"]) do
"<p><a href=\"#{object["url"]}\">#{summary}</a></p>#{object["content"]}"
else
object["content"]
object["content"] || ""
end
content
end
def render_content(object), do: object["content"]
def render_content(object), do: object["content"] || ""
end