ar
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

move some constants to rails environment

rebase/4.0.0rc2
ash lea 2018-10-21 20:57:25 -04:00 committed by ThibG
parent 88659eda24
commit 7ec3f6022d
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/models/account.rb
View File

@ -59,7 +59,9 @@ class Account < ApplicationRecord
include Attachmentable include Attachmentable
include Paginable include Paginable
MAX_NOTE_LENGTH = 500 MAX_DISPLAY_NAME_LENGTH = (ENV['MAX_DISPLAY_NAME_CHARS'] || 30).to_i
MAX_NOTE_LENGTH = (ENV['MAX_BIO_CHARS'] || 500).to_i
MAX_FIELDS = (ENV['MAX_PROFILE_FIELDS'] || 4).to_i
enum protocol: [:ostatus, :activitypub] enum protocol: [:ostatus, :activitypub]
@ -76,9 +78,9 @@ class Account < ApplicationRecord
validates :username, format: { with: /\A[a-z0-9_]+\z/i }, length: { maximum: 30 }, if: -> { local? && will_save_change_to_username? } validates :username, format: { with: /\A[a-z0-9_]+\z/i }, length: { maximum: 30 }, if: -> { local? && will_save_change_to_username? }
validates_with UniqueUsernameValidator, if: -> { local? && will_save_change_to_username? } validates_with UniqueUsernameValidator, if: -> { local? && will_save_change_to_username? }
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: MAX_DISPLAY_NAME_LENGTH }, if: -> { local? && will_save_change_to_display_name? }
validate :note_length_does_not_exceed_length_limit, if: -> { local? && will_save_change_to_note? } validate :note_length_does_not_exceed_length_limit, if: -> { local? && will_save_change_to_note? }
validates :fields, length: { maximum: 4 }, if: -> { local? && will_save_change_to_fields? } validates :fields, length: { maximum: MAX_FIELDS }, 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
@ -246,14 +248,12 @@ class Account < ApplicationRecord
self[:fields] = fields self[:fields] = fields
end end
DEFAULT_FIELDS_SIZE = 4
def build_fields def build_fields
return if fields.size >= DEFAULT_FIELDS_SIZE return if fields.size >= MAX_FIELDS
tmp = self[:fields] || [] tmp = self[:fields] || []
(DEFAULT_FIELDS_SIZE - tmp.size).times do (MAX_FIELDS - tmp.size).times do
tmp << { name: '', value: '' } tmp << { name: '', value: '' }
end end

4
app/views/settings/profiles/show.html.haml
View File

@ -6,8 +6,8 @@
.fields-row .fields-row
.fields-row__column.fields-group.fields-row__column-6 .fields-row__column.fields-group.fields-row__column-6
= f.input :display_name, wrapper: :with_label, input_html: { maxlength: 30 }, hint: false = f.input :display_name, wrapper: :with_label, input_html: { maxlength: Account::MAX_DISPLAY_NAME_LENGTH }, hint: false
= f.input :note, wrapper: :with_label, input_html: { maxlength: 500 }, hint: false = f.input :note, wrapper: :with_label, input_html: { maxlength: Account::MAX_NOTE_LENGTH }, hint: false
.fields-row .fields-row
.fields-row__column.fields-row__column-6 .fields-row__column.fields-row__column-6