diff options
author | Eugen Rochko <eugen@zeonfederated.com> | 2019-09-13 16:00:34 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-09-13 16:00:34 +0200 |
commit | b6381bdc7dcfe5713b99e2aae0491115350c7724 (patch) | |
tree | 254aca9c8074ad80aaf45bf602e549de0cfb769e /app | |
parent | bc869501f5cf98a99b18f6d1bcab3b51db04008d (diff) |
Change max length of media descriptions from 420 to 1500 characters (#11819)
Fix #11658
Diffstat (limited to 'app')
-rw-r--r-- | app/javascript/mastodon/features/ui/components/focal_point_modal.js | 2 | ||||
-rw-r--r-- | app/models/media_attachment.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/javascript/mastodon/features/ui/components/focal_point_modal.js b/app/javascript/mastodon/features/ui/components/focal_point_modal.js index 735e445e8..d13138a76 100644 --- a/app/javascript/mastodon/features/ui/components/focal_point_modal.js +++ b/app/javascript/mastodon/features/ui/components/focal_point_modal.js @@ -223,7 +223,7 @@ class FocalPointModal extends ImmutablePureComponent { <div className='setting-text__toolbar'> <button disabled={detecting || media.get('type') !== 'image'} className='link-button' onClick={this.handleTextDetection}><FormattedMessage id='upload_modal.detect_text' defaultMessage='Detect text from picture' /></button> - <CharacterCounter max={420} text={detecting ? '' : description} /> + <CharacterCounter max={1500} text={detecting ? '' : description} /> </div> <Button disabled={!dirty || detecting || length(description) > 420} text={intl.formatMessage(messages.apply)} onClick={this.handleSubmit} /> diff --git a/app/models/media_attachment.rb b/app/models/media_attachment.rb index a2b73f150..c4932f2ef 100644 --- a/app/models/media_attachment.rb +++ b/app/models/media_attachment.rb @@ -123,7 +123,7 @@ class MediaAttachment < ApplicationRecord include Attachmentable validates :account, presence: true - validates :description, length: { maximum: 420 }, if: :local? + validates :description, length: { maximum: 1_500 }, 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) } |