diff options
| author | lain <lain@soykaf.club> | 2020-03-26 17:24:10 +0100 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-03-26 17:24:10 +0100 |
| commit | 29ab1d9f8d7a73a3e2012eb480a927c3f5f63787 (patch) | |
| tree | 6699bf33f30163c2b2e46eb1bf10e4e3e84a6a98 | |
| parent | 0c60c0a76a2fcc8d13992b51704c21a35da10a0b (diff) | |
| parent | 69fc1dd69ff9d63af1785bb0701576cb5cde51f2 (diff) | |
| download | pleroma-29ab1d9f8d7a73a3e2012eb480a927c3f5f63787.tar.gz | |
Merge branch 'remake-remodel-2' of git.pleroma.social:pleroma/pleroma into remake-remodel-2
| -rw-r--r-- | lib/pleroma/web/activity_pub/pipeline.ex | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/pleroma/web/activity_pub/pipeline.ex b/lib/pleroma/web/activity_pub/pipeline.ex index eed53cd34..7ccee54c9 100644 --- a/lib/pleroma/web/activity_pub/pipeline.ex +++ b/lib/pleroma/web/activity_pub/pipeline.ex @@ -22,6 +22,7 @@ defmodule Pleroma.Web.ActivityPub.Pipeline do {_, {:ok, _}} <- {:federation, maybe_federate(activity, meta)} do {:ok, activity, meta} else + {:mrf_object, {:reject, _}} -> {:ok, nil, meta} e -> {:error, e} end end |