Anon/pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix user fetch completely broken if featured collection is not in a supported form

Browse Source
This commit is contained in:
tusooa 2023-07-02 11:03:09 -04:00
parent 48e490cd58
commit a1621839cc
No known key found for this signature in database
GPG Key ID: 42AEC43D48433C51
3 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/featured-collection-shouldnt-break-user-fetch.fix Normal file
View File

@ -0,0 +1 @@
Fix user fetch completely broken if featured collection is not in a supported form

5
lib/pleroma/web/activity_pub/activity_pub.ex
View File

@ -1720,6 +1720,11 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
end) end)
end end
def pin_data_from_featured_collection(obj) do
Logger.error("Could not parse featured collection #{inspect(obj)}")
%{}
end
def fetch_and_prepare_featured_from_ap_id(nil) do def fetch_and_prepare_featured_from_ap_id(nil) do
{:ok, %{}} {:ok, %{}}
end end

8
test/pleroma/web/activity_pub/activity_pub_test.exs
View File

@ -2652,4 +2652,12 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubTest do
{:ok, user} = ActivityPub.make_user_from_ap_id("https://princess.cat/users/mewmew") {:ok, user} = ActivityPub.make_user_from_ap_id("https://princess.cat/users/mewmew")
assert user.name == " " assert user.name == " "
end end
test "pin_data_from_featured_collection will ignore unsupported values" do
assert %{} ==
ActivityPub.pin_data_from_featured_collection(%{
"type" => "OrderedCollection",
"first" => "https://social.example/users/alice/collections/featured?page=true"
})
end
end end