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

uploads: replace old upload limits with new upload limits.

Browse Source
This commit is contained in:
evazion
2020-02-03 18:37:14 -06:00
parent 24cb920608
commit 3c2a379d6f
20 changed files with 67 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/models/upload.rb
View File

@@ -60,7 +60,6 @@ class Upload < ApplicationRecord
before_validation :initialize_attributes, on: :create
before_validation :assign_rating_from_tags
validate :uploader_is_not_limited, on: :create
# validates :source, format: { with: /\Ahttps?/ }, if: ->(record) {record.file.blank?}, on: :create
validates :rating, inclusion: { in: %w(q e s) }, allow_nil: true
validates :md5, confirmation: true, if: ->(rec) { rec.md5_confirmation.present? }
@@ -235,12 +234,6 @@ class Upload < ApplicationRecord
extend SearchMethods
include SourceMethods
def uploader_is_not_limited
if !uploader.can_upload?
errors.add(:uploader, uploader.upload_limited_reason)
end
end
def assign_rating_from_tags
if rating = Tag.has_metatag?(tag_string, :rating)
self.rating = rating.downcase.first