diff options
| author | lain <lain@soykaf.club> | 2020-05-20 16:36:55 +0200 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-05-20 16:36:55 +0200 |
| commit | 39031f4860c91dee9418f69cc3b295cdfc9316bd (patch) | |
| tree | b4ff487918b8418c819a60020804144a781d89df /lib | |
| parent | e42bc5f55732d42bf40ed9129ec737e654a911b8 (diff) | |
| download | pleroma-39031f4860c91dee9418f69cc3b295cdfc9316bd.tar.gz pleroma-39031f4860c91dee9418f69cc3b295cdfc9316bd.zip | |
Pipeline: Don't federate if federation is disabled.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/activity_pub/pipeline.ex | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/pleroma/web/activity_pub/pipeline.ex b/lib/pleroma/web/activity_pub/pipeline.ex index 657cdfdb1..1d6bc2000 100644 --- a/lib/pleroma/web/activity_pub/pipeline.ex +++ b/lib/pleroma/web/activity_pub/pipeline.ex @@ -11,6 +11,7 @@ defmodule Pleroma.Web.ActivityPub.Pipeline do alias Pleroma.Web.ActivityPub.ObjectValidator alias Pleroma.Web.ActivityPub.SideEffects alias Pleroma.Web.Federator + alias Pleroma.Config @spec common_pipeline(map(), keyword()) :: {:ok, Activity.t() | Object.t(), keyword()} | {:error, any()} @@ -44,7 +45,7 @@ defmodule Pleroma.Web.ActivityPub.Pipeline do defp maybe_federate(%Activity{} = activity, meta) do with {:ok, local} <- Keyword.fetch(meta, :local) do - do_not_federate = meta[:do_not_federate] + do_not_federate = meta[:do_not_federate] || !Config.get([:instance, :federating]) if !do_not_federate && local do Federator.publish(activity) |