Merge pull request 'ReceiverWorker: Make sure non-{:ok, _} is returned as {:error, …}' (#753 ) from Oneric/akkoma:receive-worker-return into develop

Reviewed-on: #753
ReceiverWorker: Make sure non-{:ok, _} is returned as {:error, …}
2024-04-24 17:00:18 +00:00 · 2024-04-21 20:58:06 +02:00
1 changed files with 2 additions and 1 deletions
--- a/lib/pleroma/workers/receiver_worker.ex
+++ b/lib/pleroma/workers/receiver_worker.ex
@ -14,7 +14,8 @@ defmodule Pleroma.Workers.ReceiverWorker do
    else
      {:error, :origin_containment_failed} -> {:discard, :origin_containment_failed}
      {:error, {:reject, reason}} -> {:discard, reason}
-      e -> e
+      {:error, _} = e -> e
+      e -> {:error, e}
    end
  end
 end
Author	SHA1	Message	Date
floatingghost	4a0e90e8a8	Merge pull request 'ReceiverWorker: Make sure non-{:ok, _} is returned as {:error, …}' (#753 ) from Oneric/akkoma:receive-worker-return into develop ci/woodpecker/push/build-amd64 Pipeline is pending Details ci/woodpecker/push/build-arm64 Pipeline is pending Details ci/woodpecker/push/docs Pipeline is pending Details ci/woodpecker/push/lint Pipeline is pending Details ci/woodpecker/push/test Pipeline is pending Details Reviewed-on: #753	2024-04-24 17:00:18 +00:00
Haelwenn (lanodan) Monnier	0c2f200b4d	ReceiverWorker: Make sure non-{:ok, _} is returned as {:error, …} ci/woodpecker/pr/lint Pipeline was successful Details ci/woodpecker/pr/test Pipeline was successful Details ci/woodpecker/pr/build-arm64 unknown status Details ci/woodpecker/pr/build-amd64 unknown status Details ci/woodpecker/pr/docs unknown status Details Otherwise an error like `{:signature, {:error, {:error, :not_found}}}` ends up considered a success. Cherry-picked-from: `a299ddb10e`	2024-04-21 20:58:06 +02:00