* Add audio uploads Fix #4827 Accept uploads of OGG, WAV, FLAC, OPUS and MP3 files, and converts them to OGG. Media attachments get a new `audio` type. In the UI, audio uploads are displayed identically to video uploads. * Improve code style
		
			
				
	
	
		
			46 lines
		
	
	
		
			1.0 KiB
		
	
	
	
		
			Ruby
		
	
	
	
	
	
			
		
		
	
	
			46 lines
		
	
	
		
			1.0 KiB
		
	
	
	
		
			Ruby
		
	
	
	
	
	
| # frozen_string_literal: true
 | |
| 
 | |
| class MediaController < ApplicationController
 | |
|   include Authorization
 | |
| 
 | |
|   skip_before_action :store_current_location
 | |
| 
 | |
|   before_action :set_media_attachment
 | |
|   before_action :verify_permitted_status!
 | |
|   before_action :check_playable, only: :player
 | |
|   before_action :allow_iframing, only: :player
 | |
| 
 | |
|   content_security_policy only: :player do |p|
 | |
|     p.frame_ancestors(false)
 | |
|   end
 | |
| 
 | |
|   def show
 | |
|     redirect_to @media_attachment.file.url(:original)
 | |
|   end
 | |
| 
 | |
|   def player
 | |
|     @body_classes = 'player'
 | |
|   end
 | |
| 
 | |
|   private
 | |
| 
 | |
|   def set_media_attachment
 | |
|     @media_attachment = MediaAttachment.attached.find_by!(shortcode: params[:id] || params[:medium_id])
 | |
|   end
 | |
| 
 | |
|   def verify_permitted_status!
 | |
|     authorize @media_attachment.status, :show?
 | |
|   rescue Mastodon::NotPermittedError
 | |
|     # Reraise in order to get a 404 instead of a 403 error code
 | |
|     raise ActiveRecord::RecordNotFound
 | |
|   end
 | |
| 
 | |
|   def check_playable
 | |
|     not_found unless @media_attachment.larger_media_format?
 | |
|   end
 | |
| 
 | |
|   def allow_iframing
 | |
|     response.headers['X-Frame-Options'] = 'ALLOWALL'
 | |
|   end
 | |
| end
 |