diff --git a/changelog.d/fetcher-simple-policy.change b/changelog.d/fetcher-simple-policy.change new file mode 100644 index 0000000000..a4ca4d777b --- /dev/null +++ b/changelog.d/fetcher-simple-policy.change @@ -0,0 +1 @@ +Do not fetch anything from blocked instances diff --git a/lib/pleroma/object/fetcher.ex b/lib/pleroma/object/fetcher.ex index 4ee5837184..4da25bfe3c 100644 --- a/lib/pleroma/object/fetcher.ex +++ b/lib/pleroma/object/fetcher.ex @@ -65,7 +65,6 @@ defmodule Pleroma.Object.Fetcher do {:ok, Object.t()} | {fetcher_errors(), any()} | Pipeline.errors() def fetch_object_from_id(id, options \\ []) do with %URI{} = uri <- URI.parse(id), - # If we have instance restrictions, apply them here to prevent fetching from unwanted instances {_, {:ok, nil}} <- {:mrf_reject_accept_check, maybe_check_reject_accept(uri)}, {_, nil} <- {:fetch_object, Object.get_cached_by_ap_id(id)}, {_, true} <- {:allowed_depth, Federator.allowed_thread_distance?(options[:depth])}, @@ -88,9 +87,6 @@ defmodule Pleroma.Object.Fetcher do {:object, data, nil} -> reinject_object(%Object{}, data) - {:reject, reason} -> - {:reject, reason} - e -> Logger.metadata(object: id) Logger.error("Object rejected while fetching #{id} #{inspect(e)}")