diff options
| author | rinpatch <rinpatch@sdf.org> | 2019-11-14 14:40:37 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2019-11-14 14:40:37 +0000 |
| commit | 09b4f7269e5307f29fc8ca7b548e93cd93836dc5 (patch) | |
| tree | 0204233632cdf52cce40bb45e7342696d991265a | |
| parent | 1afeaf82fa3f1718233f5012f851912f87f35a88 (diff) | |
| parent | 94f1cfced872924592eff39b00781989a9e2f96f (diff) | |
| download | pleroma-09b4f7269e5307f29fc8ca7b548e93cd93836dc5.tar.gz pleroma-09b4f7269e5307f29fc8ca7b548e93cd93836dc5.zip | |
Merge branch 'fix/conversations-rendering' into 'develop'
Fix rendering conversations when there's a malformed status
Closes #1401
See merge request pleroma/pleroma!1973
| -rw-r--r-- | lib/pleroma/web/mastodon_api/views/conversation_view.ex | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/pleroma/web/mastodon_api/views/conversation_view.ex b/lib/pleroma/web/mastodon_api/views/conversation_view.ex index c5998e661..2220fbcb1 100644 --- 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 |