Commit dbc9feec authored by kaniini's avatar kaniini
Browse files

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 !362
parents db989d1f 707077ed
Pipeline #3884 passed with stages
in 6 minutes and 5 seconds
......@@ -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}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment