gnh1201/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2025-05-09 05:06:14 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Fix crash when likes or shares collections are not inlined (#34618)

Browse Source
This commit is contained in:
Claire 2025-05-06 09:39:26 +02:00 committed by GitHub
parent df6b808750
commit 3e5d78cc5b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/lib/activitypub/parser/status_parser.rb
View File

@ -95,11 +95,11 @@ class ActivityPub::Parser::StatusParser
end end
def favourites_count def favourites_count
@object.dig('likes', 'totalItems') @object.dig('likes', 'totalItems') if @object.is_a?(Hash)
end end
def reblogs_count def reblogs_count
@object.dig('shares', 'totalItems') @object.dig('shares', 'totalItems') if @object.is_a?(Hash)
end end
def quote_policy def quote_policy

6
spec/lib/activitypub/activity/create_spec.rb
View File

@ -20,7 +20,7 @@ RSpec.describe ActivityPub::Activity::Create do
type: 'Create', type: 'Create',
actor: ActivityPub::TagManager.instance.uri_for(sender), actor: ActivityPub::TagManager.instance.uri_for(sender),
object: object_json, object: object_json,
}.with_indifferent_access }.deep_stringify_keys
end end
before do before do
@ -102,7 +102,7 @@ RSpec.describe ActivityPub::Activity::Create do
type: 'Create', type: 'Create',
actor: ActivityPub::TagManager.instance.uri_for(sender), actor: ActivityPub::TagManager.instance.uri_for(sender),
object: json, object: json,
}.with_indifferent_access }.deep_stringify_keys
end end
before do before do
@ -1076,7 +1076,7 @@ RSpec.describe ActivityPub::Activity::Create do
type: 'Create', type: 'Create',
actor: ActivityPub::TagManager.instance.uri_for(sender), actor: ActivityPub::TagManager.instance.uri_for(sender),
object: Addressable::URI.new(scheme: 'bear', query_values: { t: token, u: object_json[:id] }).to_s, object: Addressable::URI.new(scheme: 'bear', query_values: { t: token, u: object_json[:id] }).to_s,
}.with_indifferent_access }.deep_stringify_keys
end end
let(:object_json) do let(:object_json) do

2
spec/lib/activitypub/parser/status_parser_spec.rb
View File

@ -16,7 +16,7 @@ RSpec.describe ActivityPub::Parser::StatusParser do
type: 'Create', type: 'Create',
actor: ActivityPub::TagManager.instance.uri_for(sender), actor: ActivityPub::TagManager.instance.uri_for(sender),
object: object_json, object: object_json,
}.with_indifferent_access }.deep_stringify_keys
end end
let(:object_json) do let(:object_json) do