diff options
| author | ThibG <thib@sitedethib.com> | 2020-03-22 17:59:47 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-22 17:59:47 +0100 |
| commit | d101438b9d1bd827c191605cb21d58f83de2124d (patch) | |
| tree | b36d73f45175add7aa114bb42fca5a528a9b24a4 /app/services/post_status_service.rb | |
| parent | 7115b0b8c99b7e88aee264be75945e592dec33e4 (diff) | |
| parent | 9da4bd098cac88c3e44157765adcff01445ba31a (diff) | |
Merge pull request #1305 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/services/post_status_service.rb')
| -rw-r--r-- | app/services/post_status_service.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/services/post_status_service.rb b/app/services/post_status_service.rb index 5d3b8d725..5b181b193 100644 --- a/app/services/post_status_service.rb +++ b/app/services/post_status_service.rb @@ -110,6 +110,7 @@ class PostStatusService < BaseService @media = @account.media_attachments.where(status_id: nil).where(id: @options[:media_ids].take(4).map(&:to_i)) raise Mastodon::ValidationError, I18n.t('media_attachments.validations.images_and_video') if @media.size > 1 && @media.find(&:audio_or_video?) + raise Mastodon::ValidationError, I18n.t('media_attachments.validations.not_ready') if @media.any?(&:not_processed?) end def language_from_option(str) |