projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'origin/develop' into feature/embeddable-posts
[akkoma]
/
lib
/
pleroma
/
web
/
views
/
streamer_view.ex
diff --git
a/lib/pleroma/web/views/streamer_view.ex
b/lib/pleroma/web/views/streamer_view.ex
index b13030fa0a13ba2a78634f4cc7263558b58a0ba4..237b29ded98ba4082ba6b49e22f7efb267400e42 100644
(file)
--- a/
lib/pleroma/web/views/streamer_view.ex
+++ b/
lib/pleroma/web/views/streamer_view.ex
@@
-1,5
+1,5
@@
# Pleroma: A lightweight social networking server
# Pleroma: A lightweight social networking server
-# Copyright © 2017-20
19
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-20
20
Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.StreamerView do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.StreamerView do
@@
-16,7
+16,7
@@
defmodule Pleroma.Web.StreamerView do
event: "update",
payload:
Pleroma.Web.MastodonAPI.StatusView.render(
event: "update",
payload:
Pleroma.Web.MastodonAPI.StatusView.render(
- "s
tatus
.json",
+ "s
how
.json",
activity: activity,
for: user
)
activity: activity,
for: user
)
@@
-25,7
+25,7
@@
defmodule Pleroma.Web.StreamerView do
|> Jason.encode!()
end
|> Jason.encode!()
end
- def render("notification.json", %
User{} = user, %Notification{} = notify
) do
+ def render("notification.json", %
Notification{} = notify, %User{} = user
) do
%{
event: "notification",
payload:
%{
event: "notification",
payload:
@@
-43,7
+43,7
@@
defmodule Pleroma.Web.StreamerView do
event: "update",
payload:
Pleroma.Web.MastodonAPI.StatusView.render(
event: "update",
payload:
Pleroma.Web.MastodonAPI.StatusView.render(
- "s
tatus
.json",
+ "s
how
.json",
activity: activity
)
|> Jason.encode!()
activity: activity
)
|> Jason.encode!()