diff options
author | lain <lain@soykaf.club> | 2020-05-08 13:13:37 +0200 |
---|---|---|
committer | lain <lain@soykaf.club> | 2020-05-08 13:13:37 +0200 |
commit | 7637ef42033b2da79ca61e9dee8fb4187d1a8257 (patch) | |
tree | 9b42481388e596d5b5c24a8e3fd22fcdcd69bb46 /lib/pleroma/web/mastodon_api/websocket_handler.ex | |
parent | fb2d284d2897e8b789da4f81ae8d288373d2bf76 (diff) | |
parent | fbcc53760e6fcd393513c05a5bd7a4a6a6f3b731 (diff) | |
download | pleroma-7637ef42033b2da79ca61e9dee8fb4187d1a8257.tar.gz |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
Diffstat (limited to 'lib/pleroma/web/mastodon_api/websocket_handler.ex')
-rw-r--r-- | lib/pleroma/web/mastodon_api/websocket_handler.ex | 2 |
1 files changed, 1 insertions, 1 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 |