Object.Fetcher: Keep the with-do block as per kaniini proposition

lib/pleroma/object/fetcher.ex

@@ -31,11 +31,10 @@ defmodule Pleroma.Object.Fetcher do
       {:ok, object}
     else
       Logger.info("Fetching #{id} via AP")
-      {status, data} = fetch_and_contain_remote_object_from_id(id)
-      object = Object.normalize(data, false)
 
-      if status == :ok and object == nil do
+      with {:fetch, {:ok, data}} <- {:fetch, fetch_and_contain_remote_object_from_id(id)},
-        with params <- %{
+           {:normalize, nil} <- {:normalize, Object.normalize(data, false)},
+           params <- %{
              "type" => "Create",
              "to" => data["to"],
              "cc" => data["cc"],
@@ -43,31 +42,25 @@ defmodule Pleroma.Object.Fetcher do
              "actor" => data["actor"] || data["attributedTo"],
              "object" => data
            },
-             :ok <- Containment.contain_origin(id, params),
+           {:containment, :ok} <- {:containment, Containment.contain_origin(id, params)},
            {:ok, activity} <- Transmogrifier.handle_incoming(params, options),
            {:object, _data, %Object{} = object} <-
              {:object, data, Object.normalize(activity, false)} do
         {:ok, object}
       else
+        {:containment, _} ->
+          {:error, "Object containment failed."}
+
         {:error, {:reject, nil}} ->
           {:reject, nil}
 
         {:object, data, nil} ->
           reinject_object(data)
 
-          object = %Object{} ->
+        {:normalize, object = %Object{}} ->
           {:ok, object}
 
-          :error ->
+        _e ->
-            {:error, "Object containment failed."}
-
-          e ->
-            e
-        end
-      else
-        if status == :ok and object != nil do
-          {:ok, object}
-        else
           # Only fallback when receiving a fetch/normalization error with ActivityPub
           Logger.info("Couldn't get object via AP, trying out OStatus fetching...")
 
@@ -79,7 +72,6 @@ defmodule Pleroma.Object.Fetcher do
       end
     end
   end
-  end
 
   def fetch_object_from_id!(id, options \\ []) do
     with {:ok, object} <- fetch_object_from_id(id, options) do