techhub/mastodon
2
0
Fork 0
Code Activity

Fix processing of Link objects in Image objects (#29335)

Browse Source
This commit is contained in:
Claire
2024-02-22 22:27:24 +01:00
committed by GitHub
parent 5152dd869e
commit 9d8dfeb5fb
2 changed files with 33 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/services/activitypub/process_account_service.rb
View File

@@ -201,10 +201,15 @@ class ActivityPub::ProcessAccountService < BaseService
value = first_of_value(@json[key])
return if value.nil?
return value['url'] if value.is_a?(Hash)
image = fetch_resource_without_id_validation(value)
image['url'] if image
if value.is_a?(String)
value = fetch_resource_without_id_validation(value)
return if value.nil?
end
value = first_of_value(value['url']) if value.is_a?(Hash) && value['type'] == 'Image'
value = value['href'] if value.is_a?(Hash)
value if value.is_a?(String)
end
def public_key