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

---
 lib/pleroma/object/fetcher.ex                             | 4 ++--
 lib/pleroma/workers/remote_fetcher_worker.ex              | 8 ++++----
 test/pleroma/object/fetcher_test.exs                      | 6 ++----
 .../web/twitter_api/remote_follow_controller_test.exs     | 2 +-
 4 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/lib/pleroma/object/fetcher.ex b/lib/pleroma/object/fetcher.ex
index 59fee83a9..edaf8c62d 100644
--- a/lib/pleroma/object/fetcher.ex
+++ b/lib/pleroma/object/fetcher.ex
@@ -351,10 +351,10 @@ defmodule Pleroma.Object.Fetcher do
       end
     else
       {:ok, %{status: 403}} ->
-        {:error, "Object fetch has been denied"}
+        {:error, :forbidden}
 
       {:ok, %{status: code}} when code in [404, 410] ->
-        {:error, {"Object has been deleted", id, code}}
+        {: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 d091dfa84..1120a3e4e 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
diff --git a/test/pleroma/object/fetcher_test.exs b/test/pleroma/object/fetcher_test.exs
index 8617090d9..55902ba49 100644
--- a/test/pleroma/object/fetcher_test.exs
+++ b/test/pleroma/object/fetcher_test.exs
@@ -404,16 +404,14 @@ defmodule Pleroma.Object.FetcherTest do
     end
 
     test "handle HTTP 410 Gone response" do
-      assert {:error,
-              {"Object has been deleted", "https://mastodon.example.org/users/userisgone", 410}} ==
+      assert {:error, :not_found} ==
                Fetcher.fetch_and_contain_remote_object_from_id(
                  "https://mastodon.example.org/users/userisgone"
                )
     end
 
     test "handle HTTP 404 response" do
-      assert {:error,
-              {"Object has been deleted", "https://mastodon.example.org/users/userisgone404", 404}} ==
+      assert {:error, :not_found} ==
                Fetcher.fetch_and_contain_remote_object_from_id(
                  "https://mastodon.example.org/users/userisgone404"
                )
diff --git a/test/pleroma/web/twitter_api/remote_follow_controller_test.exs b/test/pleroma/web/twitter_api/remote_follow_controller_test.exs
index d2bc7840f..5a94e4396 100644
--- a/test/pleroma/web/twitter_api/remote_follow_controller_test.exs
+++ b/test/pleroma/web/twitter_api/remote_follow_controller_test.exs
@@ -132,7 +132,7 @@ defmodule Pleroma.Web.TwitterAPI.RemoteFollowControllerTest do
                  |> html_response(200)
 
                assert response =~ "Error fetching user"
-             end) =~ "Object has been deleted"
+             end) =~ ":not_found"
     end
   end