me/glitchier-soc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #899 from ThibG/glitch-soc/merge-upstream

Browse source 
Merge upstream changes
This commit is contained in:
ThibG 2019-01-27 14:23:24 +01:00 committed by GitHub
commit d6293b156a
2 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/services/post_status_service.rb
View file

@ -98,7 +98,7 @@ class PostStatusService < BaseService
raise Mastodon::ValidationError, I18n.t('media_attachments.validations.too_many') if @options[:media_ids].size > 4 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?) raise Mastodon::ValidationError, I18n.t('media_attachments.validations.images_and_video') if @media.size > 1 && @media.find(&:video?)
end end

15
spec/services/post_status_service_spec.rb
View file

@ -167,7 +167,7 @@ RSpec.describe PostStatusService, type: :service do
it 'attaches the given media to the created status' do it 'attaches the given media to the created status' do
account = Fabricate(:account) account = Fabricate(:account)
media = Fabricate(:media_attachment) media = Fabricate(:media_attachment, account: account)
status = subject.call( status = subject.call(
account, account,
@ -178,6 +178,19 @@ RSpec.describe PostStatusService, type: :service do
expect(media.reload.status).to eq status expect(media.reload.status).to eq status
end end
it 'does not attach media from another account to the created status' do
account = Fabricate(:account)
media = Fabricate(:media_attachment, account: Fabricate(:account))
status = subject.call(
account,
text: "test status update",
media_ids: [media.id],
)
expect(media.reload.status).to eq nil
end
it 'does not allow attaching more than 4 files' do it 'does not allow attaching more than 4 files' do
account = Fabricate(:account) account = Fabricate(:account)