tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
* Add tests

* Fix error when rendering public pages with media attachments

* Add tests

* Fix tests

* Please CodeClimate
This commit is contained in:
Claire
2021-10-13 15:27:19 +02:00
committed by GitHub
parent 8818622feb
commit 5159ba26e4
5 changed files with 102 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/controllers/media_controller.rb
View File

@ -27,7 +27,12 @@ class MediaController < ApplicationController
private
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
def verify_permitted_status!