From: Mark Felder <feld@FreeBSD.org>
Date: Tue, 12 Nov 2019 00:29:55 +0000 (-0600)
Subject: Fix rendering conversations when there's a malformed status
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=7d101bc9c5f8ffc1d78c8d5e22f630ad0a7d7e1b;p=akkoma

Fix rendering conversations when there's a malformed status
---

diff --git a/lib/pleroma/web/mastodon_api/views/conversation_view.ex b/lib/pleroma/web/mastodon_api/views/conversation_view.ex
index c5998e661..51d6c0898 100644
--- a/lib/pleroma/web/mastodon_api/views/conversation_view.ex
+++ b/lib/pleroma/web/mastodon_api/views/conversation_view.ex
@@ -12,7 +12,7 @@ defmodule Pleroma.Web.MastodonAPI.ConversationView do
   alias Pleroma.Web.MastodonAPI.StatusView
 
   def render("participations.json", %{participations: participations, for: user}) do
-    render_many(participations, __MODULE__, "participation.json", as: :participation, for: user)
+    safe_render_many(participations, __MODULE__, "participation.json", %{as: :participation, for: user})
   end
 
   def render("participation.json", %{participation: participation, for: user}) do