diff options
| author | ThibG <thib@sitedethib.com> | 2019-11-04 13:00:16 +0100 |
|---|---|---|
| committer | multiple creatures <dev@multiple-creature.party> | 2020-02-21 03:34:42 -0600 |
| commit | e19765e0f2e0b7e99e8c7c5b4285b8ca83892c99 (patch) | |
| tree | c27d6a6d02c3f243fb80d0f3ee7d01ca458f0123 /app/models | |
| parent | e6bb4bd747a0120dd0207aecbb7c5c67b7caa165 (diff) | |
port tootsuite#12262 to monsterfork: Fix remote media descriptions being cut off at 420 chars
* Fix remote media descriptions being cut off at 420 chars Fixes #12258 * Fix tests
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/media_attachment.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/models/media_attachment.rb b/app/models/media_attachment.rb index f8e925942..1744ee58c 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, :audio, :unknown] + MAX_DESCRIPTION_LENGTH = 6666 + IMAGE_FILE_EXTENSIONS = %w(.jpg .jpeg .png .gif .webp).freeze VIDEO_FILE_EXTENSIONS = %w(.webm .mp4 .m4v .mov).freeze AUDIO_FILE_EXTENSIONS = %w(.ogg .oga .mp3 .wav .flac .opus .aac .m4a .3gp).freeze @@ -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 |