mirrors/pleroma
1
0
Fork 0
mirror of https://git.pleroma.social/pleroma/pleroma.git synced 2024-06-02 13:10:41 +00:00
Code Issues Projects Releases Wiki Activity

activity_pub: fix case when featured collection misses orderedItems field

Browse source
This commit is contained in:
a1batross 2022-04-25 00:48:11 +02:00 committed by Alibek Omarov
parent d91e9cee04
commit 7e43e71234
1 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
lib/pleroma/web/activity_pub/activity_pub.ex
View file

@ -1673,15 +1673,19 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
end end
end end
def pin_data_from_featured_collection(%{ def pin_data_from_featured_collection(ap_id, %{"type" => type} = data)
"type" => type,
"orderedItems" => objects
})
when type in ["OrderedCollection", "Collection"] do when type in ["OrderedCollection", "Collection"] do
Map.new(objects, fn objects = Map.get(data, "orderedItems", nil)
%{"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()} if is_list(objects) do
end) Map.new(objects, fn
%{"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
@ -1690,7 +1694,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(data)} {:ok, pin_data_from_featured_collection(ap_id, 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)}")