diff options
| author | kaniini <nenolod@gmail.com> | 2018-09-30 05:32:56 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2018-09-30 05:32:56 +0000 |
| commit | 4f03bb22998b9713d84dc8e81a3d63bb60c5b648 (patch) | |
| tree | c5043f7188f45d5b3bd1933eff10983e7b8ee861 /lib | |
| parent | ab2e5ba989720932bacf0b6c6db5dc27e762a9bb (diff) | |
| parent | 4db1bc2c0ebbeca592b7bbe300782420ee08c304 (diff) | |
| download | pleroma-4f03bb22998b9713d84dc8e81a3d63bb60c5b648.tar.gz | |
Merge branch 'bugfix/fix-mrf-reject-match' into 'develop'
activitypub: fix error condition match
See merge request pleroma/pleroma!365
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/activity_pub/activity_pub.ex | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex index e03e7c471..fc191addf 100644 --- a/lib/pleroma/web/activity_pub/activity_pub.ex +++ b/lib/pleroma/web/activity_pub/activity_pub.ex @@ -756,7 +756,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do {:ok, activity} <- Transmogrifier.handle_incoming(params) do {:ok, Object.normalize(activity.data["object"])} else - {:reject, nil} -> + {:error, {:reject, nil}} -> {:reject, nil} object = %Object{} -> |