specter/mastodon
1
0
Fork 0
forked from fedi/mastodon
Code Pull requests Activity

Increase attachment descriptions to 420 characters (#5139)

Browse source 
Blaze it
This commit is contained in:
Eugen Rochko 2017-09-29 02:30:00 +02:00 committed by GitHub
parent d2f56d1cbc
commit 887cd94e96
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
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)}
type='text'
value={description}
maxLength={140}
maxLength={420}
onFocus={this.handleInputFocus}
onChange={this.handleInputChange}
onBlur={this.handleInputBlur}

4
app/models/media_attachment.rb
View file

@ -59,7 +59,7 @@ class MediaAttachment < ApplicationRecord
validates_attachment_size :file, less_than: 8.megabytes
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 :unattached, -> { where(status_id: nil) }
@ -140,7 +140,7 @@ class MediaAttachment < ApplicationRecord
end
def prepare_description
self.description = description.strip[0...140] unless description.nil?
self.description = description.strip[0...420] unless description.nil?
end
def set_type_and_extension

4
spec/models/media_attachment_spec.rb
View file

@ -52,9 +52,9 @@ RSpec.describe MediaAttachment, type: :model do
describe 'descriptions for remote attachments' 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