projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Changed references of "Pleroma" to "Akkoma" in email text
[akkoma]
/
lib
/
pleroma
/
web
/
activity_pub
/
mrf
/
tag_policy.ex
diff --git
a/lib/pleroma/web/activity_pub/mrf/tag_policy.ex
b/lib/pleroma/web/activity_pub/mrf/tag_policy.ex
index 528093ac00e4ae78ee741246a6662f3583768c54..634b6a62f934b144a9198ceda3aff9e6bb3dcc0e 100644
(file)
--- a/
lib/pleroma/web/activity_pub/mrf/tag_policy.ex
+++ b/
lib/pleroma/web/activity_pub/mrf/tag_policy.ex
@@
-4,7
+4,7
@@
defmodule Pleroma.Web.ActivityPub.MRF.TagPolicy do
alias Pleroma.User
defmodule Pleroma.Web.ActivityPub.MRF.TagPolicy do
alias Pleroma.User
- @behaviour Pleroma.Web.ActivityPub.MRF
+ @behaviour Pleroma.Web.ActivityPub.MRF
.Policy
@moduledoc """
Apply policies based on user tags
@moduledoc """
Apply policies based on user tags
@@
-27,22
+27,22
@@
defmodule Pleroma.Web.ActivityPub.MRF.TagPolicy do
defp process_tag(
"mrf_tag:media-force-nsfw",
%{
defp process_tag(
"mrf_tag:media-force-nsfw",
%{
- "type" =>
"Create"
,
+ "type" =>
type
,
"object" => %{"attachment" => child_attachment}
} = message
)
"object" => %{"attachment" => child_attachment}
} = message
)
- when length(child_attachment) > 0 do
+ when length(child_attachment) > 0
and type in ["Create", "Update"]
do
{:ok, Kernel.put_in(message, ["object", "sensitive"], true)}
end
defp process_tag(
"mrf_tag:media-strip",
%{
{:ok, Kernel.put_in(message, ["object", "sensitive"], true)}
end
defp process_tag(
"mrf_tag:media-strip",
%{
- "type" =>
"Create"
,
+ "type" =>
type
,
"object" => %{"attachment" => child_attachment} = object
} = message
)
"object" => %{"attachment" => child_attachment} = object
} = message
)
- when length(child_attachment) > 0 do
+ when length(child_attachment) > 0
and type in ["Create", "Update"]
do
object = Map.delete(object, "attachment")
message = Map.put(message, "object", object)
object = Map.delete(object, "attachment")
message = Map.put(message, "object", object)
@@
-52,13
+52,14
@@
defmodule Pleroma.Web.ActivityPub.MRF.TagPolicy do
defp process_tag(
"mrf_tag:force-unlisted",
%{
defp process_tag(
"mrf_tag:force-unlisted",
%{
- "type" =>
"Create"
,
+ "type" =>
type
,
"to" => to,
"cc" => cc,
"actor" => actor,
"object" => object
} = message
"to" => to,
"cc" => cc,
"actor" => actor,
"object" => object
} = message
- ) do
+ )
+ when type in ["Create", "Update"] do
user = User.get_cached_by_ap_id(actor)
if Enum.member?(to, Pleroma.Constants.as_public()) do
user = User.get_cached_by_ap_id(actor)
if Enum.member?(to, Pleroma.Constants.as_public()) do
@@
-85,13
+86,14
@@
defmodule Pleroma.Web.ActivityPub.MRF.TagPolicy do
defp process_tag(
"mrf_tag:sandbox",
%{
defp process_tag(
"mrf_tag:sandbox",
%{
- "type" =>
"Create"
,
+ "type" =>
type
,
"to" => to,
"cc" => cc,
"actor" => actor,
"object" => object
} = message
"to" => to,
"cc" => cc,
"actor" => actor,
"object" => object
} = message
- ) do
+ )
+ when type in ["Create", "Update"] do
user = User.get_cached_by_ap_id(actor)
if Enum.member?(to, Pleroma.Constants.as_public()) or
user = User.get_cached_by_ap_id(actor)
if Enum.member?(to, Pleroma.Constants.as_public()) or
@@
-152,7
+154,7
@@
defmodule Pleroma.Web.ActivityPub.MRF.TagPolicy do
do: filter_message(target_actor, message)
@impl true
do: filter_message(target_actor, message)
@impl true
- def filter(%{"actor" => actor, "type" =>
"Create"} = message)
,
+ def filter(%{"actor" => actor, "type" =>
type} = message) when type in ["Create", "Update"]
,
do: filter_message(actor, message)
@impl true
do: filter_message(actor, message)
@impl true