diff options
| author | kaniini <ariadne@dereferenced.org> | 2019-08-03 18:12:39 +0000 |
|---|---|---|
| committer | kaniini <ariadne@dereferenced.org> | 2019-08-03 18:12:39 +0000 |
| commit | 7319b41e340ac17ed7f31f89cd0edc959de270ce (patch) | |
| tree | 9368f40933b2cc48ad216e3befe2663f763af27a /lib | |
| parent | ba72d02f86d229ae83d4ca669e548b9968bdf8dd (diff) | |
| parent | 8b2fa31fed1a970c75e077d419dc78be7fc73a93 (diff) | |
| download | pleroma-7319b41e340ac17ed7f31f89cd0edc959de270ce.tar.gz | |
Merge branch 'fix/with-reject-nil-clause' into 'develop'
Handle MRF rejections of incoming AP activities
Closes #1095
See merge request pleroma/pleroma!1520
Diffstat (limited to 'lib')
| -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 07a65127b..2877c029e 100644 --- a/lib/pleroma/web/activity_pub/activity_pub.ex +++ b/lib/pleroma/web/activity_pub/activity_pub.ex @@ -267,6 +267,9 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do else {:fake, true, activity} -> {:ok, activity} + + {:error, message} -> + {:error, message} end end |