From: Haelwenn (lanodan) Monnier <contact@hacktivis.me>
Date: Fri, 2 Nov 2018 14:13:57 +0000 (+0100)
Subject: Pleroma.Web.MastodonAPI.StatusView: Content isn’t nullable
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=3e50bb667f7b09482a6635634346708e9eab5ce6;p=akkoma

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

diff --git a/lib/pleroma/web/mastodon_api/views/status_view.ex b/lib/pleroma/web/mastodon_api/views/status_view.ex
index 27fe23594..2d9a915f0 100644
--- 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