summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkaniini <ariadne@dereferenced.org>2019-09-27 06:17:40 +0000
committerkaniini <ariadne@dereferenced.org>2019-09-27 06:17:40 +0000
commita83c116df7527b9ae05b73f5ec5da69c0f123e04 (patch)
tree413edffaef36d60f94ebbecfa7f64dccb1fef459
parent91e2bcf218e0bfda7a1f1e355754147099063356 (diff)
parent6c7c35dbe11c3871eea1a1c5745befdc2068e526 (diff)
downloadpleroma-a83c116df7527b9ae05b73f5ec5da69c0f123e04.tar.gz
pleroma-a83c116df7527b9ae05b73f5ec5da69c0f123e04.zip
Merge branch 'fix/subscription-notification-view' into 'develop'
Fix SubscriptionNotificationView See merge request pleroma/pleroma!1727
-rw-r--r--lib/pleroma/web/pleroma_api/views/subscription_notification_view.ex6
1 files 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
index 0eccbcbb9..fc41a7389 100644
--- 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" ->