Object.Fetcher: Fallback to OStatus only if AP actually fails

lib/pleroma/object/fetcher.ex

@@ -27,18 +27,20 @@ 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)
 
-      with {:ok, data} <- fetch_and_contain_remote_object_from_id(id),
+      if status == :ok and object == nil do
-           nil <- Object.normalize(data, false),
+        with params <- %{
-           params <- %{
                "type" => "Create",
                "to" => data["to"],
                "cc" => data["cc"],
+               # Should we seriously keep this attributedTo thing?
                "actor" => data["actor"] || data["attributedTo"],
                "object" => data
              },
              :ok <- Containment.contain_origin(id, params),
-           {:ok, activity} <- Transmogrifier.handle_incoming(params),
+             {:ok, activity} <- Transmogrifier.handle_incoming(params, options),
              {:object, _data, %Object{} = object} <-
                {:object, data, Object.normalize(activity, false)} do
           {:ok, object}
@@ -52,9 +54,20 @@ defmodule Pleroma.Object.Fetcher do
           object = %Object{} ->
             {:ok, object}
 
-        _e ->
+          :error ->
+            {: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...")
 
+          # FIXME: OStatus Object Containment?
           case OStatus.fetch_activity_from_url(id) do
             {:ok, [activity | _]} -> {:ok, Object.normalize(activity, false)}
             e -> e
@@ -62,6 +75,7 @@ defmodule Pleroma.Object.Fetcher do
         end
       end
     end
+  end
 
   def fetch_object_from_id!(id) do
     with {:ok, object} <- fetch_object_from_id(id) do