diff options
| author | rinpatch <rinpatch@sdf.org> | 2020-09-17 19:09:10 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2020-09-17 19:09:10 +0000 |
| commit | a0f5e8b27edbe2224d9c2c3997ad5b8ea484244b (patch) | |
| tree | 4a7a0f02e5880b7dff3ac20eaf59d71c7b584e5e /lib/pleroma/web/activity_pub/mrf/simple_policy.ex | |
| parent | 425324aae3d4534bc045466a1cc15653ddfa27d2 (diff) | |
| parent | 34afc2b0745b39861d9381e69cdb4b9c158f86ee (diff) | |
| download | pleroma-2.1.2.tar.gz | |
Merge branch 'release/2.1.2' into 'stable'v2.1.2
Release/2.1.2
See merge request pleroma/secteam/pleroma!17
Diffstat (limited to 'lib/pleroma/web/activity_pub/mrf/simple_policy.ex')
| -rw-r--r-- | lib/pleroma/web/activity_pub/mrf/simple_policy.ex | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/pleroma/web/activity_pub/mrf/simple_policy.ex b/lib/pleroma/web/activity_pub/mrf/simple_policy.ex index bb193475a..161177727 100644 --- a/lib/pleroma/web/activity_pub/mrf/simple_policy.ex +++ b/lib/pleroma/web/activity_pub/mrf/simple_policy.ex @@ -66,7 +66,8 @@ defmodule Pleroma.Web.ActivityPub.MRF.SimplePolicy do "type" => "Create", "object" => child_object } = object - ) do + ) + when is_map(child_object) do media_nsfw = Config.get([:mrf_simple, :media_nsfw]) |> MRF.subdomains_regex() |