projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fix/mediaproxy-capture-content-disposition-filename' into 'develop'
[akkoma]
/
lib
/
pleroma
/
web
/
streamer.ex
diff --git
a/lib/pleroma/web/streamer.ex
b/lib/pleroma/web/streamer.ex
index ad888c36151675111f4326e950fd91a19adf0a4c..5850a9579decd78bba61b9d92b0e43f01215d27a 100644
(file)
--- a/
lib/pleroma/web/streamer.ex
+++ b/
lib/pleroma/web/streamer.ex
@@
-5,12
+5,13
@@
defmodule Pleroma.Web.Streamer do
use GenServer
require Logger
defmodule Pleroma.Web.Streamer do
use GenServer
require Logger
- alias Pleroma.User
- alias Pleroma.Notification
alias Pleroma.Activity
alias Pleroma.Activity
+ alias Pleroma.Notification
alias Pleroma.Object
alias Pleroma.Repo
alias Pleroma.Object
alias Pleroma.Repo
+ alias Pleroma.User
alias Pleroma.Web.ActivityPub.Visibility
alias Pleroma.Web.ActivityPub.Visibility
+ alias Pleroma.Web.MastodonAPI.NotificationView
@keepalive_interval :timer.seconds(30)
@keepalive_interval :timer.seconds(30)
@@
-106,10
+107,10
@@
defmodule Pleroma.Web.Streamer do
%{
event: "notification",
payload:
%{
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!()
|> Jason.encode!()
}
|> Jason.encode!()