erik/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2024-08-20 21:08:15 -07:00
Code Issues Projects Releases Wiki Activity

Fix verified links being re-checked on all profile fetches

Browse source 
Fixes #27755
This commit is contained in:
Claire 2023-11-07 11:44:59 +01:00
parent 3bf2a7296e
commit 77e587129a
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

@ -324,6 +324,18 @@ class Account < ApplicationRecord
end end
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) def fields_attributes=(attributes)
fields = [] fields = []
old_fields = self[:fields] || [] old_fields = self[:fields] || []

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

@ -232,7 +232,7 @@ class ActivityPub::ProcessAccountService < BaseService
def property_values def property_values
return unless @json['attachment'].is_a?(Array) 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 end
def mismatching_origin?(url) def mismatching_origin?(url)