pleroma

commit: 9f2bb22e1550963ed6f1e78adf0774369c9ec829
parent: b7635bf2b6c5251ffc8f3b3b8e1bc7ee9db83b7e
Author: rinpatch <rinpatch@sdf.org>
Date:   Thu,  7 May 2020 13:26:29 +0000

Merge branch 'fix/streamer-wrong-arg-order' into 'develop'

Streamer: Fix wrong argument order when rendering activities to authenticated user

Closes #1747

See merge request pleroma/pleroma!2490
Diffstat:
M
lib/pleroma/web/mastodon_api/websocket_handler.ex
2
+-
M
lib/pleroma/web/views/streamer_view.ex
2
+-

2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/pleroma/web/mastodon_api/websocket_handler.ex b/lib/pleroma/web/mastodon_api/websocket_handler.ex
@@ -78,7 +78,7 @@ defmodule Pleroma.Web.MastodonAPI.WebsocketHandler do
     user = %User{} = User.get_cached_by_ap_id(state.user.ap_id)
 
     unless Streamer.filtered_by_user?(user, item) do
-      websocket_info({:text, view.render(template, user, item)}, %{state | user: user})
+      websocket_info({:text, view.render(template, item, user)}, %{state | user: user})
     else
       {:ok, state}
     end
diff --git a/lib/pleroma/web/views/streamer_view.ex b/lib/pleroma/web/views/streamer_view.ex
@@ -25,7 +25,7 @@ defmodule Pleroma.Web.StreamerView do
     |> Jason.encode!()
   end
 
-  def render("notification.json", %User{} = user, %Notification{} = notify) do
+  def render("notification.json", %Notification{} = notify, %User{} = user) do
     %{
       event: "notification",
       payload: