diff options
author | lain <lain@soykaf.club> | 2020-05-07 18:53:34 +0200 |
---|---|---|
committer | lain <lain@soykaf.club> | 2020-05-07 18:53:34 +0200 |
commit | ef55d240540ed9fbac76248c60bdb23f82c3f36e (patch) | |
tree | e65130d12a256026edb1a4768fc97e2271173248 /lib/pleroma/web/mastodon_api/websocket_handler.ex | |
parent | 7ac0cffb34567dd72877e13968a10d206f643ad8 (diff) | |
parent | bef08b85e5e1e25b65851938d6152bf0c170af03 (diff) | |
download | pleroma-ef55d240540ed9fbac76248c60bdb23f82c3f36e.tar.gz |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/emojireactvalidator
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 |