Skip to content

Commit

Permalink
port tootsuite#12262 to monsterfork: Fix remote media descriptions be…
Browse files Browse the repository at this point in the history
…ing cut off at 420 chars

* Fix remote media descriptions being cut off at 420 chars

Fixes mastodon#12258

* Fix tests
  • Loading branch information
ClearlyClaire authored and multiple creatures committed Feb 21, 2020
1 parent e6bb4bd commit e19765e
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 3 deletions.
4 changes: 3 additions & 1 deletion app/models/media_attachment.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -243,7 +245,7 @@ def set_shortcode
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
Expand Down
26 changes: 26 additions & 0 deletions spec/lib/activitypub/activity/create_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -262,6 +262,32 @@
end
end


context 'with media attachments with long description' do
let(:object_json) do
{
id: [ActivityPub::TagManager.instance.uri_for(sender), '#bar'].join,
type: 'Note',
content: 'Lorem ipsum',
attachment: [
{
type: 'Document',
mediaType: 'image/png',
url: 'http://example.com/attachment.png',
name: '*' * 1500,
},
],
}
end

it 'creates status' do
status = sender.statuses.first

expect(status).to_not be_nil
expect(status.media_attachments.map(&:description)).to include('*' * 1500)
end
end

context 'with media attachments with focal points' do
let(:object_json) do
{
Expand Down
4 changes: 2 additions & 2 deletions spec/models/media_attachment_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -151,10 +151,10 @@
end

describe 'descriptions for remote attachments' do
it 'are cut off at 666 characters' do
it 'are cut off at 1500 characters' do
media = Fabricate(:media_attachment, description: 'foo' * 1000, remote_url: 'http://example.com/blah.jpg')

expect(media.description.size).to be <= 666
expect(media.description.size).to be <= 1_500
end
end
end

0 comments on commit e19765e

Please sign in to comment.