diff options
| author | rinpatch <rinpatch@sdf.org> | 2019-11-19 20:04:19 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2019-11-19 20:04:19 +0000 |
| commit | 0ba3f1ffb28792c21809fa9a30fc03a7a52d9361 (patch) | |
| tree | 0b1a885f966c36e296d8d48048ddf25fc30b7a93 /lib/pleroma/web/mastodon_api/controllers | |
| parent | 36f4382b3367a889a191b124066fbbafab37d047 (diff) | |
| parent | 34206e4d7f2f5abe896882874e142374d987c44f (diff) | |
| download | pleroma-1.1.6.tar.gz | |
Merge branch 'release/1.1.6' into 'stable'v1.1.6
Release/1.1.6
See merge request pleroma/pleroma!1995
Diffstat (limited to 'lib/pleroma/web/mastodon_api/controllers')
| -rw-r--r-- | lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex b/lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex index 863d673ea..a5de1fecd 100644 --- a/lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex +++ b/lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex @@ -1671,9 +1671,10 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do participations = Participation.for_user_with_last_activity_id(user, params) conversations = - Enum.map(participations, fn participation -> - ConversationView.render("participation.json", %{participation: participation, for: user}) - end) + ConversationView.safe_render_many(participations, ConversationView, "participation.json", %{ + as: :participation, + for: user + }) conn |> add_link_headers(:conversations, participations) |