Progress

2020-05-02 02:25:55 -04:00
parent e9f01c0b16
commit 196a906cec
62 changed files with 866 additions and 509 deletions
--- a/app/services/edit_status_service.rb
+++ b/app/services/edit_status_service.rb
@@ -83,7 +83,8 @@ class EditStatusService < BaseService

    @media = @account.media_attachments.where(id: @options[:media_ids].take(4).map(&:to_i))

-    raise GabSocial::ValidationError, I18n.t('media_attachments.validations.images_and_video') if @media.size > 1 && @media.find(&:video?)
+    hasVideoOrGif = @media.find(&:video?) || @media.find(&:gifv?)
+    raise GabSocial::ValidationError, I18n.t('media_attachments.validations.images_and_video') if @media.size > 1 && hasVideoOrGif
  end

  def language_from_option(str)