Leatherface/mastodon
0
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2026-03-29 03:00:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'cffa8de6267a57673b7f6264fab671153f965d23' into glitch-soc/merge-upstream

Browse Source
This commit is contained in:
Claire
2026-03-19 12:38:31 +01:00
parent 7d827f1db1 cffa8de626
commit fac3080289
46 changed files with 738 additions and 419 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/lib/activitypub/activity/add.rb
View File

@@ -17,7 +17,7 @@ class ActivityPub::Activity::Add < ActivityPub::Activity
add_collection
else
@collection = @account.collections.find_by(uri: @json['target'])
@collection = @account.collections.find_by(uri: value_or_id(@json['target']))
add_collection_item if @collection && Mastodon::Feature.collections_federation_enabled?
end
end