forked from AkkomaGang/akkoma
Add ActivityPub.contain_activity checks to streamer
This commit is contained in:
parent
13c298d354
commit
fe4c1d26fc
1 changed files with 6 additions and 2 deletions
|
@ -12,6 +12,7 @@ defmodule Pleroma.Web.Streamer do
|
|||
alias Pleroma.User
|
||||
alias Pleroma.Web.ActivityPub.Visibility
|
||||
alias Pleroma.Web.MastodonAPI.NotificationView
|
||||
alias Pleroma.Web.ActivityPub.ActivityPub
|
||||
|
||||
@keepalive_interval :timer.seconds(30)
|
||||
|
||||
|
@ -203,7 +204,9 @@ def push_to_socket(topics, topic, %Activity{data: %{"type" => "Announce"}} = ite
|
|||
parent = Object.normalize(item.data["object"])
|
||||
|
||||
unless is_nil(parent) or item.actor in blocks or item.actor in mutes or
|
||||
parent.data["actor"] in blocks or parent.data["actor"] in mutes do
|
||||
not ActivityPub.contain_activity(item, user) or
|
||||
parent.data["actor"] in blocks or
|
||||
parent.data["actor"] in mutes do
|
||||
send(socket.transport_pid, {:text, represent_update(item, user)})
|
||||
end
|
||||
else
|
||||
|
@ -233,7 +236,8 @@ def push_to_socket(topics, topic, item) do
|
|||
blocks = user.info.blocks || []
|
||||
mutes = user.info.mutes || []
|
||||
|
||||
unless item.actor in blocks or item.actor in mutes do
|
||||
unless item.actor in blocks or item.actor in mutes or
|
||||
not ActivityPub.contain_activity(item, user) do
|
||||
send(socket.transport_pid, {:text, represent_update(item, user)})
|
||||
end
|
||||
else
|
||||
|
|
Loading…
Reference in a new issue