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

lib/pleroma/object/fetcher.ex

@@ -31,42 +31,52 @@ def fetch_object_from_id(id, options \\ []) 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",
-             "type" => "Create",
+               "to" => data["to"],
-             "to" => data["to"],
+               "cc" => data["cc"],
-             "cc" => data["cc"],
+               # Should we seriously keep this attributedTo thing?
-             # TODO: Should we seriously keep this attributedTo thing?
+               "actor" => data["actor"] || data["attributedTo"],
-             "actor" => data["actor"] || data["attributedTo"],
+               "object" => data
-             "object" => data
+             },
-           },
+             :ok <- Containment.contain_origin(id, params),
-           :ok <- Containment.contain_origin(id, params),
+             {:ok, activity} <- Transmogrifier.handle_incoming(params, options),
-           {:ok, activity} <- Transmogrifier.handle_incoming(params, options),
+             {:object, _data, %Object{} = object} <-
-           {:object, _data, %Object{} = object} <-
+               {:object, data, Object.normalize(activity, false)} do
-             {:object, data, Object.normalize(activity, false)} do
-        {:ok, object}
-      else
-        {:error, {:reject, nil}} ->
-          {:reject, nil}
-
-        {:object, data, nil} ->
-          reinject_object(data)
-
-        object = %Object{} ->
           {:ok, object}
+        else
+          {:error, {:reject, nil}} ->
+            {:reject, nil}
 
-        :error ->
+          {:object, data, nil} ->
-          {:error, "Object containment failed."}
+            reinject_object(data)
 
-        _e ->
+          object = %Object{} ->
+            {:ok, object}
+
+          :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
           end
+        end
       end
     end
   end