diff options
| author | Mark Felder <feld@feld.me> | 2024-07-17 13:42:13 -0400 |
|---|---|---|
| committer | Mark Felder <feld@feld.me> | 2024-07-17 13:42:13 -0400 |
| commit | c05cbaa9375660572ea9c720fa1825ab4c8b325c (patch) | |
| tree | ab0c237c44daca5aeb8e2f7595a2d427e2fcb338 | |
| parent | b4c5cc39f65e3cd3e5e86be4631a3dcfb4bda593 (diff) | |
| download | pleroma-c05cbaa9375660572ea9c720fa1825ab4c8b325c.tar.gz pleroma-c05cbaa9375660572ea9c720fa1825ab4c8b325c.zip | |
Dialyzer fix for RemoteFetcherWorker
| -rw-r--r-- | changelog.d/oban-fetcher-rejected.change | 2 | ||||
| -rw-r--r-- | lib/pleroma/object/fetcher.ex | 1 | ||||
| -rw-r--r-- | lib/pleroma/workers/remote_fetcher_worker.ex | 5 |
3 files changed, 3 insertions, 5 deletions
diff --git a/changelog.d/oban-fetcher-rejected.change b/changelog.d/oban-fetcher-rejected.change index 92e083647..65f5c992d 100644 --- a/changelog.d/oban-fetcher-rejected.change +++ b/changelog.d/oban-fetcher-rejected.change @@ -1 +1 @@ -Discard Remote Fetcher jobs which errored due to an MRF rejection +Discard Remote Fetcher jobs which errored due to an MRF rejection. diff --git a/lib/pleroma/object/fetcher.ex b/lib/pleroma/object/fetcher.ex index af5642af4..c0f671dd4 100644 --- a/lib/pleroma/object/fetcher.ex +++ b/lib/pleroma/object/fetcher.ex @@ -59,6 +59,7 @@ defmodule Pleroma.Object.Fetcher do end # Note: will create a Create activity, which we need internally at the moment. + @spec fetch_object_from_id(String.t(), list()) :: {:ok, Object.t()} | {:error | :reject, any()} def fetch_object_from_id(id, options \\ []) do with {_, nil} <- {:fetch_object, Object.get_cached_by_ap_id(id)}, {_, true} <- {:allowed_depth, Federator.allowed_thread_distance?(options[:depth])}, diff --git a/lib/pleroma/workers/remote_fetcher_worker.ex b/lib/pleroma/workers/remote_fetcher_worker.ex index 6d777ae94..1c8874b59 100644 --- a/lib/pleroma/workers/remote_fetcher_worker.ex +++ b/lib/pleroma/workers/remote_fetcher_worker.ex @@ -13,7 +13,7 @@ defmodule Pleroma.Workers.RemoteFetcherWorker do {:ok, _object} -> :ok - {:rejected, reason} -> + {:reject, reason} -> {:cancel, reason} {:error, :forbidden} -> @@ -27,9 +27,6 @@ defmodule Pleroma.Workers.RemoteFetcherWorker do {:error, _} = e -> e - - e -> - {:error, e} end end |