projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ActivityPub: Fix deletes being exempt from MRF
[akkoma]
/
lib
/
pleroma
/
web
/
activity_pub
/
publisher.ex
diff --git
a/lib/pleroma/web/activity_pub/publisher.ex
b/lib/pleroma/web/activity_pub/publisher.ex
index c39e89a6a039a11f7044cd1db7b5483291ca48ef..4ea37fc7ba8f2d5944963c8e4957dd7766041957 100644
(file)
--- a/
lib/pleroma/web/activity_pub/publisher.ex
+++ b/
lib/pleroma/web/activity_pub/publisher.ex
@@
-86,6
+86,15
@@
defmodule Pleroma.Web.ActivityPub.Publisher do
end
end
end
end
+ def publish_one(%{actor_id: actor_id} = params) do
+ actor = User.get_cached_by_id(actor_id)
+
+ params
+ |> Map.delete(:actor_id)
+ |> Map.put(:actor, actor)
+ |> publish_one()
+ end
+
defp should_federate?(inbox, public) do
if public do
true
defp should_federate?(inbox, public) do
if public do
true
@@
-102,11
+111,11
@@
defmodule Pleroma.Web.ActivityPub.Publisher do
@spec recipients(User.t(), Activity.t()) :: list(User.t()) | []
defp recipients(actor, activity) do
@spec recipients(User.t(), Activity.t()) :: list(User.t()) | []
defp recipients(actor, activity) do
-
{:ok, followers}
=
+
followers
=
if actor.follower_address in activity.recipients do
User.get_external_followers(actor)
else
if actor.follower_address in activity.recipients do
User.get_external_followers(actor)
else
- {:ok, []}
+ []
end
fetchers =
end
fetchers =
@@
-120,7
+129,7
@@
defmodule Pleroma.Web.ActivityPub.Publisher do
[]
end
[]
end
- Pleroma.Web.
Salmon
.remote_users(actor, activity) ++ followers ++ fetchers
+ Pleroma.Web.
Federator.Publisher
.remote_users(actor, activity) ++ followers ++ fetchers
end
defp get_cc_ap_ids(ap_id, recipients) do
end
defp get_cc_ap_ids(ap_id, recipients) do
@@
-131,7
+140,7
@@
defmodule Pleroma.Web.ActivityPub.Publisher do
|> Enum.map(& &1.ap_id)
end
|> Enum.map(& &1.ap_id)
end
- defp maybe_use_sharedinbox(%User{
info: %{source_data: data}
}),
+ defp maybe_use_sharedinbox(%User{
source_data: data
}),
do: (is_map(data["endpoints"]) && Map.get(data["endpoints"], "sharedInbox")) || data["inbox"]
@doc """
do: (is_map(data["endpoints"]) && Map.get(data["endpoints"], "sharedInbox")) || data["inbox"]
@doc """
@@
-147,7
+156,7
@@
defmodule Pleroma.Web.ActivityPub.Publisher do
"""
def determine_inbox(
%Activity{data: activity_data},
"""
def determine_inbox(
%Activity{data: activity_data},
- %User{
info: %{source_data: data}
} = user
+ %User{
source_data: data
} = user
) do
to = activity_data["to"] || []
cc = activity_data["cc"] || []
) do
to = activity_data["to"] || []
cc = activity_data["cc"] || []
@@
-172,7
+181,8
@@
defmodule Pleroma.Web.ActivityPub.Publisher do
Publishes an activity with BCC to all relevant peers.
"""
Publishes an activity with BCC to all relevant peers.
"""
- def publish(actor, %{data: %{"bcc" => bcc}} = activity) when is_list(bcc) and bcc != [] do
+ def publish(%User{} = actor, %{data: %{"bcc" => bcc}} = activity)
+ when is_list(bcc) and bcc != [] do
public = is_public?(activity)
{:ok, data} = Transmogrifier.prepare_outgoing(activity.data)
public = is_public?(activity)
{:ok, data} = Transmogrifier.prepare_outgoing(activity.data)
@@
-180,12
+190,12
@@
defmodule Pleroma.Web.ActivityPub.Publisher do
recipients
|> Enum.filter(&User.ap_enabled?/1)
recipients
|> Enum.filter(&User.ap_enabled?/1)
- |> Enum.map(fn %{
info: %{source_data: data}
} -> data["inbox"] end)
+ |> Enum.map(fn %{
source_data: data
} -> data["inbox"] end)
|> Enum.filter(fn inbox -> should_federate?(inbox, public) end)
|> Instances.filter_reachable()
|> Enum.each(fn {inbox, unreachable_since} ->
%User{ap_id: ap_id} =
|> Enum.filter(fn inbox -> should_federate?(inbox, public) end)
|> Instances.filter_reachable()
|> Enum.each(fn {inbox, unreachable_since} ->
%User{ap_id: ap_id} =
- Enum.find(recipients, fn %{
info: %{source_data: data}
} -> data["inbox"] == inbox end)
+ Enum.find(recipients, fn %{
source_data: data
} -> data["inbox"] == inbox end)
# Get all the recipients on the same host and add them to cc. Otherwise, a remote
# instance would only accept a first message for the first recipient and ignore the rest.
# Get all the recipients on the same host and add them to cc. Otherwise, a remote
# instance would only accept a first message for the first recipient and ignore the rest.
@@
-199,7
+209,7
@@
defmodule Pleroma.Web.ActivityPub.Publisher do
Pleroma.Web.Federator.Publisher.enqueue_one(__MODULE__, %{
inbox: inbox,
json: json,
Pleroma.Web.Federator.Publisher.enqueue_one(__MODULE__, %{
inbox: inbox,
json: json,
- actor
: actor
,
+ actor
_id: actor.id
,
id: activity.data["id"],
unreachable_since: unreachable_since
})
id: activity.data["id"],
unreachable_since: unreachable_since
})
@@
-234,7
+244,7
@@
defmodule Pleroma.Web.ActivityPub.Publisher do
%{
inbox: inbox,
json: json,
%{
inbox: inbox,
json: json,
- actor
: actor
,
+ actor
_id: actor.id
,
id: activity.data["id"],
unreachable_since: unreachable_since
}
id: activity.data["id"],
unreachable_since: unreachable_since
}