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

Validates local username, max sizes for uploads. Fixes #32

rebase/4.0.0rc2
Eugen Rochko 2016-09-10 09:43:45 +02:00
parent de7eb2341a
commit d6b3113304
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/models/account.rb
View File

@ -3,16 +3,18 @@ class Account < ApplicationRecord
# Local users
has_one :user, inverse_of: :account
validates :username, presence: true, uniqueness: { scope: :domain, case_sensitive: false }, if: 'local?'
validates :username, presence: true, uniqueness: { scope: :domain, case_sensitive: true }, unless: 'local?'
validates :username, presence: true, format: { with: /\A[a-z0-9_]+\z/i, message: 'only letters, numbers and underscores' }, uniqueness: { scope: :domain, case_sensitive: false }, if: 'local?'
validates :username, presence: true, uniqueness: { scope: :domain, case_sensitive: true }, unless: 'local?'
# Avatar upload
has_attached_file :avatar, styles: { large: '300x300#', medium: '96x96#', small: '48x48#' }
validates_attachment_content_type :avatar, content_type: /\Aimage\/.*\Z/
validates_attachment_size :avatar, less_than: 2.megabytes
# Header upload
has_attached_file :header, styles: { medium: '700x335#' }
validates_attachment_content_type :header, content_type: /\Aimage\/.*\Z/
validates_attachment_size :header, less_than: 2.megabytes
# Local user profile validations
validates :display_name, length: { maximum: 30 }, if: 'local?'

1
app/models/media_attachment.rb
View File

@ -4,6 +4,7 @@ class MediaAttachment < ApplicationRecord
has_attached_file :file, styles: { small: '510x680>' }
validates_attachment_content_type :file, content_type: /\Aimage\/.*\z/
validates_attachment_size :file, less_than: 4.megabytes
validates :account, presence: true