projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'feature/return-link-for-password-reset' into 'develop'
[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..3866daceee4b57a1e8ddf049aaa3b8653bb47cd5 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 =
@@
-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)
@@
-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
}