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

---
 lib/pleroma/workers/remote_fetcher_worker.ex        |  8 ++++----
 test/pleroma/workers/remote_fetcher_worker_test.exs | 10 +++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/lib/pleroma/workers/remote_fetcher_worker.ex b/lib/pleroma/workers/remote_fetcher_worker.ex
index 0816d5737..618b72a19 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
 end
diff --git a/test/pleroma/workers/remote_fetcher_worker_test.exs b/test/pleroma/workers/remote_fetcher_worker_test.exs
index 84899cc5f..493b10fdc 100644
--- a/test/pleroma/workers/remote_fetcher_worker_test.exs
+++ b/test/pleroma/workers/remote_fetcher_worker_test.exs
@@ -41,19 +41,19 @@ defmodule Pleroma.Workers.RemoteFetcherWorkerTest do
     end
 
     test "does not requeue a deleted object" do
-      assert {:cancel, _} =
+      assert {:discard, _} =
                RemoteFetcherWorker.perform(%Oban.Job{
                  args: %{"op" => "fetch_remote", "id" => @deleted_object_one}
                })
 
-      assert {:cancel, _} =
+      assert {:discard, _} =
                RemoteFetcherWorker.perform(%Oban.Job{
                  args: %{"op" => "fetch_remote", "id" => @deleted_object_two}
                })
     end
 
     test "does not requeue an unauthorized object" do
-      assert {:cancel, _} =
+      assert {:discard, _} =
                RemoteFetcherWorker.perform(%Oban.Job{
                  args: %{"op" => "fetch_remote", "id" => @unauthorized_object}
                })
@@ -64,7 +64,7 @@ defmodule Pleroma.Workers.RemoteFetcherWorkerTest do
 
       refute Instances.reachable?(@unreachable_object)
 
-      assert {:cancel, _} =
+      assert {:discard, _} =
                RemoteFetcherWorker.perform(%Oban.Job{
                  args: %{"op" => "fetch_remote", "id" => @unreachable_object}
                })
@@ -73,7 +73,7 @@ defmodule Pleroma.Workers.RemoteFetcherWorkerTest do
     test "does not requeue an object that exceeded depth" do
       clear_config([:instance, :federation_incoming_replies_max_depth], 0)
 
-      assert {:cancel, _} =
+      assert {:discard, _} =
                RemoteFetcherWorker.perform(%Oban.Job{
                  args: %{"op" => "fetch_remote", "id" => @depth_object, "depth" => 1}
                })