mirror/whippy-edition
1
0
Fork 0
mirror of https://github.com/whippyshou/mastodon synced 2024-11-25 15:46:35 +09:00
Code

Correctly make polls and media mutually exclusive (#10141)

Browse Source
This commit is contained in:
ThibG 2019-03-04 00:40:21 +01:00 committed by Eugen Rochko
parent e13d3792f3
commit f821eca3b3
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/services/post_status_service.rb
View File

@ -95,7 +95,7 @@ class PostStatusService < BaseService
def validate_media! def validate_media!
return if @options[:media_ids].blank? || !@options[:media_ids].is_a?(Enumerable) 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)) @media = @account.media_attachments.where(status_id: nil).where(id: @options[:media_ids].take(4).map(&:to_i))