From: ThibG Date: Sun, 3 Mar 2019 23:40:21 +0000 (+0100) Subject: Correctly make polls and media mutually exclusive (#10141) X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=f821eca3b3ed5f3fe8d1656a3ed6d6d2c0435f96;p=mastodon.git Correctly make polls and media mutually exclusive (#10141) --- diff --git a/app/services/post_status_service.rb b/app/services/post_status_service.rb index aed680672..c045a553e 100644 --- a/app/services/post_status_service.rb +++ b/app/services/post_status_service.rb @@ -95,7 +95,7 @@ class PostStatusService < BaseService def validate_media! return if @options[:media_ids].blank? || !@options[:media_ids].is_a?(Enumerable) - raise Mastodon::ValidationError, I18n.t('media_attachments.validations.too_many') if @options[:media_ids].size > 4 || @options[:poll_id].present? + raise Mastodon::ValidationError, I18n.t('media_attachments.validations.too_many') if @options[:media_ids].size > 4 || @options[:poll].present? @media = @account.media_attachments.where(status_id: nil).where(id: @options[:media_ids].take(4).map(&:to_i))