pleroma

commit: dbc9feecbf11b696e984b40cbdf9ccde69cf469c
parent: db989d1fa4d83ba5d726807ff4707eb8cee5010d
Author: kaniini <nenolod@gmail.com>
Date:   Fri, 28 Sep 2018 00:51:45 +0000

Merge branch 'bugfix/object-fetching-handle-mrf-reject' into 'develop'

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

See merge request pleroma/pleroma!362
Diffstat:
M
lib/pleroma/web/activity_pub/activity_pub.ex
3
+++

1 file 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
@@ -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}