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

This commit is contained in:
Haelwenn (lanodan) Monnier 2019-07-14 17:28:25 +02:00
parent a2c601acb5
commit 2592934480
No known key found for this signature in database
GPG Key ID: D5B7A8E43C997DEE

View File

@ -31,43 +31,36 @@ defmodule Pleroma.Object.Fetcher do
{:ok, object} {:ok, object}
else else
Logger.info("Fetching #{id} via AP") 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)},
"type" => "Create", params <- %{
"to" => data["to"], "type" => "Create",
"cc" => data["cc"], "to" => data["to"],
# Should we seriously keep this attributedTo thing? "cc" => data["cc"],
"actor" => data["actor"] || data["attributedTo"], # Should we seriously keep this attributedTo thing?
"object" => data "actor" => data["actor"] || data["attributedTo"],
}, "object" => data
:ok <- Containment.contain_origin(id, params), },
{:ok, activity} <- Transmogrifier.handle_incoming(params, options), {:containment, :ok} <- {:containment, Containment.contain_origin(id, params)},
{:object, _data, %Object{} = object} <- {:ok, activity} <- Transmogrifier.handle_incoming(params, options),
{:object, data, Object.normalize(activity, false)} do {:object, _data, %Object{} = object} <-
{:ok, object} {:object, data, Object.normalize(activity, false)} do
else {:ok, object}
{:error, {:reject, nil}} ->
{:reject, nil}
{:object, data, nil} ->
reinject_object(data)
object = %Object{} ->
{:ok, object}
:error ->
{:error, "Object containment failed."}
e ->
e
end
else else
if status == :ok and object != nil do {:containment, _} ->
{:error, "Object containment failed."}
{:error, {:reject, nil}} ->
{:reject, nil}
{:object, data, nil} ->
reinject_object(data)
{:normalize, object = %Object{}} ->
{:ok, object} {:ok, object}
else
_e ->
# Only fallback when receiving a fetch/normalization error with ActivityPub # Only fallback when receiving a fetch/normalization error with ActivityPub
Logger.info("Couldn't get object via AP, trying out OStatus fetching...") Logger.info("Couldn't get object via AP, trying out OStatus fetching...")
@ -76,7 +69,6 @@ defmodule Pleroma.Object.Fetcher do
{:ok, [activity | _]} -> {:ok, Object.normalize(activity, false)} {:ok, [activity | _]} -> {:ok, Object.normalize(activity, false)}
e -> e e -> e
end end
end
end end
end end
end end