Browse Source

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

Closes #1747
2168-media-preview-proxy
rinpatch 4 years ago
parent
commit
eb1f2fcbc6
2 changed files with 2 additions and 2 deletions
  1. +1
    -1
      lib/pleroma/web/mastodon_api/websocket_handler.ex
  2. +1
    -1
      lib/pleroma/web/views/streamer_view.ex

+ 1
- 1
lib/pleroma/web/mastodon_api/websocket_handler.ex View File

@@ -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


+ 1
- 1
lib/pleroma/web/views/streamer_view.ex View File

@@ -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:


Loading…
Cancel
Save