projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix MRF policies to also work with Update
[akkoma]
/
lib
/
pleroma
/
web
/
activity_pub
/
mrf
/
simple_policy.ex
diff --git
a/lib/pleroma/web/activity_pub/mrf/simple_policy.ex
b/lib/pleroma/web/activity_pub/mrf/simple_policy.ex
index 415c5d2ddb87937605684f547bba6fe457426f03..a59212db461ab61fa9c22dbfc12cc159d17eab82 100644
(file)
--- a/
lib/pleroma/web/activity_pub/mrf/simple_policy.ex
+++ b/
lib/pleroma/web/activity_pub/mrf/simple_policy.ex
@@
-40,9
+40,9
@@
defmodule Pleroma.Web.ActivityPub.MRF.SimplePolicy do
defp check_media_removal(
%{host: actor_host} = _actor_info,
defp check_media_removal(
%{host: actor_host} = _actor_info,
- %{"type" =>
"Create"
, "object" => %{"attachment" => child_attachment}} = object
+ %{"type" =>
type
, "object" => %{"attachment" => child_attachment}} = object
)
)
- when length(child_attachment) > 0 do
+ when
type in ["Create", "Update"] and
length(child_attachment) > 0 do
media_removal =
instance_list(:media_removal)
|> MRF.subdomains_regex()
media_removal =
instance_list(:media_removal)
|> MRF.subdomains_regex()
@@
-63,10
+63,11
@@
defmodule Pleroma.Web.ActivityPub.MRF.SimplePolicy do
defp check_media_nsfw(
%{host: actor_host} = _actor_info,
%{
defp check_media_nsfw(
%{host: actor_host} = _actor_info,
%{
- "type" =>
"Create"
,
+ "type" =>
type
,
"object" => %{} = _child_object
} = object
"object" => %{} = _child_object
} = object
- ) do
+ )
+ when type in ["Create", "Update"] do
media_nsfw =
instance_list(:media_nsfw)
|> MRF.subdomains_regex()
media_nsfw =
instance_list(:media_nsfw)
|> MRF.subdomains_regex()