tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into glitch-soc/merge-upstream

Browse Source 
Conflicts:
- `package.json`
This commit is contained in:
Thibaut Girka
2019-11-06 14:38:28 +01:00
parent 00793a86bc 42d9ca21de
commit 0ae7d84273
31 changed files with 492 additions and 312 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/models/media_attachment.rb
View File

@ -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