jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #5220 from nonamethanks/duration-validation

Browse Source 
Uploads: allow admins to bypass duration limits again
This commit is contained in:
evazion
2022-09-15 03:46:21 -05:00
committed by GitHub
parent 04f98d3b8c b1ae6112bd
commit 9e16de13ef
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/models/media_asset.rb
View File

@@ -47,7 +47,7 @@ class MediaAsset < ApplicationRecord
validates :file_ext, inclusion: { in: FILE_TYPES, message: "File is not an image or video" } validates :file_ext, inclusion: { in: FILE_TYPES, message: "File is not an image or video" }
validates :file_size, numericality: { less_than_or_equal_to: Danbooru.config.max_file_size, message: ->(asset, _) { "too large (size: #{asset.file_size.to_formatted_s(:human_size)}; max size: #{Danbooru.config.max_file_size.to_formatted_s(:human_size)})" } } validates :file_size, numericality: { less_than_or_equal_to: Danbooru.config.max_file_size, message: ->(asset, _) { "too large (size: #{asset.file_size.to_formatted_s(:human_size)}; max size: #{Danbooru.config.max_file_size.to_formatted_s(:human_size)})" } }
validates :file_key, length: { is: FILE_KEY_LENGTH }, uniqueness: true, if: :file_key_changed? validates :file_key, length: { is: FILE_KEY_LENGTH }, uniqueness: true, if: :file_key_changed?
validates :duration, numericality: { less_than_or_equal_to: MAX_VIDEO_DURATION, message: "must be less than #{MAX_VIDEO_DURATION} seconds", allow_nil: true }, on: :create # XXX should allow admins to bypass validate :validate_duration, on: :create
validate :validate_resolution, on: :create validate :validate_resolution, on: :create
before_create :initialize_file_key before_create :initialize_file_key
@@ -409,6 +409,13 @@ class MediaAsset < ApplicationRecord
errors.add(:image_height, "is too large (height: #{image_height}; max height: #{MAX_IMAGE_HEIGHT})") errors.add(:image_height, "is too large (height: #{image_height}; max height: #{MAX_IMAGE_HEIGHT})")
end end
end end
def validate_duration
return if CurrentUser.user.is_admin?
if duration.to_i > MAX_VIDEO_DURATION
errors.add(:base, "duration must be less than #{MAX_VIDEO_DURATION} seconds")
end
end
end end
def self.generate_file_key def self.generate_file_key