forked from treehouse/mastodon
parent
80b23a6a85
commit
8da4bf0f90
|
@ -74,6 +74,7 @@ class Account < ApplicationRecord
|
||||||
validates_with UnreservedUsernameValidator, if: -> { local? && will_save_change_to_username? }
|
validates_with UnreservedUsernameValidator, if: -> { local? && will_save_change_to_username? }
|
||||||
validates :display_name, length: { maximum: 30 }, if: -> { local? && will_save_change_to_display_name? }
|
validates :display_name, length: { maximum: 30 }, if: -> { local? && will_save_change_to_display_name? }
|
||||||
validates :note, length: { maximum: 160 }, if: -> { local? && will_save_change_to_note? }
|
validates :note, length: { maximum: 160 }, if: -> { local? && will_save_change_to_note? }
|
||||||
|
validates :fields, length: { maximum: 4 }, if: -> { local? && will_save_change_to_fields? }
|
||||||
|
|
||||||
# Timelines
|
# Timelines
|
||||||
has_many :stream_entries, inverse_of: :account, dependent: :destroy
|
has_many :stream_entries, inverse_of: :account, dependent: :destroy
|
||||||
|
@ -198,9 +199,11 @@ class Account < ApplicationRecord
|
||||||
def fields_attributes=(attributes)
|
def fields_attributes=(attributes)
|
||||||
fields = []
|
fields = []
|
||||||
|
|
||||||
attributes.each_value do |attr|
|
if attributes.is_a?(Hash)
|
||||||
next if attr[:name].blank?
|
attributes.each_value do |attr|
|
||||||
fields << attr
|
next if attr[:name].blank?
|
||||||
|
fields << attr
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
self[:fields] = fields
|
self[:fields] = fields
|
||||||
|
@ -269,8 +272,8 @@ class Account < ApplicationRecord
|
||||||
|
|
||||||
def initialize(account, attr)
|
def initialize(account, attr)
|
||||||
@account = account
|
@account = account
|
||||||
@name = attr['name']
|
@name = attr['name'].strip[0, 255]
|
||||||
@value = attr['value']
|
@value = attr['value'].strip[0, 255]
|
||||||
@errors = {}
|
@errors = {}
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue