X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fpleroma%2Fweb%2Factivity_pub%2Fpipeline.ex;h=7ccee54c9d829d14204bde726a2958c6e41c54c5;hb=b6bed1a284ce07359642e0a884d2476ca387439d;hp=cb3571917dc56ced4b5ec26207ab963d3c83174f;hpb=1aa8aa7d7f14c553a8f0bf1ae82f1a1169cb0fc2;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
+# Copyright © 2017-2020 Pleroma Authors
# 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