Merge branch 'chores/mrf-loglevel' into 'develop'
Fetcher: Correctly return MRF reject reason See merge request pleroma/pleroma!2990
This commit is contained in:
commit
eca8d26784
3 changed files with 23 additions and 10 deletions
|
|
@ -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}
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue