From ea0ec5fbcf2e17d97f323bcb6872df48d5e42714 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@feld.me>
Date: Tue, 26 Dec 2023 14:20:33 -0500
Subject: Remove Fetcher.fetch_object_from_id!/2

It was only being called once and can be replaced with a case statement.
---
 lib/pleroma/object.ex         |  5 ++++-
 lib/pleroma/object/fetcher.ex | 26 +++++---------------------
 2 files changed, 9 insertions(+), 22 deletions(-)

(limited to 'lib')

diff --git a/lib/pleroma/object.ex b/lib/pleroma/object.ex
index fa5baf1a4..f2ba24abf 100644
--- a/lib/pleroma/object.ex
+++ b/lib/pleroma/object.ex
@@ -177,7 +177,10 @@ defmodule Pleroma.Object do
         ap_id
 
       Keyword.get(options, :fetch) ->
-        Fetcher.fetch_object_from_id!(ap_id, options)
+        case Fetcher.fetch_object_from_id(ap_id, options) do
+          {:ok, object} -> object
+          _ -> nil
+        end
 
       true ->
         get_cached_by_ap_id(ap_id)
diff --git a/lib/pleroma/object/fetcher.ex b/lib/pleroma/object/fetcher.ex
index cc3772563..508ee7e62 100644
--- a/lib/pleroma/object/fetcher.ex
+++ b/lib/pleroma/object/fetcher.ex
@@ -79,9 +79,11 @@ defmodule Pleroma.Object.Fetcher do
         {:error, "Object containment failed."}
 
       {:transmogrifier, {:error, {:reject, e}}} ->
+        Logger.info("Rejected #{id} while fetching: #{inspect(e)}")
         {:reject, e}
 
       {:transmogrifier, {:reject, e}} ->
+        Logger.info("Rejected #{id} while fetching: #{inspect(e)}")
         {:reject, e}
 
       {:transmogrifier, _} = e ->
@@ -97,10 +99,12 @@ defmodule Pleroma.Object.Fetcher do
         {:ok, object}
 
       {:fetch, {:error, error}} ->
+        Logger.error("Error while fetching #{id}: #{inspect(error)}")
         {:error, error}
 
       e ->
-        e
+        Logger.error("Error while fetching #{id}: #{inspect(e)}")
+        {:error, e}
     end
   end
 
@@ -117,26 +121,6 @@ defmodule Pleroma.Object.Fetcher do
     |> Maps.put_if_present("bcc", data["bcc"])
   end
 
-  def fetch_object_from_id!(id, options \\ []) do
-    with {:ok, object} <- fetch_object_from_id(id, options) do
-      object
-    else
-      {:error, %Tesla.Mock.Error{}} ->
-        nil
-
-      {:error, "Object has been deleted"} ->
-        nil
-
-      {:reject, reason} ->
-        Logger.info("Rejected #{id} while fetching: #{inspect(reason)}")
-        nil
-
-      e ->
-        Logger.error("Error while fetching #{id}: #{inspect(e)}")
-        nil
-    end
-  end
-
   defp make_signature(id, date) do
     uri = URI.parse(id)
 
-- 
cgit v1.2.3


From 603e9f6a92e8ea2d2d34d2af26ec2b12fe4b8543 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@feld.me>
Date: Tue, 26 Dec 2023 14:22:04 -0500
Subject: Fix Transmogrifier tests

These tests relied on the removed Fetcher.fetch_object_from_id!/2 function injecting the error tuple into a log message with the exact words "Object containment failed."

We will keep this behavior by generating a similar log message, but perhaps this should do a better job of matching on the error tuple returned by Transmogrifier.handle_incoming/1
---
 lib/pleroma/object/fetcher.ex | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/pleroma/object/fetcher.ex b/lib/pleroma/object/fetcher.ex
index 508ee7e62..13fb50639 100644
--- a/lib/pleroma/object/fetcher.ex
+++ b/lib/pleroma/object/fetcher.ex
@@ -75,8 +75,9 @@ defmodule Pleroma.Object.Fetcher do
       {:allowed_depth, false} ->
         {:error, "Max thread distance exceeded."}
 
-      {:containment, _} ->
-        {:error, "Object containment failed."}
+      {:containment, e} ->
+        Logger.info("Error while fetching #{id}: Object containment failed. #{inspect(e)}")
+        {:error, e}
 
       {:transmogrifier, {:error, {:reject, e}}} ->
         Logger.info("Rejected #{id} while fetching: #{inspect(e)}")
-- 
cgit v1.2.3


From d472bafec19cee269e7c943bafae7c805785acd7 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@feld.me>
Date: Tue, 26 Dec 2023 15:54:14 -0500
Subject: Mark instances as unreachable when returning a 403 from an object
 fetch

This is a definite sign the instance is blocked and they are enforcing authorized_fetch
---
 lib/pleroma/object/fetcher.ex                |  9 +++++++++
 lib/pleroma/workers/remote_fetcher_worker.ex | 11 +++++++++++
 2 files changed, 20 insertions(+)

(limited to 'lib')

diff --git a/lib/pleroma/object/fetcher.ex b/lib/pleroma/object/fetcher.ex
index 13fb50639..a07b35d6f 100644
--- a/lib/pleroma/object/fetcher.ex
+++ b/lib/pleroma/object/fetcher.ex
@@ -99,6 +99,15 @@ defmodule Pleroma.Object.Fetcher do
       {:fetch_object, %Object{} = object} ->
         {:ok, object}
 
+      {:fetch, {:error, {:ok, %Tesla.Env{status: 403}}}} ->
+        Instances.set_consistently_unreachable(id)
+
+        Logger.error(
+          "Error while fetching #{id}: HTTP 403 likely due to instance block rejecting the signed fetch."
+        )
+
+        {:error, "Object fetch has been denied"}
+
       {:fetch, {:error, error}} ->
         Logger.error("Error while fetching #{id}: #{inspect(error)}")
         {:error, error}
diff --git a/lib/pleroma/workers/remote_fetcher_worker.ex b/lib/pleroma/workers/remote_fetcher_worker.ex
index d2a77aa17..70d074c1c 100644
--- a/lib/pleroma/workers/remote_fetcher_worker.ex
+++ b/lib/pleroma/workers/remote_fetcher_worker.ex
@@ -10,6 +10,17 @@ defmodule Pleroma.Workers.RemoteFetcherWorker do
   @impl Oban.Worker
   def perform(%Job{args: %{"op" => "fetch_remote", "id" => id} = args}) do
     {:ok, _object} = Fetcher.fetch_object_from_id(id, depth: args["depth"])
+
+    case Fetcher.fetch_object_from_id(id, depth: args["depth"]) do
+      {:ok, _object} ->
+        :ok
+
+      {:error, reason = "Object fetch has been denied"} ->
+        {:cancel, reason}
+
+      _ ->
+        :error
+    end
   end
 
   @impl Oban.Worker
-- 
cgit v1.2.3


From 67dd81e8254576950fc20ed84d3da3a3d24c1706 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@feld.me>
Date: Tue, 26 Dec 2023 16:05:28 -0500
Subject: Consolidate the HTTP status code checking into the private
 get_object/1

---
 lib/pleroma/object/fetcher.ex | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

(limited to 'lib')

diff --git a/lib/pleroma/object/fetcher.ex b/lib/pleroma/object/fetcher.ex
index a07b35d6f..75f39fb6a 100644
--- a/lib/pleroma/object/fetcher.ex
+++ b/lib/pleroma/object/fetcher.ex
@@ -99,15 +99,6 @@ defmodule Pleroma.Object.Fetcher do
       {:fetch_object, %Object{} = object} ->
         {:ok, object}
 
-      {:fetch, {:error, {:ok, %Tesla.Env{status: 403}}}} ->
-        Instances.set_consistently_unreachable(id)
-
-        Logger.error(
-          "Error while fetching #{id}: HTTP 403 likely due to instance block rejecting the signed fetch."
-        )
-
-        {:error, "Object fetch has been denied"}
-
       {:fetch, {:error, error}} ->
         Logger.error("Error while fetching #{id}: #{inspect(error)}")
         {:error, error}
@@ -221,6 +212,10 @@ defmodule Pleroma.Object.Fetcher do
             {:error, {:content_type, nil}}
         end
 
+      {:ok, %{status: 403}} ->
+        Instances.set_consistently_unreachable(id)
+        {:error, "Object fetch has been denied"}
+
       {:ok, %{status: code}} when code in [404, 410] ->
         {:error, "Object has been deleted"}
 
-- 
cgit v1.2.3


From c6b38441f15a4f3bb925bc4ffc68ac8930bc29b2 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@feld.me>
Date: Tue, 26 Dec 2023 16:05:44 -0500
Subject: Cancel remote fetch jobs for deleted objects

---
 lib/pleroma/workers/remote_fetcher_worker.ex | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'lib')

diff --git a/lib/pleroma/workers/remote_fetcher_worker.ex b/lib/pleroma/workers/remote_fetcher_worker.ex
index 70d074c1c..1a7bd2586 100644
--- a/lib/pleroma/workers/remote_fetcher_worker.ex
+++ b/lib/pleroma/workers/remote_fetcher_worker.ex
@@ -18,6 +18,9 @@ defmodule Pleroma.Workers.RemoteFetcherWorker do
       {:error, reason = "Object fetch has been denied"} ->
         {:cancel, reason}
 
+      {:error, reason = "Object has been deleted"} ->
+        {:cancel, reason}
+
       _ ->
         :error
     end
-- 
cgit v1.2.3


From 5f6966cd9ff9c728d97a8e4075cba738ceca0aeb Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@feld.me>
Date: Tue, 26 Dec 2023 16:23:41 -0500
Subject: Remove mistaken duplicate fetch

---
 lib/pleroma/workers/remote_fetcher_worker.ex | 2 --
 1 file changed, 2 deletions(-)

(limited to 'lib')

diff --git a/lib/pleroma/workers/remote_fetcher_worker.ex b/lib/pleroma/workers/remote_fetcher_worker.ex
index 1a7bd2586..ff0286e54 100644
--- a/lib/pleroma/workers/remote_fetcher_worker.ex
+++ b/lib/pleroma/workers/remote_fetcher_worker.ex
@@ -9,8 +9,6 @@ defmodule Pleroma.Workers.RemoteFetcherWorker do
 
   @impl Oban.Worker
   def perform(%Job{args: %{"op" => "fetch_remote", "id" => id} = args}) do
-    {:ok, _object} = Fetcher.fetch_object_from_id(id, depth: args["depth"])
-
     case Fetcher.fetch_object_from_id(id, depth: args["depth"]) do
       {:ok, _object} ->
         :ok
-- 
cgit v1.2.3


From 9c0040124a9ea68cedca4959d32105ee6a6c3ee1 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@feld.me>
Date: Tue, 26 Dec 2023 16:28:05 -0500
Subject: Skip remote fetch jobs for unreachable instances

---
 lib/pleroma/workers/remote_fetcher_worker.ex | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

(limited to 'lib')

diff --git a/lib/pleroma/workers/remote_fetcher_worker.ex b/lib/pleroma/workers/remote_fetcher_worker.ex
index ff0286e54..d4fae33df 100644
--- a/lib/pleroma/workers/remote_fetcher_worker.ex
+++ b/lib/pleroma/workers/remote_fetcher_worker.ex
@@ -3,24 +3,29 @@
 # 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
-    case Fetcher.fetch_object_from_id(id, depth: args["depth"]) do
-      {:ok, _object} ->
-        :ok
+    if Instances.reachable?(id) do
+      case Fetcher.fetch_object_from_id(id, depth: args["depth"]) do
+        {:ok, _object} ->
+          :ok
 
-      {:error, reason = "Object fetch has been denied"} ->
-        {:cancel, reason}
+        {:error, reason = "Object fetch has been denied"} ->
+          {:cancel, reason}
 
-      {:error, reason = "Object has been deleted"} ->
-        {:cancel, reason}
+        {:error, reason = "Object has been deleted"} ->
+          {:cancel, reason}
 
-      _ ->
-        :error
+        _ ->
+          :error
+      end
+    else
+      {:cancel, "Unreachable instance"}
     end
   end
 
-- 
cgit v1.2.3


From 73c4c6d7de6d33c68cf663e65df8525ce8eef4f5 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@feld.me>
Date: Tue, 26 Dec 2023 17:12:58 -0500
Subject: Revert "Mark instances as unreachable when returning a 403 from an
 object fetch"

This reverts commit d472bafec19cee269e7c943bafae7c805785acd7.
---
 lib/pleroma/object/fetcher.ex | 1 -
 1 file changed, 1 deletion(-)

(limited to 'lib')

diff --git a/lib/pleroma/object/fetcher.ex b/lib/pleroma/object/fetcher.ex
index 75f39fb6a..f1a0a483b 100644
--- a/lib/pleroma/object/fetcher.ex
+++ b/lib/pleroma/object/fetcher.ex
@@ -213,7 +213,6 @@ defmodule Pleroma.Object.Fetcher do
         end
 
       {:ok, %{status: 403}} ->
-        Instances.set_consistently_unreachable(id)
         {:error, "Object fetch has been denied"}
 
       {:ok, %{status: code}} when code in [404, 410] ->
-- 
cgit v1.2.3


From d4c77103d1fe5df9b2ea8bd3429a8fc0240645c1 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@feld.me>
Date: Wed, 27 Dec 2023 15:27:37 -0500
Subject: Fix detection of user follower collection being private

We were overzealous with matching on a raw error from the object fetch that should have never been relied on like this. If we can't fetch successfully we should assume that the collection is private.

Building a more expressive and universal error struct to match on may be something to consider.
---
 lib/pleroma/web/activity_pub/activity_pub.ex | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'lib')

diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex
index 32d1a1037..39159b1c4 100644
--- a/lib/pleroma/web/activity_pub/activity_pub.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub.ex
@@ -1697,9 +1697,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
            Fetcher.fetch_and_contain_remote_object_from_id(first) do
       {:ok, false}
     else
-      {:error, {:ok, %{status: code}}} when code in [401, 403] -> {:ok, true}
-      {:error, _} = e -> e
-      e -> {:error, e}
+      {:error, _} -> {:ok, true}
     end
   end
 
-- 
cgit v1.2.3


From 6c9929b809290d9caca6a7a40eb0f59af6dd558d Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@feld.me>
Date: Wed, 27 Dec 2023 20:18:14 -0500
Subject: Set Logger level to error

---
 lib/pleroma/object/fetcher.ex | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'lib')

diff --git a/lib/pleroma/object/fetcher.ex b/lib/pleroma/object/fetcher.ex
index f1a0a483b..9ba0ac0ca 100644
--- a/lib/pleroma/object/fetcher.ex
+++ b/lib/pleroma/object/fetcher.ex
@@ -76,15 +76,15 @@ defmodule Pleroma.Object.Fetcher do
         {:error, "Max thread distance exceeded."}
 
       {:containment, e} ->
-        Logger.info("Error while fetching #{id}: Object containment failed. #{inspect(e)}")
+        Logger.error("Error while fetching #{id}: Object containment failed. #{inspect(e)}")
         {:error, e}
 
       {:transmogrifier, {:error, {:reject, e}}} ->
-        Logger.info("Rejected #{id} while fetching: #{inspect(e)}")
+        Logger.error("Rejected #{id} while fetching: #{inspect(e)}")
         {:reject, e}
 
       {:transmogrifier, {:reject, e}} ->
-        Logger.info("Rejected #{id} while fetching: #{inspect(e)}")
+        Logger.error("Rejected #{id} while fetching: #{inspect(e)}")
         {:reject, e}
 
       {:transmogrifier, _} = e ->
-- 
cgit v1.2.3


From becb070603bc65d5302698a2b6cf5f89b3d5c1f0 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@feld.me>
Date: Wed, 27 Dec 2023 20:47:18 -0500
Subject: Conslidate log messages for object fetcher failures and leverage
 Logger.metadata

---
 lib/pleroma/object/fetcher.ex | 39 +++++++++++++++++++++++----------------
 1 file changed, 23 insertions(+), 16 deletions(-)

(limited to 'lib')

diff --git a/lib/pleroma/object/fetcher.ex b/lib/pleroma/object/fetcher.ex
index 9ba0ac0ca..72420519a 100644
--- a/lib/pleroma/object/fetcher.ex
+++ b/lib/pleroma/object/fetcher.ex
@@ -72,23 +72,25 @@ defmodule Pleroma.Object.Fetcher do
            {:object, data, Object.normalize(activity, fetch: false)} do
       {:ok, object}
     else
-      {:allowed_depth, false} ->
+      {:allowed_depth, false} = e ->
+        log_fetch_error(id, e)
         {:error, "Max thread distance exceeded."}
 
-      {:containment, e} ->
-        Logger.error("Error while fetching #{id}: Object containment failed. #{inspect(e)}")
-        {:error, e}
+      {:containment, reason} = e ->
+        log_fetch_error(id, e)
+        {:error, reason}
 
-      {:transmogrifier, {:error, {:reject, e}}} ->
-        Logger.error("Rejected #{id} while fetching: #{inspect(e)}")
-        {:reject, e}
+      {:transmogrifier, {:error, {:reject, reason}}} = e ->
+        log_fetch_error(id, e)
+        {:reject, reason}
 
-      {:transmogrifier, {:reject, e}} ->
-        Logger.error("Rejected #{id} while fetching: #{inspect(e)}")
-        {:reject, e}
+      {:transmogrifier, {:reject, reason}} = e ->
+        log_fetch_error(id, e)
+        {:reject, reason}
 
-      {:transmogrifier, _} = e ->
-        {:error, e}
+      {:transmogrifier, reason} = e ->
+        log_fetch_error(id, e)
+        {:error, reason}
 
       {:object, data, nil} ->
         reinject_object(%Object{}, data)
@@ -99,16 +101,21 @@ defmodule Pleroma.Object.Fetcher do
       {:fetch_object, %Object{} = object} ->
         {:ok, object}
 
-      {:fetch, {:error, error}} ->
-        Logger.error("Error while fetching #{id}: #{inspect(error)}")
-        {:error, error}
+      {:fetch, {:error, reason}} = e ->
+        log_fetch_error(id, e)
+        {:error, reason}
 
       e ->
-        Logger.error("Error while fetching #{id}: #{inspect(e)}")
+        log_fetch_error(id, e)
         {:error, e}
     end
   end
 
+  defp log_fetch_error(id, error) do
+    Logger.metadata([object: id])
+    Logger.error("Object rejected while fetching #{id} #{inspect(error)}")
+  end
+
   defp prepare_activity_params(data) do
     %{
       "type" => "Create",
-- 
cgit v1.2.3


From 882267e3eceaa61cff16a9e0dee231d54a80d927 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@feld.me>
Date: Wed, 27 Dec 2023 21:39:17 -0500
Subject: Remove duplicate log messages from Transmogrifier

Object fetch errors are logged in the fetcher module
---
 lib/pleroma/web/activity_pub/transmogrifier.ex | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

(limited to 'lib')

diff --git a/lib/pleroma/web/activity_pub/transmogrifier.ex b/lib/pleroma/web/activity_pub/transmogrifier.ex
index 35f3aea03..80f64cf1e 100644
--- a/lib/pleroma/web/activity_pub/transmogrifier.ex
+++ b/lib/pleroma/web/activity_pub/transmogrifier.ex
@@ -23,7 +23,6 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
 
   import Ecto.Query
 
-  require Logger
   require Pleroma.Constants
 
   @doc """
@@ -155,8 +154,7 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
         |> Map.put("context", replied_object.data["context"] || object["conversation"])
         |> Map.drop(["conversation", "inReplyToAtomUri"])
       else
-        e ->
-          Logger.warning("Couldn't fetch #{inspect(in_reply_to_id)}, error: #{inspect(e)}")
+        _ ->
           object
       end
     else
@@ -181,8 +179,7 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
       {:quoting?, _} ->
         object
 
-      e ->
-        Logger.warning("Couldn't fetch #{inspect(quote_url)}, error: #{inspect(e)}")
+      _ ->
         object
     end
   end
@@ -852,8 +849,7 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
            relative_object do
       Map.put(data, "object", external_url)
     else
-      {:fetch, e} ->
-        Logger.error("Couldn't fetch #{object} #{inspect(e)}")
+      {:fetch, _} ->
         data
 
       _ ->
-- 
cgit v1.2.3


From 287f2c9719310f96ce37b445f26e069f804c34b2 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@feld.me>
Date: Wed, 27 Dec 2023 21:55:07 -0500
Subject: Formatting

---
 lib/pleroma/object/fetcher.ex | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/pleroma/object/fetcher.ex b/lib/pleroma/object/fetcher.ex
index 72420519a..5bc1cfd5e 100644
--- a/lib/pleroma/object/fetcher.ex
+++ b/lib/pleroma/object/fetcher.ex
@@ -112,7 +112,7 @@ defmodule Pleroma.Object.Fetcher do
   end
 
   defp log_fetch_error(id, error) do
-    Logger.metadata([object: id])
+    Logger.metadata(object: id)
     Logger.error("Object rejected while fetching #{id} #{inspect(error)}")
   end
 
-- 
cgit v1.2.3


From a2708f7fe31c6009b0c9954e5de3b74c45f9818f Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@feld.me>
Date: Wed, 27 Dec 2023 21:57:47 -0500
Subject: Leverage existing atoms as return errors for the object fetcher

---
 lib/pleroma/object/fetcher.ex                | 4 ++--
 lib/pleroma/workers/remote_fetcher_worker.ex | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'lib')

diff --git a/lib/pleroma/object/fetcher.ex b/lib/pleroma/object/fetcher.ex
index 5bc1cfd5e..0c90e0eaa 100644
--- a/lib/pleroma/object/fetcher.ex
+++ b/lib/pleroma/object/fetcher.ex
@@ -220,10 +220,10 @@ defmodule Pleroma.Object.Fetcher do
         end
 
       {:ok, %{status: 403}} ->
-        {:error, "Object fetch has been denied"}
+        {:error, :forbidden}
 
       {:ok, %{status: code}} when code in [404, 410] ->
-        {:error, "Object has been deleted"}
+        {:error, :not_found}
 
       {:error, e} ->
         {:error, e}
diff --git a/lib/pleroma/workers/remote_fetcher_worker.ex b/lib/pleroma/workers/remote_fetcher_worker.ex
index d4fae33df..dca4530d7 100644
--- a/lib/pleroma/workers/remote_fetcher_worker.ex
+++ b/lib/pleroma/workers/remote_fetcher_worker.ex
@@ -15,11 +15,11 @@ defmodule Pleroma.Workers.RemoteFetcherWorker do
         {:ok, _object} ->
           :ok
 
-        {:error, reason = "Object fetch has been denied"} ->
-          {:cancel, reason}
+        {:error, :forbidden} ->
+          {:cancel, :forbidden}
 
-        {:error, reason = "Object has been deleted"} ->
-          {:cancel, reason}
+        {:error, :not_found} ->
+          {:cancel, :not_found}
 
         _ ->
           :error
-- 
cgit v1.2.3


From ad0a5deb67f454b0529a4faf72399cd9ecc9c0e6 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@feld.me>
Date: Wed, 27 Dec 2023 22:28:41 -0500
Subject: Prevent requeuing Remote Fetcher jobs that exceed thread depth

---
 lib/pleroma/object/fetcher.ex                | 2 +-
 lib/pleroma/workers/remote_fetcher_worker.ex | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/pleroma/object/fetcher.ex b/lib/pleroma/object/fetcher.ex
index 0c90e0eaa..972dfaf28 100644
--- a/lib/pleroma/object/fetcher.ex
+++ b/lib/pleroma/object/fetcher.ex
@@ -74,7 +74,7 @@ defmodule Pleroma.Object.Fetcher do
     else
       {:allowed_depth, false} = e ->
         log_fetch_error(id, e)
-        {:error, "Max thread distance exceeded."}
+        {:error, :allowed_depth}
 
       {:containment, reason} = e ->
         log_fetch_error(id, e)
diff --git a/lib/pleroma/workers/remote_fetcher_worker.ex b/lib/pleroma/workers/remote_fetcher_worker.ex
index dca4530d7..fef8a26b2 100644
--- a/lib/pleroma/workers/remote_fetcher_worker.ex
+++ b/lib/pleroma/workers/remote_fetcher_worker.ex
@@ -21,6 +21,9 @@ defmodule Pleroma.Workers.RemoteFetcherWorker do
         {:error, :not_found} ->
           {:cancel, :not_found}
 
+        {:error, :allowed_depth} ->
+          {:cancel, :allowed_depth}
+
         _ ->
           :error
       end
-- 
cgit v1.2.3


From aa070c7dafbceb33b9656f54aa552672497942f6 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@feld.me>
Date: Thu, 28 Dec 2023 23:09:33 -0500
Subject: Handle 401s as I have observed it in the wild

---
 lib/pleroma/object/fetcher.ex | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/pleroma/object/fetcher.ex b/lib/pleroma/object/fetcher.ex
index 972dfaf28..af5642af4 100644
--- a/lib/pleroma/object/fetcher.ex
+++ b/lib/pleroma/object/fetcher.ex
@@ -219,7 +219,7 @@ defmodule Pleroma.Object.Fetcher do
             {:error, {:content_type, nil}}
         end
 
-      {:ok, %{status: 403}} ->
+      {:ok, %{status: code}} when code in [401, 403] ->
         {:error, :forbidden}
 
       {:ok, %{status: code}} when code in [404, 410] ->
-- 
cgit v1.2.3


From f17f92105bff555d2d372ff2ec053fe40fa1b41b Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@feld.me>
Date: Thu, 28 Dec 2023 23:52:05 -0500
Subject: Oban jobs should be discarded on permanent errors

---
 lib/pleroma/workers/remote_fetcher_worker.ex | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'lib')

diff --git a/lib/pleroma/workers/remote_fetcher_worker.ex b/lib/pleroma/workers/remote_fetcher_worker.ex
index fef8a26b2..7919969aa 100644
--- a/lib/pleroma/workers/remote_fetcher_worker.ex
+++ b/lib/pleroma/workers/remote_fetcher_worker.ex
@@ -16,19 +16,19 @@ defmodule Pleroma.Workers.RemoteFetcherWorker do
           :ok
 
         {:error, :forbidden} ->
-          {:cancel, :forbidden}
+          {:discard, :forbidden}
 
         {:error, :not_found} ->
-          {:cancel, :not_found}
+          {:discard, :not_found}
 
         {:error, :allowed_depth} ->
-          {:cancel, :allowed_depth}
+          {:discard, :allowed_depth}
 
         _ ->
           :error
       end
     else
-      {:cancel, "Unreachable instance"}
+      {:discard, "Unreachable instance"}
     end
   end
 
-- 
cgit v1.2.3


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

---
 lib/pleroma/workers/remote_fetcher_worker.ex | 27 +++++++++++----------------
 1 file changed, 11 insertions(+), 16 deletions(-)

(limited to 'lib')

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
 
-- 
cgit v1.2.3