Revert "activity_pub: fix case when featured collection misses orderedItems field"
This reverts commit 8dc92d962b
.
This commit is contained in:
parent
8cd92c7838
commit
bfab5d210b
|
@ -1682,19 +1682,15 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
def pin_data_from_featured_collection(ap_id, %{"type" => type} = data)
|
def pin_data_from_featured_collection(%{
|
||||||
|
"type" => type,
|
||||||
|
"orderedItems" => objects
|
||||||
|
})
|
||||||
when type in ["OrderedCollection", "Collection"] do
|
when type in ["OrderedCollection", "Collection"] do
|
||||||
objects = Map.get(data, "orderedItems", nil)
|
Map.new(objects, fn
|
||||||
|
%{"id" => object_ap_id} -> {object_ap_id, NaiveDateTime.utc_now()}
|
||||||
if is_list(objects) do
|
object_ap_id when is_binary(object_ap_id) -> {object_ap_id, NaiveDateTime.utc_now()}
|
||||||
Map.new(objects, fn
|
end)
|
||||||
%{"id" => object_ap_id} -> {object_ap_id, NaiveDateTime.utc_now()}
|
|
||||||
object_ap_id when is_binary(object_ap_id) -> {object_ap_id, NaiveDateTime.utc_now()}
|
|
||||||
end)
|
|
||||||
else
|
|
||||||
Logger.error("Could not decode featured collection at #{ap_id}, #{inspect(data)}")
|
|
||||||
%{}
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|
||||||
def fetch_and_prepare_featured_from_ap_id(nil) do
|
def fetch_and_prepare_featured_from_ap_id(nil) do
|
||||||
|
@ -1703,7 +1699,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
|
||||||
|
|
||||||
def fetch_and_prepare_featured_from_ap_id(ap_id) do
|
def fetch_and_prepare_featured_from_ap_id(ap_id) do
|
||||||
with {:ok, data} <- Fetcher.fetch_and_contain_remote_object_from_id(ap_id) do
|
with {:ok, data} <- Fetcher.fetch_and_contain_remote_object_from_id(ap_id) do
|
||||||
{:ok, pin_data_from_featured_collection(ap_id, data)}
|
{:ok, pin_data_from_featured_collection(data)}
|
||||||
else
|
else
|
||||||
e ->
|
e ->
|
||||||
Logger.error("Could not decode featured collection at fetch #{ap_id}, #{inspect(e)}")
|
Logger.error("Could not decode featured collection at fetch #{ap_id}, #{inspect(e)}")
|
||||||
|
|
Loading…
Reference in New Issue