Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix crash when encountering invalid account fields #16598

Merged
merged 2 commits into from
Aug 11, 2021
Merged

Fix crash when encountering invalid account fields #16598

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e6ec6e5
Add test
ClearlyClaire Aug 11, 2021
0c43999
Fix crash when encountering invalid account fields
ClearlyClaire Aug 11, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion app/models/account.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,11 @@ def also_known_as
end

def fields
(self[:fields] || []).map { |f| Field.new(self, f) }
(self[:fields] || []).map do |f|
Field.new(self, f)
rescue
nil
end.compact
end

def fields_attributes=(attributes)
Expand Down
1 change: 1 addition & 0 deletions spec/services/activitypub/process_account_service_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
attachment: [
{ type: 'PropertyValue', name: 'Pronouns', value: 'They/them' },
{ type: 'PropertyValue', name: 'Occupation', value: 'Unit test' },
{ type: 'PropertyValue', name: 'non-string', value: ['foo', 'bar'] },
],
}.with_indifferent_access
end
Expand Down