No OneTemporary
Actions

Authored By

Unknown

Size

1 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/changelog.d/remote-fetcher-error.skip b/changelog.d/remote-fetcher-error.skip
	new file mode 100644
	index 000000000..e69de29bb
	diff --git a/lib/pleroma/workers/remote_fetcher_worker.ex b/lib/pleroma/workers/remote_fetcher_worker.ex
	index d526a99cb..c26418483 100644
	--- a/lib/pleroma/workers/remote_fetcher_worker.ex
	+++ b/lib/pleroma/workers/remote_fetcher_worker.ex
	@@ -1,32 +1,35 @@
	# Pleroma: A lightweight social networking server
	# Copyright © 2017-2022 Pleroma Authors <https://pleroma.social/>
	# SPDX-License-Identifier: AGPL-3.0-only

	defmodule Pleroma.Workers.RemoteFetcherWorker do
	alias Pleroma.Object.Fetcher

	use Pleroma.Workers.WorkerHelper, queue: "remote_fetcher"

	@impl Oban.Worker
	def perform(%Job{args: %{"op" => "fetch_remote", "id" => id} = args}) do
	case Fetcher.fetch_object_from_id(id, depth: args["depth"]) do
	{:ok, _object} ->
	:ok

	{:error, :forbidden} ->
	{:discard, :forbidden}

	{:error, :not_found} ->
	{:discard, :not_found}

	{:error, :allowed_depth} ->
	{:discard, :allowed_depth}

	- _ ->
	- :error
	+ {:error, _} = e ->
	+ e
	+
	+ e ->
	+ {:error, e}
	end
	end

	@impl Oban.Worker
	def timeout(_job), do: :timer.seconds(10)
	end