Merge branch 'oban/fetcher-rejected' into 'develop'

Dialyzer fix for RemoteFetcherWorker

See merge request pleroma/pleroma!4183
This commit is contained in:
feld 2024-07-17 18:03:48 +00:00
commit c45ee5fc82
3 changed files with 3 additions and 5 deletions

View file

@ -1 +1 @@
Discard Remote Fetcher jobs which errored due to an MRF rejection
Discard Remote Fetcher jobs which errored due to an MRF rejection.

View file

@ -59,6 +59,7 @@ def refetch_object(%Object{data: %{"id" => id}} = object) do
end
# Note: will create a Create activity, which we need internally at the moment.
@spec fetch_object_from_id(String.t(), list()) :: {:ok, Object.t()} | {:error | :reject, any()}
def fetch_object_from_id(id, options \\ []) do
with {_, nil} <- {:fetch_object, Object.get_cached_by_ap_id(id)},
{_, true} <- {:allowed_depth, Federator.allowed_thread_distance?(options[:depth])},

View file

@ -13,7 +13,7 @@ def perform(%Job{args: %{"op" => "fetch_remote", "id" => id} = args}) do
{:ok, _object} ->
:ok
{:rejected, reason} ->
{:reject, reason} ->
{:cancel, reason}
{:error, :forbidden} ->
@ -27,9 +27,6 @@ def perform(%Job{args: %{"op" => "fetch_remote", "id" => id} = args}) do
{:error, _} = e ->
e
e ->
{:error, e}
end
end