From: William Pitcock <nenolod@dereferenced.org>
Date: Fri, 28 Sep 2018 00:44:15 +0000 (+0000)
Subject: activitypub: don't fall back to OStatus fetching when MRF rejects an object
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=707077edde1fd8b98d5a2e89f63a5f821e33bd0f;p=akkoma

activitypub: don't fall back to OStatus fetching when MRF rejects an object
---

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}