diff options
| author | Alex Gleason <alex@alexgleason.me> | 2021-06-01 15:55:05 -0500 |
|---|---|---|
| committer | Alex Gleason <alex@alexgleason.me> | 2021-06-01 15:55:05 -0500 |
| commit | 9d89e1736a08d6c559355e52a996782994608cd4 (patch) | |
| tree | cf34422a48ea0e6cad4299db7816b094512416fe /lib/pleroma/web/activity_pub/mrf.ex | |
| parent | 9166ae1bcf8a8ec113bb21aab7effca5a14601ca (diff) | |
| parent | 3fe6ada6fc6f42057cb346c04e4ecc9f35c0e5cb (diff) | |
| download | pleroma-cycles-config-url.tar.gz | |
Merge remote-tracking branch 'pleroma/develop' into cycles-config-urlcycles-config-url
Diffstat (limited to 'lib/pleroma/web/activity_pub/mrf.ex')
| -rw-r--r-- | lib/pleroma/web/activity_pub/mrf.ex | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/pleroma/web/activity_pub/mrf.ex b/lib/pleroma/web/activity_pub/mrf.ex index ef5a09a93..f2fec3ff6 100644 --- a/lib/pleroma/web/activity_pub/mrf.ex +++ b/lib/pleroma/web/activity_pub/mrf.ex @@ -92,7 +92,9 @@ defmodule Pleroma.Web.ActivityPub.MRF do end def get_policies do - Pleroma.Config.get([:mrf, :policies], []) |> get_policies() + Pleroma.Config.get([:mrf, :policies], []) + |> get_policies() + |> Enum.concat([Pleroma.Web.ActivityPub.MRF.HashtagPolicy]) end defp get_policies(policy) when is_atom(policy), do: [policy] |