diff options
| author | ThibG <thib@sitedethib.com> | 2019-01-27 14:23:24 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-27 14:23:24 +0100 |
| commit | f1adce7f6dfb5cdd36f53f939a006e4d81594229 (patch) | |
| tree | 6713004ab36f14228903d14cd1d4967228479e64 /app | |
| parent | f938800ef4fcd7f63310e3f1d021c809f60ea448 (diff) | |
| parent | 7251bc385389f3cdfe3f141d6df59bf499be3636 (diff) | |
Merge pull request #899 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app')
| -rw-r--r-- | app/services/post_status_service.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/post_status_service.rb b/app/services/post_status_service.rb index e4b61ee35..5d431c42a 100644 --- a/app/services/post_status_service.rb +++ b/app/services/post_status_service.rb @@ -98,7 +98,7 @@ class PostStatusService < BaseService raise Mastodon::ValidationError, I18n.t('media_attachments.validations.too_many') if @options[:media_ids].size > 4 - @media = MediaAttachment.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)) raise Mastodon::ValidationError, I18n.t('media_attachments.validations.images_and_video') if @media.size > 1 && @media.find(&:video?) end |