diff options
author | rinpatch <rinpatch@sdf.org> | 2020-05-07 16:13:24 +0300 |
---|---|---|
committer | rinpatch <rinpatch@sdf.org> | 2020-05-07 16:13:24 +0300 |
commit | eb1f2fcbc62735a6e1a24c7c5591061d9391e808 (patch) | |
tree | fe9afca682be7065be21d86d2aab80b3bc0e0f17 | |
parent | b7635bf2b6c5251ffc8f3b3b8e1bc7ee9db83b7e (diff) | |
download | pleroma-eb1f2fcbc62735a6e1a24c7c5591061d9391e808.tar.gz |
Streamer: Fix wrong argument order when rendering activities to authenticated user
Closes #1747
-rw-r--r-- | lib/pleroma/web/mastodon_api/websocket_handler.ex | 2 | ||||
-rw-r--r-- | 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 index 6ef3fe2dd..e2ffd02d0 100644 --- 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 index 443868878..237b29ded 100644 --- 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: |