forked from treehouse/mastodon
Validates local username, max sizes for uploads. Fixes #32
parent
de7eb2341a
commit
d6b3113304
|
@ -3,16 +3,18 @@ class Account < ApplicationRecord
|
||||||
|
|
||||||
# Local users
|
# Local users
|
||||||
has_one :user, inverse_of: :account
|
has_one :user, inverse_of: :account
|
||||||
validates :username, presence: true, uniqueness: { scope: :domain, case_sensitive: false }, if: '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?'
|
validates :username, presence: true, uniqueness: { scope: :domain, case_sensitive: true }, unless: 'local?'
|
||||||
|
|
||||||
# Avatar upload
|
# Avatar upload
|
||||||
has_attached_file :avatar, styles: { large: '300x300#', medium: '96x96#', small: '48x48#' }
|
has_attached_file :avatar, styles: { large: '300x300#', medium: '96x96#', small: '48x48#' }
|
||||||
validates_attachment_content_type :avatar, content_type: /\Aimage\/.*\Z/
|
validates_attachment_content_type :avatar, content_type: /\Aimage\/.*\Z/
|
||||||
|
validates_attachment_size :avatar, less_than: 2.megabytes
|
||||||
|
|
||||||
# Header upload
|
# Header upload
|
||||||
has_attached_file :header, styles: { medium: '700x335#' }
|
has_attached_file :header, styles: { medium: '700x335#' }
|
||||||
validates_attachment_content_type :header, content_type: /\Aimage\/.*\Z/
|
validates_attachment_content_type :header, content_type: /\Aimage\/.*\Z/
|
||||||
|
validates_attachment_size :header, less_than: 2.megabytes
|
||||||
|
|
||||||
# Local user profile validations
|
# Local user profile validations
|
||||||
validates :display_name, length: { maximum: 30 }, if: 'local?'
|
validates :display_name, length: { maximum: 30 }, if: 'local?'
|
||||||
|
|
|
@ -4,6 +4,7 @@ class MediaAttachment < ApplicationRecord
|
||||||
|
|
||||||
has_attached_file :file, styles: { small: '510x680>' }
|
has_attached_file :file, styles: { small: '510x680>' }
|
||||||
validates_attachment_content_type :file, content_type: /\Aimage\/.*\z/
|
validates_attachment_content_type :file, content_type: /\Aimage\/.*\z/
|
||||||
|
validates_attachment_size :file, less_than: 4.megabytes
|
||||||
|
|
||||||
validates :account, presence: true
|
validates :account, presence: true
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue