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
This commit is contained in:
commit
dbc9feecbf
@ -756,6 +756,9 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
|
|||||||
{:ok, activity} <- Transmogrifier.handle_incoming(params) do
|
{:ok, activity} <- Transmogrifier.handle_incoming(params) do
|
||||||
{:ok, Object.normalize(activity.data["object"])}
|
{:ok, Object.normalize(activity.data["object"])}
|
||||||
else
|
else
|
||||||
|
{:reject, nil} ->
|
||||||
|
{:reject, nil}
|
||||||
|
|
||||||
object = %Object{} ->
|
object = %Object{} ->
|
||||||
{:ok, object}
|
{:ok, object}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user