diff options
author | Mark Felder <feld@feld.me> | 2024-01-14 13:23:17 -0500 |
---|---|---|
committer | Mark Felder <feld@feld.me> | 2024-01-14 14:05:43 -0500 |
commit | 12c052551bcd6b7871ccde5b9228315b89f45e01 (patch) | |
tree | 7ebf344c0672e836e48825e881d27b0b84bb78c7 /lib | |
parent | f17f92105bff555d2d372ff2ec053fe40fa1b41b (diff) | |
download | pleroma-12c052551bcd6b7871ccde5b9228315b89f45e01.tar.gz pleroma-12c052551bcd6b7871ccde5b9228315b89f45e01.zip |
Allow the Remote Fetcher to attempt fetching an unreachable instance
Diffstat (limited to 'lib')
-rw-r--r-- | lib/pleroma/workers/remote_fetcher_worker.ex | 27 |
1 files changed, 11 insertions, 16 deletions
diff --git a/lib/pleroma/workers/remote_fetcher_worker.ex b/lib/pleroma/workers/remote_fetcher_worker.ex index 7919969aa..d526a99cb 100644 --- a/lib/pleroma/workers/remote_fetcher_worker.ex +++ b/lib/pleroma/workers/remote_fetcher_worker.ex @@ -3,32 +3,27 @@ # SPDX-License-Identifier: AGPL-3.0-only defmodule Pleroma.Workers.RemoteFetcherWorker do - alias Pleroma.Instances 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 - if Instances.reachable?(id) do - case Fetcher.fetch_object_from_id(id, depth: args["depth"]) do - {:ok, _object} -> - :ok + case Fetcher.fetch_object_from_id(id, depth: args["depth"]) do + {:ok, _object} -> + :ok - {:error, :forbidden} -> - {:discard, :forbidden} + {:error, :forbidden} -> + {:discard, :forbidden} - {:error, :not_found} -> - {:discard, :not_found} + {:error, :not_found} -> + {:discard, :not_found} - {:error, :allowed_depth} -> - {:discard, :allowed_depth} + {:error, :allowed_depth} -> + {:discard, :allowed_depth} - _ -> - :error - end - else - {:discard, "Unreachable instance"} + _ -> + :error end end |