Browse Source

Increase attachment descriptions to 420 characters (#5139)

Blaze it
pull/4/head
Eugen Rochko 6 years ago
committed by GitHub
parent
commit
887cd94e96
3 changed files with 5 additions and 5 deletions
  1. +1
    -1
      app/javascript/mastodon/features/compose/components/upload.js
  2. +2
    -2
      app/models/media_attachment.rb
  3. +2
    -2
      spec/models/media_attachment_spec.rb

+ 1
- 1
app/javascript/mastodon/features/compose/components/upload.js View File

@ -79,7 +79,7 @@ export default class Upload extends ImmutablePureComponent {
placeholder={intl.formatMessage(messages.description)} placeholder={intl.formatMessage(messages.description)}
type='text' type='text'
value={description} value={description}
maxLength={140}
maxLength={420}
onFocus={this.handleInputFocus} onFocus={this.handleInputFocus}
onChange={this.handleInputChange} onChange={this.handleInputChange}
onBlur={this.handleInputBlur} onBlur={this.handleInputBlur}

+ 2
- 2
app/models/media_attachment.rb View File

@ -59,7 +59,7 @@ class MediaAttachment < ApplicationRecord
validates_attachment_size :file, less_than: 8.megabytes validates_attachment_size :file, less_than: 8.megabytes
validates :account, presence: true validates :account, presence: true
validates :description, length: { maximum: 140 }, if: :local?
validates :description, length: { maximum: 420 }, if: :local?
scope :attached, -> { where.not(status_id: nil) } scope :attached, -> { where.not(status_id: nil) }
scope :unattached, -> { where(status_id: nil) } scope :unattached, -> { where(status_id: nil) }
@ -140,7 +140,7 @@ class MediaAttachment < ApplicationRecord
end end
def prepare_description def prepare_description
self.description = description.strip[0...140] unless description.nil?
self.description = description.strip[0...420] unless description.nil?
end end
def set_type_and_extension def set_type_and_extension

+ 2
- 2
spec/models/media_attachment_spec.rb View File

@ -52,9 +52,9 @@ RSpec.describe MediaAttachment, type: :model do
describe 'descriptions for remote attachments' do describe 'descriptions for remote attachments' do
it 'are cut off at 140 characters' do it 'are cut off at 140 characters' do
media = Fabricate(:media_attachment, description: 'foo' * 100, remote_url: 'http://example.com/blah.jpg')
media = Fabricate(:media_attachment, description: 'foo' * 1000, remote_url: 'http://example.com/blah.jpg')
expect(media.description.size).to be <= 140
expect(media.description.size).to be <= 420
end end
end end
end end

Loading…
Cancel
Save