zelo72
/
mastodon
mirror of https://github.com/mastodon/mastodon
2
2
Fork 1
Code Issues 9 Releases Wiki Activity

Merge 77e587129a into 1959365c2f

This commit is contained in:
Claire 2024-05-10 20:06:53 +00:00 committed by GitHub
parent 1959365c2f 77e587129a
commit 9bc3cc1be5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/models/account.rb
View File

@ -336,6 +336,18 @@ class Account < ApplicationRecord
end
end
def fields=(fields)
old_fields = self[:fields] || []
old_fields = [] if old_fields.is_a?(Hash)
self[:fields] = fields.map do |field|
verified_at = old_fields.find { |item| item['value'] == field['value'] }&.fetch('verified_at', nil)
next field if verified_at.blank?
field.merge('verified_at' => verified_at)
end
end
def fields_attributes=(attributes)
fields = []
old_fields = self[:fields] || []

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

@ -237,7 +237,7 @@ class ActivityPub::ProcessAccountService < BaseService
def property_values
return unless @json['attachment'].is_a?(Array)
as_array(@json['attachment']).select { |attachment| attachment['type'] == 'PropertyValue' }.map { |attachment| attachment.slice('name', 'value') }
as_array(@json['attachment']).filter_map { |attachment| attachment.slice('name', 'value') if attachment['type'] == 'PropertyValue' }
end
def mismatching_origin?(url)