fedi/akkoma
1
0
Fork 0
mirror of https://akkoma.dev/AkkomaGang/akkoma.git synced 2024-11-02 14:44:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

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

See merge request pleroma/pleroma!362
This commit is contained in:
kaniini 2018-09-28 00:51:45 +00:00
parent db989d1fa4 707077edde
commit dbc9feecbf
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/pleroma/web/activity_pub/activity_pub.ex
View file

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