diff options
| author | Haelwenn (lanodan) Monnier <contact@hacktivis.me> | 2023-03-24 09:09:41 +0100 |
|---|---|---|
| committer | Haelwenn (lanodan) Monnier <contact@hacktivis.me> | 2024-09-21 14:06:26 +0200 |
| commit | 3dd6f6585985a085c1c2f2243501323864dcac2d (patch) | |
| tree | 4804040c23ab6a5d5c599af3d8df0b06e2cd11c0 /lib | |
| parent | 03e14e759db47633cce320285d93d8c1f3bde65c (diff) | |
| download | pleroma-3dd6f6585985a085c1c2f2243501323864dcac2d.tar.gz pleroma-3dd6f6585985a085c1c2f2243501323864dcac2d.zip | |
Object.Fetcher: Hook to MRF.id_filter
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/object/fetcher.ex | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/pleroma/object/fetcher.ex b/lib/pleroma/object/fetcher.ex index 69a5f3268..c85a8b09f 100644 --- a/lib/pleroma/object/fetcher.ex +++ b/lib/pleroma/object/fetcher.ex @@ -145,6 +145,7 @@ defmodule Pleroma.Object.Fetcher do Logger.debug("Fetching object #{id} via AP") with {:scheme, true} <- {:scheme, String.starts_with?(id, "http")}, + {_, true} <- {:mrf, MRF.id_filter(id)}, {:ok, body} <- get_object(id), {:ok, data} <- safe_json_decode(body), :ok <- Containment.contain_origin_from_id(id, data) do @@ -160,6 +161,9 @@ defmodule Pleroma.Object.Fetcher do {:error, e} -> {:error, e} + {:mrf, false} -> + {:error, {:reject, "Filtered by id"}} + e -> {:error, e} end |