summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHaelwenn (lanodan) Monnier <contact@hacktivis.me>2018-11-02 15:13:57 +0100
committerHaelwenn (lanodan) Monnier <contact@hacktivis.me>2018-11-03 14:42:47 +0100
commit3e50bb667f7b09482a6635634346708e9eab5ce6 (patch)
treefe2c668194251256503aa98949666658fbe47185
parentcf6ed32c683139660a6cc645b565072c24993cef (diff)
downloadpleroma-3e50bb667f7b09482a6635634346708e9eab5ce6.tar.gz
pleroma-3e50bb667f7b09482a6635634346708e9eab5ce6.zip
Pleroma.Web.MastodonAPI.StatusView: Content isn’t nullable
-rw-r--r--lib/pleroma/web/mastodon_api/views/status_view.ex8
1 files 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
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