logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma
commit: a83c116df7527b9ae05b73f5ec5da69c0f123e04
parent: 91e2bcf218e0bfda7a1f1e355754147099063356
Author: kaniini <ariadne@dereferenced.org>
Date:   Fri, 27 Sep 2019 06:17:40 +0000

Merge branch 'fix/subscription-notification-view' into 'develop'

Fix SubscriptionNotificationView

See merge request pleroma/pleroma!1727

Diffstat:

Mlib/pleroma/web/pleroma_api/views/subscription_notification_view.ex6+++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/pleroma/web/pleroma_api/views/subscription_notification_view.ex b/lib/pleroma/web/pleroma_api/views/subscription_notification_view.ex @@ -36,19 +36,19 @@ defmodule Pleroma.Web.PleromaAPI.SubscriptionNotificationView do "mention" -> response |> Map.merge(%{ - status: StatusView.render("status.json", %{activity: activity, for: user}) + status: StatusView.render("show.json", %{activity: activity, for: user}) }) "favourite" -> response |> Map.merge(%{ - status: StatusView.render("status.json", %{activity: parent_activity, for: user}) + status: StatusView.render("show.json", %{activity: parent_activity, for: user}) }) "reblog" -> response |> Map.merge(%{ - status: StatusView.render("status.json", %{activity: parent_activity, for: user}) + status: StatusView.render("show.json", %{activity: parent_activity, for: user}) }) "follow" ->