From fdeb8616e8452d78060fb41622688b7143687058 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@feld.me>
Date: Sat, 20 Jul 2024 22:00:34 -0400
Subject: [PATCH] Increase timeout for background, remote fetcher, and user
 refresh jobs

---
 changelog.d/oban-timeouts.skip               | 0
 lib/pleroma/web/activity_pub/side_effects.ex | 2 +-
 lib/pleroma/workers/background_worker.ex     | 2 +-
 lib/pleroma/workers/remote_fetcher_worker.ex | 2 +-
 lib/pleroma/workers/user_refresh_worker.ex   | 2 +-
 5 files changed, 4 insertions(+), 4 deletions(-)
 create mode 100644 changelog.d/oban-timeouts.skip

diff --git a/changelog.d/oban-timeouts.skip b/changelog.d/oban-timeouts.skip
new file mode 100644
index 000000000..e69de29bb
diff --git a/lib/pleroma/web/activity_pub/side_effects.ex b/lib/pleroma/web/activity_pub/side_effects.ex
index 2a141b0f5..cc1c7a0af 100644
--- a/lib/pleroma/web/activity_pub/side_effects.ex
+++ b/lib/pleroma/web/activity_pub/side_effects.ex
@@ -453,7 +453,7 @@ defmodule Pleroma.Web.ActivityPub.SideEffects do
        ) do
     orig_object_ap_id = updated_object["id"]
     orig_object = Object.get_by_ap_id(orig_object_ap_id)
-    orig_object_data = orig_object.data
+    orig_object_data = Map.get(orig_object, :data)
 
     updated_object =
       if meta[:local] do
diff --git a/lib/pleroma/workers/background_worker.ex b/lib/pleroma/workers/background_worker.ex
index d74cc08f1..870aef3c6 100644
--- a/lib/pleroma/workers/background_worker.ex
+++ b/lib/pleroma/workers/background_worker.ex
@@ -40,5 +40,5 @@ defmodule Pleroma.Workers.BackgroundWorker do
   end
 
   @impl Oban.Worker
-  def timeout(_job), do: :timer.seconds(5)
+  def timeout(_job), do: :timer.seconds(15)
 end
diff --git a/lib/pleroma/workers/remote_fetcher_worker.ex b/lib/pleroma/workers/remote_fetcher_worker.ex
index 1c8874b59..60096e14b 100644
--- a/lib/pleroma/workers/remote_fetcher_worker.ex
+++ b/lib/pleroma/workers/remote_fetcher_worker.ex
@@ -31,5 +31,5 @@ defmodule Pleroma.Workers.RemoteFetcherWorker do
   end
 
   @impl Oban.Worker
-  def timeout(_job), do: :timer.seconds(10)
+  def timeout(_job), do: :timer.seconds(15)
 end
diff --git a/lib/pleroma/workers/user_refresh_worker.ex b/lib/pleroma/workers/user_refresh_worker.ex
index 0c04fb237..fb90e9c9c 100644
--- a/lib/pleroma/workers/user_refresh_worker.ex
+++ b/lib/pleroma/workers/user_refresh_worker.ex
@@ -13,5 +13,5 @@ defmodule Pleroma.Workers.UserRefreshWorker do
   end
 
   @impl Oban.Worker
-  def timeout(_job), do: :timer.seconds(5)
+  def timeout(_job), do: :timer.seconds(15)
 end