Bring our adjustments into line with atom-failure

lib/pleroma/collections/fetcher.ex

@@ -68,7 +68,10 @@ defp fetch_page_items(id, items \\ []) do
           items
         end
       else
-        {:error, {"Object has been deleted", _, _}} ->
+        {:error, :not_found} ->
+          items
+
+        {:error, :forbidden} ->
           items
 
         {:error, error} ->

lib/pleroma/object/fetcher.ex

@@ -122,7 +122,7 @@ def refetch_object(%Object{data: %{"id" => id}} = object) do
       {:ok, object}
     else
       {:local, true} -> {:ok, object}
-      {:id, false} -> {:error, "Object id changed on refetch"}
+      {:id, false} -> {:error, :id_mismatch}
       e -> {:error, e}
     end
   end
@@ -136,7 +136,7 @@ def refetch_object(%Object{data: %{"id" => id}} = object) do
   def fetch_object_from_id(id, options \\ []) do
     with %URI{} = uri <- URI.parse(id),
          # let's check the URI is even vaguely valid first
-         {:scheme, true} <- {:scheme, uri.scheme == "http" or uri.scheme == "https"},
+         {:valid_uri_scheme, true} <- {:valid_uri_scheme, uri.scheme == "http" or uri.scheme == "https"},
          # If we have instance restrictions, apply them here to prevent fetching from unwanted instances
          {:ok, nil} <- Pleroma.Web.ActivityPub.MRF.SimplePolicy.check_reject(uri),
          {:ok, _} <- Pleroma.Web.ActivityPub.MRF.SimplePolicy.check_accept(uri),
@@ -155,8 +155,9 @@ def fetch_object_from_id(id, options \\ []) do
         log_fetch_error(id, e)
         {:error, :allowed_depth}
 
-      {:scheme, false} ->
+      {:valid_uri_scheme, _} = e ->
-        {:error, "URI Scheme Invalid"}
+        log_fetch_error(id, e)
+        {:error, :invalid_uri_scheme}
 
       {:containment, reason} = e ->
         log_fetch_error(id, e)
@@ -253,7 +254,7 @@ def fetch_and_contain_remote_object_from_id(%{"id" => id}),
   def fetch_and_contain_remote_object_from_id(id) when is_binary(id) do
     Logger.debug("Fetching object #{id} via AP")
 
-    with {:scheme, true} <- {:scheme, String.starts_with?(id, "http")},
+    with {:valid_uri_scheme, true} <- {:valid_uri_scheme, String.starts_with?(id, "http")},
          {_, :ok} <- {:local_fetch, Containment.contain_local_fetch(id)},
          {:ok, final_id, body} <- get_object(id),
          {:ok, data} <- safe_json_decode(body),
@@ -265,17 +266,21 @@ def fetch_and_contain_remote_object_from_id(id) when is_binary(id) do
 
       {:ok, data}
     else
-      {:strict_id, _} ->
+      {:strict_id, _} = e->
-        {:error, "Object's ActivityPub id/url does not match final fetch URL"}
+        log_fetch_error(id, e)
+        {:error, :id_mismatch}
 
-      {:scheme, _} ->
+      {:valid_uri_scheme, _} = e ->
-        {:error, "Unsupported URI scheme"}
+        log_fetch_error(id, e)
+        {:error, :invalid_uri_scheme}
 
-      {:local_fetch, _} ->
+      {:local_fetch, _} = e ->
-        {:error, "Trying to fetch local resource"}
+        log_fetch_error(id, e)
+        {:error, :local_resource}
 
-      {:containment, _} ->
+      {:containment, reason} ->
-        {:error, "Object containment failed."}
+        log_fetch_error(id, reason)
+        {:error, reason}
 
       {:error, e} ->
         {:error, e}
@@ -286,7 +291,7 @@ def fetch_and_contain_remote_object_from_id(id) when is_binary(id) do
   end
 
   def fetch_and_contain_remote_object_from_id(_id),
-    do: {:error, "id must be a string"}
+    do: {:error, :invalid_id}
 
   defp check_crossdomain_redirect(final_host, original_url)
 

test/pleroma/web/activity_pub/transmogrifier_test.exs

@@ -570,7 +570,7 @@ test "returns non-modified object" do
     test "returns nil when cannot normalize object" do
       assert capture_log(fn ->
                refute Transmogrifier.get_obj_helper("test-obj-id")
-             end) =~ "URI Scheme Invalid"
+             end) =~ ":valid_uri_scheme"
     end
 
     @tag capture_log: true