about summary refs log tree commit diff
path: root/lib/paperclip
diff options
context:
space:
mode:
authormultiple creatures <dev@multiple-creature.party>2018-12-27 20:19:26 -0600
committermultiple creatures <dev@multiple-creature.party>2019-05-21 03:16:21 -0500
commitcf557f18497e98aea0dbf8a799186aa92dc34663 (patch)
treeb4823a6d987278de3bd1b4d80e6b31d64d312c33 /lib/paperclip
parentf119ef489c488b20bae2f4f7f48b64d100a8878e (diff)
Plain AAC audio uploads live again. -DT
Diffstat (limited to 'lib/paperclip')
-rw-r--r--lib/paperclip/audio_transcoder.rb12
1 files changed, 4 insertions, 8 deletions
diff --git a/lib/paperclip/audio_transcoder.rb b/lib/paperclip/audio_transcoder.rb
index 323ec7bfe..3d79e8397 100644
--- a/lib/paperclip/audio_transcoder.rb
+++ b/lib/paperclip/audio_transcoder.rb
@@ -7,16 +7,12 @@ module Paperclip
 
       meta = ::Av.cli.identify(@file.path)
       # {:length=>"0:00:02.14", :duration=>2.14, :audio_encode=>"mp3", :audio_bitrate=>"44100 Hz", :audio_channels=>"mono"}
-      if meta[:duration] > max_aud_len
-        raise Mastodon::ValidationError, "Audio uploads must be less than #{max_aud_len} seconds in length."
-      end
-      
-      final_file = Paperclip::Transcoder.make(file, options, attachment)
-      
-      attachment.instance.file_file_name    = 'media.mp4'
-      attachment.instance.file_content_type = 'video/mp4'
+
+      attachment.instance.file_file_name    = 'media.m4a'
+      attachment.instance.file_content_type = 'audio/mp4'
       attachment.instance.type              = MediaAttachment.types[:video]
 
+      final_file = Paperclip::Transcoder.make(file, options, attachment)
       final_file
     end
   end