pleroma

commit: 50f974b83b598a573307d144ce1614fae4c99969
parent: cf6ed32c683139660a6cc645b565072c24993cef
Author: Haelwenn <git.pleroma.social@hacktivis.me>
Date:   Sat,  3 Nov 2018 13:54:25 +0000

Merge branch 'bugfix/harden_status_output' into 'develop'

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

See merge request pleroma/pleroma!421
Diffstat:
M
lib/pleroma/web/mastodon_api/views/status_view.ex
8
++++----

1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/lib/pleroma/web/mastodon_api/views/status_view.ex b/lib/pleroma/web/mastodon_api/views/status_view.ex
@@ -61,7 +61,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do
       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 @@ defmodule Pleroma.Web.MastodonAPI.StatusView 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 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do
       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