diff options
| author | Reverite <github@reverite.sh> | 2019-11-13 20:03:31 -0500 |
|---|---|---|
| committer | Reverite <github@reverite.sh> | 2019-11-13 20:03:31 -0500 |
| commit | 61a70e595d9ec7a6937d31b36d33063520cf1385 (patch) | |
| tree | 6d7697e892f9324a5d6f00ed933606fea25fd871 /app/models/media_attachment.rb | |
| parent | 48635bf45f6402c8f82d4cb66fa42e3e5e8f30c2 (diff) | |
| parent | 707c4918b21d19dd53b64120dbc7263f45fc5ecd (diff) | |
Merge branch 'glitch' into production
Diffstat (limited to 'app/models/media_attachment.rb')
| -rw-r--r-- | app/models/media_attachment.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/app/models/media_attachment.rb b/app/models/media_attachment.rb index b5e65212e..9bba89e57 100644 --- a/app/models/media_attachment.rb +++ b/app/models/media_attachment.rb @@ -26,6 +26,8 @@ class MediaAttachment < ApplicationRecord enum type: [:image, :gifv, :video, :unknown, :audio] + MAX_DESCRIPTION_LENGTH = 1_500 + IMAGE_FILE_EXTENSIONS = %w(.jpg .jpeg .png .gif).freeze VIDEO_FILE_EXTENSIONS = %w(.webm .mp4 .m4v .mov).freeze AUDIO_FILE_EXTENSIONS = %w(.ogg .oga .mp3 .wav .flac .opus .aac .m4a .3gp .wma).freeze @@ -139,7 +141,7 @@ class MediaAttachment < ApplicationRecord include Attachmentable validates :account, presence: true - validates :description, length: { maximum: 1_500 }, if: :local? + validates :description, length: { maximum: MAX_DESCRIPTION_LENGTH }, if: :local? scope :attached, -> { where.not(status_id: nil).or(where.not(scheduled_status_id: nil)) } scope :unattached, -> { where(status_id: nil, scheduled_status_id: nil) } @@ -243,7 +245,7 @@ class MediaAttachment < ApplicationRecord end def prepare_description - self.description = description.strip[0...420] unless description.nil? + self.description = description.strip[0...MAX_DESCRIPTION_LENGTH] unless description.nil? end def set_type_and_extension |