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

diff --git a/app/models/account.rb b/app/models/account.rb
index 26434547211d4eb5aadb1afc5e5f3c15b88d6b46..8792b90ea790ac5f5a13257960a9ad89448806b9 100644 (file)
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -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?'

diff --git a/app/models/media_attachment.rb b/app/models/media_attachment.rb
index 1f51e3d13aebe57b568032b8429f5fe59def23c4..0f631af575e1182c3fb5e23dfd96b42c55a47e9a 100644 (file)
--- a/app/models/media_attachment.rb
+++ b/app/models/media_attachment.rb
@@ -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