diff options
| author | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2019-07-09 15:35:28 +0000 |
|---|---|---|
| committer | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2019-07-09 15:35:28 +0000 |
| commit | 95c085174dc523f2898f02120d7ff0b120930d91 (patch) | |
| tree | 101ab8c43a0886b76a574478624058e2c0a29704 /lib | |
| parent | 376a55c97fcf178abec3091db830215642bf23c1 (diff) | |
| parent | abe2e8881f946aafc2012edd43373c22837387af (diff) | |
| download | pleroma-95c085174dc523f2898f02120d7ff0b120930d91.tar.gz pleroma-95c085174dc523f2898f02120d7ff0b120930d91.zip | |
Merge branch 'test-speedup' into 'develop'
Testing: Don't federate in testing.
See merge request pleroma/pleroma!1391
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/activity_pub/utils.ex | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/lib/pleroma/web/activity_pub/utils.ex b/lib/pleroma/web/activity_pub/utils.ex index 514266cee..4288ea4c8 100644 --- a/lib/pleroma/web/activity_pub/utils.ex +++ b/lib/pleroma/web/activity_pub/utils.ex @@ -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 |