diff options
author | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2023-07-02 21:25:45 +0000 |
---|---|---|
committer | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2023-07-02 21:25:45 +0000 |
commit | 379590d4383810285290dcc0f1ed701f4449e161 (patch) | |
tree | 02f59af6a74590404ccf06044783c2564843ebc8 /lib | |
parent | 8cf231c0d101fc7358180fecd328fb38764da9d1 (diff) | |
parent | a1621839cc31a92e346cbd6065c4db6a8ebeb5a9 (diff) | |
download | pleroma-379590d4383810285290dcc0f1ed701f4449e161.tar.gz pleroma-379590d4383810285290dcc0f1ed701f4449e161.zip |
Merge branch 'tusooa/3142-featured-collection-shouldnt-break-user-fetch' into 'develop'
Fix user fetch completely broken if featured collection is not in a supported form
See merge request pleroma/pleroma!3914
Diffstat (limited to 'lib')
-rw-r--r-- | lib/pleroma/web/activity_pub/activity_pub.ex | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex index 1a10aef1d..c93288b79 100644 --- a/lib/pleroma/web/activity_pub/activity_pub.ex +++ b/lib/pleroma/web/activity_pub/activity_pub.ex @@ -1720,6 +1720,11 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do 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 {:ok, %{}} end |