aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web/streamer.ex
diff options
context:
space:
mode:
authorkaniini <nenolod@gmail.com>2019-03-15 02:59:17 +0000
committerkaniini <nenolod@gmail.com>2019-03-15 02:59:17 +0000
commit0f42ea87d6bcb55d14a29c0ac4e600764359f30c (patch)
treef50d8718dea7981c2867bf9e94859c139d6bfbf1 /lib/pleroma/web/streamer.ex
parentc708656b5e4dd0a7c7f9ec5fb0116f542a85e309 (diff)
parent100413bf2c506ab96bc80927b9e774a91d179684 (diff)
downloadpleroma-0f42ea87d6bcb55d14a29c0ac4e600764359f30c.tar.gz
Merge branch 'notifications-is-seen' into 'develop'
MastoAPI notifications is_seen See merge request pleroma/pleroma!934
Diffstat (limited to 'lib/pleroma/web/streamer.ex')
-rw-r--r--lib/pleroma/web/streamer.ex9
1 files changed, 5 insertions, 4 deletions
diff --git a/lib/pleroma/web/streamer.ex b/lib/pleroma/web/streamer.ex
index aec11a79f..5850a9579 100644
--- a/lib/pleroma/web/streamer.ex
+++ b/lib/pleroma/web/streamer.ex
@@ -11,6 +11,7 @@ defmodule Pleroma.Web.Streamer do
alias Pleroma.Repo
alias Pleroma.User
alias Pleroma.Web.ActivityPub.Visibility
+ alias Pleroma.Web.MastodonAPI.NotificationView
@keepalive_interval :timer.seconds(30)
@@ -106,10 +107,10 @@ defmodule Pleroma.Web.Streamer do
%{
event: "notification",
payload:
- Pleroma.Web.MastodonAPI.MastodonAPIController.render_notification(
- socket.assigns["user"],
- item
- )
+ NotificationView.render("show.json", %{
+ notification: item,
+ for: socket.assigns["user"]
+ })
|> Jason.encode!()
}
|> Jason.encode!()