Merge branch 'develop' into 'remove-twitter-api'

[akkoma] / lib / pleroma / plugs / federating_plug.ex

diff --git a/lib/pleroma/plugs/federating_plug.ex b/lib/pleroma/plugs/federating_plug.ex
index 7d947339fe1f0e7d00eb7e148ef5a33a7bdd8a9c..09038f3c6142f87b4e6c0e5174418bc20bdba6e2 100644 (file)
--- a/lib/pleroma/plugs/federating_plug.ex
+++ b/lib/pleroma/plugs/federating_plug.ex
@@ -19,6 +19,9 @@ defmodule Pleroma.Web.FederatingPlug do
 
   def federating?, do: Pleroma.Config.get([:instance, :federating])
 
+  # Definition for the use in :if_func / :unless_func plug options
+  def federating?(_conn), do: federating?()
+
   defp fail(conn) do
     conn
     |> put_status(404)