Pleroma.Web.MastodonAPI.StatusView: Content isn’t nullable
authorHaelwenn (lanodan) Monnier <contact@hacktivis.me>
Fri, 2 Nov 2018 14:13:57 +0000 (15:13 +0100)
committerHaelwenn (lanodan) Monnier <contact@hacktivis.me>
Sat, 3 Nov 2018 13:42:47 +0000 (14:42 +0100)
lib/pleroma/web/mastodon_api/views/status_view.ex

index 27fe23594f07ae849d77477efeccfebb73a7d2f1..2d9a915f07e9cbe969a611a5a2c1d7057f957cdd 100644 (file)
@@ -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