alias Pleroma.Activity
alias Pleroma.Object
alias Pleroma.Repo
- alias Pleroma.Web.ActivityPub.ActivityPub
+ alias Pleroma.Web.ActivityPub.Visibility
@keepalive_interval :timer.seconds(30)
def handle_cast(%{action: :stream, topic: "list", item: item}, topics) do
# filter the recipient list if the activity is not public, see #270.
recipient_lists =
- case ActivityPub.is_public?(item) do
+ case Visibility.is_public?(item) do
true ->
Pleroma.List.get_lists_from_activity(item)
|> Enum.filter(fn list ->
owner = Repo.get(User, list.user_id)
- ActivityPub.visible_for_user?(item, owner)
+ Visibility.visible_for_user?(item, owner)
end)
end
if socket.assigns[:user] do
user = User.get_cached_by_ap_id(socket.assigns[:user].ap_id)
blocks = user.info.blocks || []
+ mutes = user.info.mutes || []
parent = Object.normalize(item.data["object"])
- unless is_nil(parent) or item.actor in blocks or parent.data["actor"] in blocks do
+ 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
send(socket.transport_pid, {:text, represent_update(item, user)})
end
else
if socket.assigns[:user] do
user = User.get_cached_by_ap_id(socket.assigns[:user].ap_id)
blocks = user.info.blocks || []
+ mutes = user.info.mutes || []
- unless item.actor in blocks do
+ unless item.actor in blocks or item.actor in mutes do
send(socket.transport_pid, {:text, represent_update(item, user)})
end
else