diff options
| author | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2020-09-15 08:25:10 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2020-09-17 19:50:23 +0300 |
| commit | 0465bdbd49ad729e9aec0b3f330607386f433d5d (patch) | |
| tree | 431a251c976a377797e3100abc91ce869d685f2f /lib | |
| parent | bb70b231d023c6e9f998a6be58f66ae3ff603157 (diff) | |
| download | pleroma-0465bdbd49ad729e9aec0b3f330607386f433d5d.tar.gz | |
Merge branch 'fix/mrf-simple-welcome-chats' into 'develop'
Ensure we only apply media_nsfw simple policy on parsable objects
Closes #2133
See merge request pleroma/pleroma!2992
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/activity_pub/mrf/simple_policy.ex | 3 | ||||
| -rw-r--r-- | lib/pleroma/web/activity_pub/transmogrifier.ex | 2 |
2 files changed, 3 insertions, 2 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() diff --git a/lib/pleroma/web/activity_pub/transmogrifier.ex b/lib/pleroma/web/activity_pub/transmogrifier.ex index 76298c4a0..63dd227c1 100644 --- a/lib/pleroma/web/activity_pub/transmogrifier.ex +++ b/lib/pleroma/web/activity_pub/transmogrifier.ex @@ -311,7 +311,7 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do def fix_emoji(%{"tag" => tags} = object) when is_list(tags) do emoji = tags - |> Enum.filter(fn data -> data["type"] == "Emoji" and data["icon"] end) + |> Enum.filter(fn data -> is_map(data) and data["type"] == "Emoji" and data["icon"] end) |> Enum.reduce(%{}, fn data, mapping -> name = String.trim(data["name"], ":") |