aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam Pitcock <nenolod@dereferenced.org>2018-09-28 00:44:15 +0000
committerWilliam Pitcock <nenolod@dereferenced.org>2018-09-28 00:45:10 +0000
commit707077edde1fd8b98d5a2e89f63a5f821e33bd0f (patch)
tree637adeb044e1be51e8b7e0221600b9c39c018861
parentdb989d1fa4d83ba5d726807ff4707eb8cee5010d (diff)
downloadpleroma-707077edde1fd8b98d5a2e89f63a5f821e33bd0f.tar.gz
activitypub: don't fall back to OStatus fetching when MRF rejects an object
-rw-r--r--lib/pleroma/web/activity_pub/activity_pub.ex3
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex
index 46dabd5de..e03e7c471 100644
--- a/lib/pleroma/web/activity_pub/activity_pub.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub.ex
@@ -756,6 +756,9 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
{:ok, activity} <- Transmogrifier.handle_incoming(params) do
{:ok, Object.normalize(activity.data["object"])}
else
+ {:reject, nil} ->
+ {:reject, nil}
+
object = %Object{} ->
{:ok, object}