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

[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 eed53cd34e4026f54e6997f4331ab1a647f35f8e..7ccee54c9d829d14204bde726a2958c6e41c54c5 100644 (file)
--- 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