From 707077edde1fd8b98d5a2e89f63a5f821e33bd0f Mon Sep 17 00:00:00 2001 From: William Pitcock Date: Fri, 28 Sep 2018 00:44:15 +0000 Subject: [PATCH] activitypub: don't fall back to OStatus fetching when MRF rejects an object --- lib/pleroma/web/activity_pub/activity_pub.ex | 3 +++ 1 file changed, 3 insertions(+) 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 @@ def fetch_object_from_id(id) do {:ok, activity} <- Transmogrifier.handle_incoming(params) do {:ok, Object.normalize(activity.data["object"])} else + {:reject, nil} -> + {:reject, nil} + object = %Object{} -> {:ok, object}