logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma
commit: 3fa2ac68df10f6ffe3c1ea76fa10c30da90f4bd0
parent: c07efd5b42aad48ad6dbbb5a029b096086929b3f
Author: lain <lain@soykaf.club>
Date:   Tue, 18 Feb 2020 14:36:10 +0000

Merge branch 'chore/standardize-mrf-behavior' into 'develop'

Standardize @behaviour usage in MRFs

See merge request pleroma/pleroma!2212

Diffstat:

Mlib/pleroma/web/activity_pub/mrf/object_age_policy.ex3+--
Mlib/pleroma/web/activity_pub/mrf/simple_policy.ex2+-
Mlib/pleroma/web/activity_pub/mrf/subchain_policy.ex2+-
3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/lib/pleroma/web/activity_pub/mrf/object_age_policy.ex b/lib/pleroma/web/activity_pub/mrf/object_age_policy.ex @@ -5,12 +5,11 @@ defmodule Pleroma.Web.ActivityPub.MRF.ObjectAgePolicy do alias Pleroma.Config alias Pleroma.User - alias Pleroma.Web.ActivityPub.MRF require Pleroma.Constants @moduledoc "Filter activities depending on their age" - @behaviour MRF + @behaviour Pleroma.Web.ActivityPub.MRF defp check_date(%{"published" => published} = message) do with %DateTime{} = now <- DateTime.utc_now(), diff --git a/lib/pleroma/web/activity_pub/mrf/simple_policy.ex b/lib/pleroma/web/activity_pub/mrf/simple_policy.ex @@ -6,7 +6,7 @@ defmodule Pleroma.Web.ActivityPub.MRF.SimplePolicy do alias Pleroma.User alias Pleroma.Web.ActivityPub.MRF @moduledoc "Filter activities depending on their origin instance" - @behaviour MRF + @behaviour Pleroma.Web.ActivityPub.MRF require Pleroma.Constants diff --git a/lib/pleroma/web/activity_pub/mrf/subchain_policy.ex b/lib/pleroma/web/activity_pub/mrf/subchain_policy.ex @@ -8,7 +8,7 @@ defmodule Pleroma.Web.ActivityPub.MRF.SubchainPolicy do require Logger - @behaviour MRF + @behaviour Pleroma.Web.ActivityPub.MRF defp lookup_subchain(actor) do with matches <- Config.get([:mrf_subchain, :match_actor]),