logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma git clone https://hacktivis.me/git/pleroma.git
commit: 09b4f7269e5307f29fc8ca7b548e93cd93836dc5
parent 1afeaf82fa3f1718233f5012f851912f87f35a88
Author: rinpatch <rinpatch@sdf.org>
Date:   Thu, 14 Nov 2019 14:40:37 +0000

Merge branch 'fix/conversations-rendering' into 'develop'

Fix rendering conversations when there's a malformed status

Closes #1401

See merge request pleroma/pleroma!1973

Diffstat:

Mlib/pleroma/web/mastodon_api/views/conversation_view.ex5++++-
1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/pleroma/web/mastodon_api/views/conversation_view.ex b/lib/pleroma/web/mastodon_api/views/conversation_view.ex @@ -12,7 +12,10 @@ 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