diff options
| author | Alex Gleason <alex@alexgleason.me> | 2022-01-20 23:18:24 +0000 |
|---|---|---|
| committer | Alex Gleason <alex@alexgleason.me> | 2022-01-20 23:18:24 +0000 |
| commit | 6ffe43af70cf69b4bfe1fff778685e907b5ef988 (patch) | |
| tree | ecaa94384ed11802ca00be0889f95e3669a25639 /lib | |
| parent | 560bcd58ab100116b5cbdf3ccb1a860107a23327 (diff) | |
| parent | 00523bdf5e4c61ffb1fdd66a3345a26848a20ca9 (diff) | |
Merge branch 'private-pins' into 'develop'
Support private pinned posts from Mastodon
See merge request pleroma/pleroma!3611
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/activity_pub/activity_pub.ex | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex index 756096952..9ca44c532 100644 --- a/lib/pleroma/web/activity_pub/activity_pub.ex +++ b/lib/pleroma/web/activity_pub/activity_pub.ex @@ -1664,7 +1664,10 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do "orderedItems" => objects }) when type in ["OrderedCollection", "Collection"] do - Map.new(objects, fn %{"id" => object_ap_id} -> {object_ap_id, NaiveDateTime.utc_now()} 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) end def fetch_and_prepare_featured_from_ap_id(nil) do |