logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma git clone https://hacktivis.me/git/pleroma.git
commit: c05cbaa9375660572ea9c720fa1825ab4c8b325c
parent b4c5cc39f65e3cd3e5e86be4631a3dcfb4bda593
Author: Mark Felder <feld@feld.me>
Date:   Wed, 17 Jul 2024 13:42:13 -0400

Dialyzer fix for RemoteFetcherWorker

Diffstat:

Mchangelog.d/oban-fetcher-rejected.change2+-
Mlib/pleroma/object/fetcher.ex1+
Mlib/pleroma/workers/remote_fetcher_worker.ex5+----
3 files changed, 3 insertions(+), 5 deletions(-)

diff --git 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 @@ -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 @@ -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