Merge branch 'test-speedup' into 'develop'

Testing: Don't federate in testing.

See merge request pleroma/pleroma!1391
This commit is contained in:
Haelwenn 2019-07-09 15:35:28 +00:00
commit 95c085174d
9 changed files with 70 additions and 10 deletions

View file

@ -170,14 +170,17 @@ defmodule Pleroma.Web.ActivityPub.Utils do
Enqueues an activity for federation if it's local
"""
def maybe_federate(%Activity{local: true} = activity) do
priority =
case activity.data["type"] do
"Delete" -> 10
"Create" -> 1
_ -> 5
end
if Pleroma.Config.get!([:instance, :federating]) do
priority =
case activity.data["type"] do
"Delete" -> 10
"Create" -> 1
_ -> 5
end
Pleroma.Web.Federator.publish(activity, priority)
end
Pleroma.Web.Federator.publish(activity, priority)
:ok
end