sam/pleroma
sam/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

federator: actually relay the public activities

Browse source
This commit is contained in:
William Pitcock 2018-08-06 07:43:37 +00:00
parent f9b0fc4ddb
commit 1c40a631e8
2 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
lib/pleroma/web/activity_pub/relay.ex
View file

@ -1,5 +1,5 @@
defmodule Pleroma.Web.ActivityPub.Relay do
alias Pleroma.User
alias Pleroma.{User, Object}
alias Pleroma.Web.ActivityPub.ActivityPub
require Logger
@ -30,4 +30,13 @@ def unfollow(target_instance) do
:ok
end
def publish(activity) do
with %User{} = user <- get_actor(),
%Object{} = object <- Object.normalize(activity.data["object"]["id"]) do
ActivityPub.announce(user, object)
else
e -> Logger.error("error: #{inspect(e)}")
end
end
end

4
lib/pleroma/web/federator/federator.ex
View file

@ -4,6 +4,7 @@ defmodule Pleroma.Web.Federator do
alias Pleroma.Activity
alias Pleroma.Web.{WebFinger, Websub}
alias Pleroma.Web.ActivityPub.ActivityPub
alias Pleroma.Web.ActivityPub.Relay
alias Pleroma.Web.ActivityPub.Transmogrifier
alias Pleroma.Web.ActivityPub.Utils
require Logger
@ -69,6 +70,9 @@ def handle(:publish, activity) do
Logger.info(fn -> "Sending #{activity.data["id"]} out via Salmon" end)
Pleroma.Web.Salmon.publish(actor, activity)
Logger.info(fn -> "Relaying #{activity.data["id"]} out" end)
Pleroma.Web.ActivityPub.Relay.publish(activity)
end
Logger.info(fn -> "Sending #{activity.data["id"]} out via AP" end)