projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'release/2.2.1' into 'stable'
[akkoma]
/
lib
/
pleroma
/
web
/
activity_pub
/
pipeline.ex
diff --git
a/lib/pleroma/web/activity_pub/pipeline.ex
b/lib/pleroma/web/activity_pub/pipeline.ex
index 36e325c373d1463c9ac21f7a51913bf440201617..2db86f116cde6ad9f540e681ff9552dd4e5fcb50 100644
(file)
--- a/
lib/pleroma/web/activity_pub/pipeline.ex
+++ b/
lib/pleroma/web/activity_pub/pipeline.ex
@@
-26,13
+26,17
@@
defmodule Pleroma.Web.ActivityPub.Pipeline do
{:error, e} ->
{:error, e}
{:error, e} ->
{:error, e}
+
+ {:reject, e} ->
+ {:reject, e}
end
end
def do_common_pipeline(object, meta) do
with {_, {:ok, validated_object, meta}} <-
{:validate_object, ObjectValidator.validate(object, meta)},
end
end
def do_common_pipeline(object, meta) do
with {_, {:ok, validated_object, meta}} <-
{:validate_object, ObjectValidator.validate(object, meta)},
- {_, {:ok, mrfd_object}} <- {:mrf_object, MRF.filter(validated_object)},
+ {_, {:ok, mrfd_object, meta}} <-
+ {:mrf_object, MRF.pipeline_filter(validated_object, meta)},
{_, {:ok, activity, meta}} <-
{:persist_object, ActivityPub.persist(mrfd_object, meta)},
{_, {:ok, activity, meta}} <-
{_, {:ok, activity, meta}} <-
{:persist_object, ActivityPub.persist(mrfd_object, meta)},
{_, {:ok, activity, meta}} <-
@@
-40,7
+44,7
@@
defmodule Pleroma.Web.ActivityPub.Pipeline do
{_, {:ok, _}} <- {:federation, maybe_federate(activity, meta)} do
{:ok, activity, meta}
else
{_, {:ok, _}} <- {:federation, maybe_federate(activity, meta)} do
{:ok, activity, meta}
else
- {:mrf_object, {:reject,
_}} -> {:ok, nil, meta
}
+ {:mrf_object, {:reject,
message, _}} -> {:reject, message
}
e -> {:error, e}
end
end
e -> {:error, e}
end
end