diff options
| author | Alex Gleason <alex@alexgleason.me> | 2021-05-28 13:38:44 -0500 |
|---|---|---|
| committer | Alex Gleason <alex@alexgleason.me> | 2021-05-28 13:38:44 -0500 |
| commit | 05b47aacd25a86ba6dfcdd6577c6c558229c8e95 (patch) | |
| tree | e4ecd6498fc64a78bf8d92c2ca6e8f8edc0fbcfe /lib/pleroma/web/activity_pub/mrf.ex | |
| parent | 9b0b0842ce2b0b9a870f57e16025160855aa4c11 (diff) | |
| parent | 7ad87571bdcd39959280d15f5bfe4175e04c442c (diff) | |
| download | pleroma-endpoint-url.tar.gz | |
Merge remote-tracking branch 'pleroma/develop' into endpoint-urlendpoint-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] |