diff options
| author | rinpatch <rinpatch@sdf.org> | 2020-09-16 13:37:04 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2020-09-16 13:37:04 +0000 |
| commit | eca8d267846afc802f9a5ceed036482a9c90b4e2 (patch) | |
| tree | e2cb3726e023ded784a45bba061108135e4a2855 /lib | |
| parent | adbd0032fab0f2515689fd2ab6629fb8cd05b09d (diff) | |
| parent | f1f44069ae525fd21127e5ceccc61016c12f4427 (diff) | |
| download | pleroma-eca8d267846afc802f9a5ceed036482a9c90b4e2.tar.gz | |
Merge branch 'chores/mrf-loglevel' into 'develop'
Fetcher: Correctly return MRF reject reason
See merge request pleroma/pleroma!2990
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/object/fetcher.ex | 4 | ||||
| -rw-r--r-- | lib/pleroma/web/activity_pub/activity_pub.ex | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/pleroma/object/fetcher.ex b/lib/pleroma/object/fetcher.ex index 1de2ce6c3..24dc7cb95 100644 --- a/lib/pleroma/object/fetcher.ex +++ b/lib/pleroma/object/fetcher.ex @@ -98,8 +98,8 @@ defmodule Pleroma.Object.Fetcher do {:containment, _} -> {:error, "Object containment failed."} - {:transmogrifier, {:error, {:reject, nil}}} -> - {:reject, nil} + {:transmogrifier, {:error, {:reject, e}}} -> + {:reject, e} {:transmogrifier, _} = e -> {:error, e} diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex index f5cbb3e01..92fc1e422 100644 --- a/lib/pleroma/web/activity_pub/activity_pub.ex +++ b/lib/pleroma/web/activity_pub/activity_pub.ex @@ -154,8 +154,8 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do {:remote_limit_pass, _} -> {:error, :remote_limit} - {:reject, reason} -> - {:error, reason} + {:reject, _} = e -> + {:error, e} end end |