From 2e369aef71a087909846f92784613ef4ebae16c6 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@feld.me>
Date: Sun, 14 Jan 2024 13:23:17 -0500
Subject: [PATCH] Allow the Remote Fetcher to attempt fetching an unreachable
 instance

---
 lib/pleroma/workers/remote_fetcher_worker.ex  | 27 ++++++++-----------
 .../workers/remote_fetcher_worker_test.exs    | 13 ---------
 2 files changed, 11 insertions(+), 29 deletions(-)

diff --git a/lib/pleroma/workers/remote_fetcher_worker.ex b/lib/pleroma/workers/remote_fetcher_worker.ex
index 618b72a19..844096f9a 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
 end
diff --git a/test/pleroma/workers/remote_fetcher_worker_test.exs b/test/pleroma/workers/remote_fetcher_worker_test.exs
index 493b10fdc..c30e773d4 100644
--- a/test/pleroma/workers/remote_fetcher_worker_test.exs
+++ b/test/pleroma/workers/remote_fetcher_worker_test.exs
@@ -6,13 +6,11 @@ defmodule Pleroma.Workers.RemoteFetcherWorkerTest do
   use Pleroma.DataCase
   use Oban.Testing, repo: Pleroma.Repo
 
-  alias Pleroma.Instances
   alias Pleroma.Workers.RemoteFetcherWorker
 
   @deleted_object_one "https://deleted-404.example.com/"
   @deleted_object_two "https://deleted-410.example.com/"
   @unauthorized_object "https://unauthorized.example.com/"
-  @unreachable_object "https://unreachable.example.com/"
   @depth_object "https://depth.example.com/"
 
   describe "RemoteFetcherWorker" do
@@ -59,17 +57,6 @@ test "does not requeue an unauthorized object" do
                })
     end
 
-    test "does not fetch an unreachable instance" do
-      Instances.set_consistently_unreachable(@unreachable_object)
-
-      refute Instances.reachable?(@unreachable_object)
-
-      assert {:discard, _} =
-               RemoteFetcherWorker.perform(%Oban.Job{
-                 args: %{"op" => "fetch_remote", "id" => @unreachable_object}
-               })
-    end
-
     test "does not requeue an object that exceeded depth" do
       clear_config([:instance, :federation_incoming_replies_max_depth], 0)