mirrors/pleroma
1
0
Fork 0
mirror of https://git.pleroma.social/pleroma/pleroma.git synced 2024-12-31 04:20:32 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse source 
Fix rendering conversations when there's a malformed status

Closes #1401

See merge request pleroma/pleroma!1973
This commit is contained in:
rinpatch 2019-11-14 14:40:37 +00:00
commit 09b4f7269e
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/pleroma/web/mastodon_api/views/conversation_view.ex
View file

@ -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