Merge branch 'remake-remodel-2' of git.pleroma.social:pleroma/pleroma into remake-remodel-2

2020-03-26 17:24:10 +01:00 · 2020-03-26 17:24:10 +01:00 · 29ab1d9f8d
parent 0c60c0a76a 69fc1dd69f
commit 29ab1d9f8d
1 changed files with 1 additions and 0 deletions
--- a/lib/pleroma/web/activity_pub/pipeline.ex
+++ b/lib/pleroma/web/activity_pub/pipeline.ex
@ -22,6 +22,7 @@ def common_pipeline(object, meta) do
         {_, {:ok, _}} <- {:federation, maybe_federate(activity, meta)} do
      {:ok, activity, meta}
    else
+      {:mrf_object, {:reject, _}} -> {:ok, nil, meta}
      e -> {:error, e}
    end
  end