X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Factivity_pub%2Fpipeline.ex;h=7ccee54c9d829d14204bde726a2958c6e41c54c5;hb=8cec5796aee7f4f5c963955727d80751a1491ee6;hp=cb3571917dc56ced4b5ec26207ab963d3c83174f;hpb=1bd1f62af55e01613e6362661b36a19091c87424;p=akkoma

diff --git a/lib/pleroma/web/activity_pub/pipeline.ex b/lib/pleroma/web/activity_pub/pipeline.ex
index cb3571917..7ccee54c9 100644
--- a/lib/pleroma/web/activity_pub/pipeline.ex
+++ b/lib/pleroma/web/activity_pub/pipeline.ex
@@ -1,5 +1,5 @@
 # Pleroma: A lightweight social networking server
-# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
 # SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule Pleroma.Web.ActivityPub.Pipeline do
@@ -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
@@ -35,7 +36,7 @@ defmodule Pleroma.Web.ActivityPub.Pipeline do
         {:ok, :not_federated}
       end
     else
-      _e -> {:error, "local not set in meta"}
+      _e -> {:error, :badarg}
     end
   end
 end