gearheads
/
mastodon
Archived
2
0
Fork 0

Fix error when rendering public pages with media attachments (#16763)

* Add tests

* Fix error when rendering public pages with media attachments

* Add tests

* Fix tests

* Please CodeClimate
gh/stable
Claire 2021-10-13 15:27:19 +02:00 committed by GitHub
parent 8818622feb
commit 5159ba26e4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 102 additions and 38 deletions

View File

@ -27,7 +27,12 @@ class MediaController < ApplicationController
private private
def set_media_attachment def set_media_attachment
@media_attachment = MediaAttachment.attached.find_by!(shortcode: params[:id] || params[:medium_id]) id = params[:id] || params[:medium_id]
return if id.nil?
scope = MediaAttachment.local.attached
# If id is 19 characters long, it's a shortcode, otherwise it's an identifier
@media_attachment = id.size == 19 ? scope.find_by!(shortcode: id) : scope.find_by!(id: id)
end end
def verify_permitted_status! def verify_permitted_status!

View File

@ -217,7 +217,7 @@ class MediaAttachment < ApplicationRecord
end end
def to_param def to_param
shortcode shortcode.presence || id&.to_s
end end
def focus=(point) def focus=(point)

View File

@ -6,33 +6,60 @@ describe MediaController do
render_views render_views
describe '#show' do describe '#show' do
it 'redirects to the file url when attached to a status' do
status = Fabricate(:status)
media_attachment = Fabricate(:media_attachment, status: status, shortcode: 'foo')
get :show, params: { id: media_attachment.to_param }
expect(response).to redirect_to(media_attachment.file.url(:original))
end
it 'responds with missing when there is not an attached status' do
media_attachment = Fabricate(:media_attachment, status: nil, shortcode: 'foo')
get :show, params: { id: media_attachment.to_param }
expect(response).to have_http_status(404)
end
it 'raises when shortcode cant be found' do it 'raises when shortcode cant be found' do
get :show, params: { id: 'missing' } get :show, params: { id: 'missing' }
expect(response).to have_http_status(404) expect(response).to have_http_status(404)
end end
context 'when the media attachment has a shortcode' do
it 'redirects to the file url when attached to a status' do
status = Fabricate(:status)
media_attachment = Fabricate(:media_attachment, status: status, shortcode: 'OI6IgDzG-nYTqvDQ994')
get :show, params: { id: media_attachment.to_param }
expect(response).to redirect_to(media_attachment.file.url(:original))
end
it 'responds with missing when there is not an attached status' do
media_attachment = Fabricate(:media_attachment, status: nil, shortcode: 'OI6IgDzG-nYTqvDQ994')
get :show, params: { id: media_attachment.to_param }
expect(response).to have_http_status(404)
end
it 'raises when not permitted to view' do it 'raises when not permitted to view' do
status = Fabricate(:status, visibility: :direct) status = Fabricate(:status, visibility: :direct)
media_attachment = Fabricate(:media_attachment, status: status, shortcode: 'foo') media_attachment = Fabricate(:media_attachment, status: status, shortcode: 'OI6IgDzG-nYTqvDQ994')
get :show, params: { id: media_attachment.to_param } get :show, params: { id: media_attachment.to_param }
expect(response).to have_http_status(404) expect(response).to have_http_status(404)
end end
end end
context 'when the media attachment has no shortcode' do
it 'redirects to the file url when attached to a status' do
status = Fabricate(:status)
media_attachment = Fabricate(:media_attachment, status: status)
get :show, params: { id: media_attachment.to_param }
expect(response).to redirect_to(media_attachment.file.url(:original))
end
it 'responds with missing when there is not an attached status' do
media_attachment = Fabricate(:media_attachment, status: nil)
get :show, params: { id: media_attachment.to_param }
expect(response).to have_http_status(404)
end
it 'raises when not permitted to view' do
status = Fabricate(:status, visibility: :direct)
media_attachment = Fabricate(:media_attachment, status: status)
get :show, params: { id: media_attachment.to_param }
expect(response).to have_http_status(404)
end
end
end
end end

View File

@ -62,14 +62,26 @@ RSpec.describe MediaAttachment, type: :model do
end end
describe '#to_param' do describe '#to_param' do
let(:media_attachment) { Fabricate(:media_attachment) } let(:media_attachment) { Fabricate(:media_attachment, shortcode: shortcode) }
let(:shortcode) { media_attachment.shortcode } let(:shortcode) { nil }
context 'when media attachment has a shortcode' do
let(:shortcode) { 'foo' }
it 'returns shortcode' do it 'returns shortcode' do
expect(media_attachment.to_param).to eq shortcode expect(media_attachment.to_param).to eq shortcode
end end
end end
context 'when media attachment does not have a shortcode' do
let(:shortcode) { nil }
it 'returns string representation of id' do
expect(media_attachment.to_param).to eq media_attachment.id.to_s
end
end
end
describe 'animated gif conversion' do describe 'animated gif conversion' do
let(:media) { MediaAttachment.create(account: Fabricate(:account), file: attachment_fixture('avatar.gif')) } let(:media) { MediaAttachment.create(account: Fabricate(:account), file: attachment_fixture('avatar.gif')) }

View File

@ -19,6 +19,7 @@ describe 'statuses/show.html.haml', without_verify_partial_doubles: true do
alice = Fabricate(:account, username: 'alice', display_name: 'Alice') alice = Fabricate(:account, username: 'alice', display_name: 'Alice')
bob = Fabricate(:account, username: 'bob', display_name: 'Bob') bob = Fabricate(:account, username: 'bob', display_name: 'Bob')
status = Fabricate(:status, account: alice, text: 'Hello World') status = Fabricate(:status, account: alice, text: 'Hello World')
media = Fabricate(:media_attachment, account: alice, status: status, type: :video)
reply = Fabricate(:status, account: bob, thread: status, text: 'Hello Alice') reply = Fabricate(:status, account: bob, thread: status, text: 'Hello Alice')
assign(:status, status) assign(:status, status)
@ -39,6 +40,7 @@ describe 'statuses/show.html.haml', without_verify_partial_doubles: true do
bob = Fabricate(:account, username: 'bob', display_name: 'Bob') bob = Fabricate(:account, username: 'bob', display_name: 'Bob')
carl = Fabricate(:account, username: 'carl', display_name: 'Carl') carl = Fabricate(:account, username: 'carl', display_name: 'Carl')
status = Fabricate(:status, account: alice, text: 'Hello World') status = Fabricate(:status, account: alice, text: 'Hello World')
media = Fabricate(:media_attachment, account: alice, status: status, type: :video)
reply = Fabricate(:status, account: bob, thread: status, text: 'Hello Alice') reply = Fabricate(:status, account: bob, thread: status, text: 'Hello Alice')
comment = Fabricate(:status, account: carl, thread: reply, text: 'Hello Bob') comment = Fabricate(:status, account: carl, thread: reply, text: 'Hello Bob')
@ -64,6 +66,7 @@ describe 'statuses/show.html.haml', without_verify_partial_doubles: true do
it 'has valid opengraph tags' do it 'has valid opengraph tags' do
alice = Fabricate(:account, username: 'alice', display_name: 'Alice') alice = Fabricate(:account, username: 'alice', display_name: 'Alice')
status = Fabricate(:status, account: alice, text: 'Hello World') status = Fabricate(:status, account: alice, text: 'Hello World')
media = Fabricate(:media_attachment, account: alice, status: status, type: :video)
assign(:status, status) assign(:status, status)
assign(:account, alice) assign(:account, alice)
@ -78,4 +81,21 @@ describe 'statuses/show.html.haml', without_verify_partial_doubles: true do
expect(header_tags).to match(%r{<meta content=".+" property="og:image" />}) expect(header_tags).to match(%r{<meta content=".+" property="og:image" />})
expect(header_tags).to match(%r{<meta content="http://.+" property="og:url" />}) expect(header_tags).to match(%r{<meta content="http://.+" property="og:url" />})
end end
it 'has twitter player tag' do
alice = Fabricate(:account, username: 'alice', display_name: 'Alice')
status = Fabricate(:status, account: alice, text: 'Hello World')
media = Fabricate(:media_attachment, account: alice, status: status, type: :video)
assign(:status, status)
assign(:account, alice)
assign(:descendant_threads, [])
render
header_tags = view.content_for(:header_tags)
expect(header_tags).to match(%r{<meta content="http://.+/media/.+/player" property="twitter:player" />})
expect(header_tags).to match(%r{<meta content="player" property="twitter:card" />})
end
end end