revisted fix for #462

Moved validation to services/post_status_service.rb
2017-02-02 23:10:17 -05:00
parent 6d2301988f
commit 6f9ecd899e
4 changed files with 18 additions and 15 deletions
--- a/app/controllers/api/v1/media_controller.rb
+++ b/app/controllers/api/v1/media_controller.rb
@@ -11,10 +11,6 @@ class Api::V1::MediaController < ApiController

  def create
    @media = MediaAttachment.create!(account: current_user.account, file: params[:file])
-    if @media.video? and params[:media_ids] != "List []"
-      @media.destroy
-      render json: {error: 'Cannot attach a video to a toot that already contains images'}, status: 422
-    end
  rescue Paperclip::Errors::NotIdentifiedByImageMagickError
    render json: { error: 'File type of uploaded media could not be verified' }, status: 422
  rescue Paperclip::Error