diff options
author | Roman Chvanikov <chvanikoff@pm.me> | 2020-04-23 02:03:02 +0300 |
---|---|---|
committer | Roman Chvanikov <chvanikoff@pm.me> | 2020-04-23 02:03:02 +0300 |
commit | 416a37fcefbd38d01a46b15e6af039b99a22ee0b (patch) | |
tree | 3c3c4506ad41fb227411facc37e1581ab29d8f25 /lib/pleroma/web/streamer | |
parent | 8b522b3b3fead67e6d1c017b79758c12e3b133af (diff) | |
parent | 850377a7b8d380088d8717d82b09a2976bbdd739 (diff) | |
download | pleroma-416a37fcefbd38d01a46b15e6af039b99a22ee0b.tar.gz |
Merge branch 'develop' into refactor/fe-bundles
Diffstat (limited to 'lib/pleroma/web/streamer')
-rw-r--r-- | lib/pleroma/web/streamer/worker.ex | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/lib/pleroma/web/streamer/worker.ex b/lib/pleroma/web/streamer/worker.ex index abfed21c8..f6160fa4d 100644 --- a/lib/pleroma/web/streamer/worker.ex +++ b/lib/pleroma/web/streamer/worker.ex @@ -158,24 +158,6 @@ defmodule Pleroma.Web.Streamer.Worker do should_send?(user, activity) end - def push_to_socket(topics, topic, %Activity{data: %{"type" => "Announce"}} = item) do - Enum.each(topics[topic] || [], fn %StreamerSocket{ - transport_pid: transport_pid, - user: socket_user - } -> - # Get the current user so we have up-to-date blocks etc. - if socket_user do - user = User.get_cached_by_ap_id(socket_user.ap_id) - - if should_send?(user, item) do - send(transport_pid, {:text, StreamerView.render("update.json", item, user)}) - end - else - send(transport_pid, {:text, StreamerView.render("update.json", item)}) - end - end) - end - def push_to_socket(topics, topic, %Participation{} = participation) do Enum.each(topics[topic] || [], fn %StreamerSocket{transport_pid: transport_pid} -> send(transport_pid, {:text, StreamerView.render("conversation.json", participation)}) |