hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'safe-render-activities' into 'develop'

Browse source 
Views: wrap activity rendering in a rescue

See merge request pleroma/pleroma!723
This commit is contained in:
lambda 2019-01-27 20:10:09 +00:00
commit 16ab1437d6
3 changed files with 29 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/pleroma/web/mastodon_api/views/status_view.ex
View file

@ -49,7 +49,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do
replied_to_activities = get_replied_to_activities(opts.activities)
opts.activities
|> render_many(
|> safe_render_many(
StatusView,
"status.json",
Map.put(opts, :replied_to_activities, replied_to_activities)