diff options
| author | kaniini <nenolod@gmail.com> | 2018-09-28 00:51:45 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2018-09-28 00:51:45 +0000 |
| commit | dbc9feecbf11b696e984b40cbdf9ccde69cf469c (patch) | |
| tree | 637adeb044e1be51e8b7e0221600b9c39c018861 /lib/pleroma | |
| parent | db989d1fa4d83ba5d726807ff4707eb8cee5010d (diff) | |
| parent | 707077edde1fd8b98d5a2e89f63a5f821e33bd0f (diff) | |
| download | pleroma-dbc9feecbf11b696e984b40cbdf9ccde69cf469c.tar.gz | |
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 (limited to 'lib/pleroma')
| -rw-r--r-- | lib/pleroma/web/activity_pub/activity_pub.ex | 3 |
1 files 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 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} |