diff options
| author | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2020-09-15 08:25:10 +0000 |
|---|---|---|
| committer | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2020-09-15 08:25:10 +0000 |
| commit | 5c4ff5c73ce41f252e99a3c5c445efcecaa43dfe (patch) | |
| tree | 92f0c2dc990f8beb5040a2f280d056d690e952ea /lib | |
| parent | 39d769f25057dbaf89dc23d39941780bc65c2b06 (diff) | |
| parent | 0b66e806e32055b625560eb06b9300cc856f9789 (diff) | |
| download | pleroma-5c4ff5c73ce41f252e99a3c5c445efcecaa43dfe.tar.gz pleroma-5c4ff5c73ce41f252e99a3c5c445efcecaa43dfe.zip | |
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 af4384213..8fe430644 100644 --- a/lib/pleroma/web/activity_pub/transmogrifier.ex +++ b/lib/pleroma/web/activity_pub/transmogrifier.ex @@ -309,7 +309,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"], ":") |