Add editing for published statuses (#17320)
* Add editing for published statuses * Fix change of multiple-choice boolean in poll not resetting votes * Remove the ability to update existing media attachments for now
This commit is contained in:
		
							
								
								
									
										248
									
								
								spec/services/activitypub/process_status_update_service_spec.rb
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										248
									
								
								spec/services/activitypub/process_status_update_service_spec.rb
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,248 @@
 | 
			
		||||
require 'rails_helper'
 | 
			
		||||
 | 
			
		||||
RSpec.describe ActivityPub::ProcessStatusUpdateService, type: :service do
 | 
			
		||||
  let!(:status) { Fabricate(:status, text: 'Hello world', account: Fabricate(:account, domain: 'example.com')) }
 | 
			
		||||
 | 
			
		||||
  let(:alice) { Fabricate(:account) }
 | 
			
		||||
  let(:bob) { Fabricate(:account) }
 | 
			
		||||
 | 
			
		||||
  let(:mentions) { [] }
 | 
			
		||||
  let(:tags) { [] }
 | 
			
		||||
  let(:media_attachments) { [] }
 | 
			
		||||
 | 
			
		||||
  before do
 | 
			
		||||
    mentions.each { |a| Fabricate(:mention, status: status, account: a) }
 | 
			
		||||
    tags.each { |t| status.tags << t }
 | 
			
		||||
    media_attachments.each { |m| status.media_attachments << m }
 | 
			
		||||
  end
 | 
			
		||||
 | 
			
		||||
  let(:payload) do
 | 
			
		||||
    {
 | 
			
		||||
      '@context': 'https://www.w3.org/ns/activitystreams',
 | 
			
		||||
      id: 'foo',
 | 
			
		||||
      type: 'Note',
 | 
			
		||||
      summary: 'Show more',
 | 
			
		||||
      content: 'Hello universe',
 | 
			
		||||
      updated: '2021-09-08T22:39:25Z',
 | 
			
		||||
      tag: [
 | 
			
		||||
        { type: 'Hashtag', name: 'hoge' },
 | 
			
		||||
        { type: 'Mention', href: ActivityPub::TagManager.instance.uri_for(alice) },
 | 
			
		||||
      ],
 | 
			
		||||
    }
 | 
			
		||||
  end
 | 
			
		||||
 | 
			
		||||
  let(:json) { Oj.load(Oj.dump(payload)) }
 | 
			
		||||
 | 
			
		||||
  subject { described_class.new }
 | 
			
		||||
 | 
			
		||||
  describe '#call' do
 | 
			
		||||
    it 'updates text' do
 | 
			
		||||
      subject.call(status, json)
 | 
			
		||||
      expect(status.reload.text).to eq 'Hello universe'
 | 
			
		||||
    end
 | 
			
		||||
 | 
			
		||||
    it 'updates content warning' do
 | 
			
		||||
      subject.call(status, json)
 | 
			
		||||
      expect(status.reload.spoiler_text).to eq 'Show more'
 | 
			
		||||
    end
 | 
			
		||||
 | 
			
		||||
    context 'originally without tags' do
 | 
			
		||||
      before do
 | 
			
		||||
        subject.call(status, json)
 | 
			
		||||
      end
 | 
			
		||||
 | 
			
		||||
      it 'updates tags' do
 | 
			
		||||
        expect(status.tags.reload.map(&:name)).to eq %w(hoge)
 | 
			
		||||
      end
 | 
			
		||||
    end
 | 
			
		||||
 | 
			
		||||
    context 'originally with tags' do
 | 
			
		||||
      let(:tags) { [Fabricate(:tag, name: 'test'), Fabricate(:tag, name: 'foo')] }
 | 
			
		||||
 | 
			
		||||
      let(:payload) do
 | 
			
		||||
        {
 | 
			
		||||
          '@context': 'https://www.w3.org/ns/activitystreams',
 | 
			
		||||
          id: 'foo',
 | 
			
		||||
          type: 'Note',
 | 
			
		||||
          summary: 'Show more',
 | 
			
		||||
          content: 'Hello universe',
 | 
			
		||||
          updated: '2021-09-08T22:39:25Z',
 | 
			
		||||
          tag: [
 | 
			
		||||
            { type: 'Hashtag', name: 'foo' },
 | 
			
		||||
          ],
 | 
			
		||||
        }
 | 
			
		||||
      end
 | 
			
		||||
 | 
			
		||||
      before do
 | 
			
		||||
        subject.call(status, json)
 | 
			
		||||
      end
 | 
			
		||||
 | 
			
		||||
      it 'updates tags' do
 | 
			
		||||
        expect(status.tags.reload.map(&:name)).to eq %w(foo)
 | 
			
		||||
      end
 | 
			
		||||
    end
 | 
			
		||||
 | 
			
		||||
    context 'originally without mentions' do
 | 
			
		||||
      before do
 | 
			
		||||
        subject.call(status, json)
 | 
			
		||||
      end
 | 
			
		||||
 | 
			
		||||
      it 'updates mentions' do
 | 
			
		||||
        expect(status.active_mentions.reload.map(&:account_id)).to eq [alice.id]
 | 
			
		||||
      end
 | 
			
		||||
    end
 | 
			
		||||
 | 
			
		||||
    context 'originally with mentions' do
 | 
			
		||||
      let(:mentions) { [alice, bob] }
 | 
			
		||||
 | 
			
		||||
      before do
 | 
			
		||||
        subject.call(status, json)
 | 
			
		||||
      end
 | 
			
		||||
 | 
			
		||||
      it 'updates mentions' do
 | 
			
		||||
        expect(status.active_mentions.reload.map(&:account_id)).to eq [alice.id]
 | 
			
		||||
      end
 | 
			
		||||
    end
 | 
			
		||||
 | 
			
		||||
    context 'originally without media attachments' do
 | 
			
		||||
      before do
 | 
			
		||||
        allow(RedownloadMediaWorker).to receive(:perform_async)
 | 
			
		||||
        subject.call(status, json)
 | 
			
		||||
      end
 | 
			
		||||
 | 
			
		||||
      let(:payload) do
 | 
			
		||||
        {
 | 
			
		||||
          '@context': 'https://www.w3.org/ns/activitystreams',
 | 
			
		||||
          id: 'foo',
 | 
			
		||||
          type: 'Note',
 | 
			
		||||
          content: 'Hello universe',
 | 
			
		||||
          updated: '2021-09-08T22:39:25Z',
 | 
			
		||||
          attachment: [
 | 
			
		||||
            { type: 'Image', mediaType: 'image/png', url: 'https://example.com/foo.png' },
 | 
			
		||||
          ]
 | 
			
		||||
        }
 | 
			
		||||
      end
 | 
			
		||||
 | 
			
		||||
      it 'updates media attachments' do
 | 
			
		||||
        media_attachment = status.media_attachments.reload.first
 | 
			
		||||
 | 
			
		||||
        expect(media_attachment).to_not be_nil
 | 
			
		||||
        expect(media_attachment.remote_url).to eq 'https://example.com/foo.png'
 | 
			
		||||
      end
 | 
			
		||||
 | 
			
		||||
      it 'queues download of media attachments' do
 | 
			
		||||
        expect(RedownloadMediaWorker).to have_received(:perform_async)
 | 
			
		||||
      end
 | 
			
		||||
 | 
			
		||||
      it 'records media change in edit' do
 | 
			
		||||
        expect(status.edits.reload.last.media_attachments_changed).to be true
 | 
			
		||||
      end
 | 
			
		||||
    end
 | 
			
		||||
 | 
			
		||||
    context 'originally with media attachments' do
 | 
			
		||||
      let(:media_attachments) { [Fabricate(:media_attachment, remote_url: 'https://example.com/foo.png'), Fabricate(:media_attachment, remote_url: 'https://example.com/unused.png')] }
 | 
			
		||||
 | 
			
		||||
      let(:payload) do
 | 
			
		||||
        {
 | 
			
		||||
          '@context': 'https://www.w3.org/ns/activitystreams',
 | 
			
		||||
          id: 'foo',
 | 
			
		||||
          type: 'Note',
 | 
			
		||||
          content: 'Hello universe',
 | 
			
		||||
          updated: '2021-09-08T22:39:25Z',
 | 
			
		||||
          attachment: [
 | 
			
		||||
            { type: 'Image', mediaType: 'image/png', url: 'https://example.com/foo.png', name: 'A picture' },
 | 
			
		||||
          ]
 | 
			
		||||
        }
 | 
			
		||||
      end
 | 
			
		||||
 | 
			
		||||
      before do
 | 
			
		||||
        allow(RedownloadMediaWorker).to receive(:perform_async)
 | 
			
		||||
        subject.call(status, json)
 | 
			
		||||
      end
 | 
			
		||||
 | 
			
		||||
      it 'updates the existing media attachment in-place' do
 | 
			
		||||
        media_attachment = status.media_attachments.reload.first
 | 
			
		||||
 | 
			
		||||
        expect(media_attachment).to_not be_nil
 | 
			
		||||
        expect(media_attachment.remote_url).to eq 'https://example.com/foo.png'
 | 
			
		||||
        expect(media_attachment.description).to eq 'A picture'
 | 
			
		||||
      end
 | 
			
		||||
 | 
			
		||||
      it 'does not queue redownload for the existing media attachment' do
 | 
			
		||||
        expect(RedownloadMediaWorker).to_not have_received(:perform_async)
 | 
			
		||||
      end
 | 
			
		||||
 | 
			
		||||
      it 'updates media attachments' do
 | 
			
		||||
        expect(status.media_attachments.reload.map(&:remote_url)).to eq %w(https://example.com/foo.png)
 | 
			
		||||
      end
 | 
			
		||||
 | 
			
		||||
      it 'records media change in edit' do
 | 
			
		||||
        expect(status.edits.reload.last.media_attachments_changed).to be true
 | 
			
		||||
      end
 | 
			
		||||
    end
 | 
			
		||||
 | 
			
		||||
    context 'originally with a poll' do
 | 
			
		||||
      before do
 | 
			
		||||
        poll = Fabricate(:poll, status: status)
 | 
			
		||||
        status.update(preloadable_poll: poll)
 | 
			
		||||
        subject.call(status, json)
 | 
			
		||||
      end
 | 
			
		||||
 | 
			
		||||
      it 'removes poll' do
 | 
			
		||||
        expect(status.reload.poll).to eq nil
 | 
			
		||||
      end
 | 
			
		||||
 | 
			
		||||
      it 'records media change in edit' do
 | 
			
		||||
        expect(status.edits.reload.last.media_attachments_changed).to be true
 | 
			
		||||
      end
 | 
			
		||||
    end
 | 
			
		||||
 | 
			
		||||
    context 'originally without a poll' do
 | 
			
		||||
      let(:payload) do
 | 
			
		||||
        {
 | 
			
		||||
          '@context': 'https://www.w3.org/ns/activitystreams',
 | 
			
		||||
          id: 'foo',
 | 
			
		||||
          type: 'Question',
 | 
			
		||||
          content: 'Hello universe',
 | 
			
		||||
          updated: '2021-09-08T22:39:25Z',
 | 
			
		||||
          closed: true,
 | 
			
		||||
          oneOf: [
 | 
			
		||||
            { type: 'Note', name: 'Foo' },
 | 
			
		||||
            { type: 'Note', name: 'Bar' },
 | 
			
		||||
            { type: 'Note', name: 'Baz' },
 | 
			
		||||
          ],
 | 
			
		||||
        }
 | 
			
		||||
      end
 | 
			
		||||
 | 
			
		||||
      before do
 | 
			
		||||
        subject.call(status, json)
 | 
			
		||||
      end
 | 
			
		||||
 | 
			
		||||
      it 'creates a poll' do
 | 
			
		||||
        poll = status.reload.poll
 | 
			
		||||
 | 
			
		||||
        expect(poll).to_not be_nil
 | 
			
		||||
        expect(poll.options).to eq %w(Foo Bar Baz)
 | 
			
		||||
      end
 | 
			
		||||
 | 
			
		||||
      it 'records media change in edit' do
 | 
			
		||||
        expect(status.edits.reload.last.media_attachments_changed).to be true
 | 
			
		||||
      end
 | 
			
		||||
    end
 | 
			
		||||
 | 
			
		||||
    it 'creates edit history' do
 | 
			
		||||
      subject.call(status, json)
 | 
			
		||||
      expect(status.edits.reload.map(&:text)).to eq ['Hello world', 'Hello universe']
 | 
			
		||||
    end
 | 
			
		||||
 | 
			
		||||
    it 'sets edited timestamp' do
 | 
			
		||||
      subject.call(status, json)
 | 
			
		||||
      expect(status.reload.edited_at.to_s).to eq '2021-09-08 22:39:25 UTC'
 | 
			
		||||
    end
 | 
			
		||||
 | 
			
		||||
    it 'records that no media has been changed in edit' do
 | 
			
		||||
      subject.call(status, json)
 | 
			
		||||
      expect(status.edits.reload.last.media_attachments_changed).to be false
 | 
			
		||||
    end
 | 
			
		||||
  end
 | 
			
		||||
end
 | 
			
		||||
							
								
								
									
										130
									
								
								spec/services/update_status_service_spec.rb
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										130
									
								
								spec/services/update_status_service_spec.rb
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,130 @@
 | 
			
		||||
require 'rails_helper'
 | 
			
		||||
 | 
			
		||||
RSpec.describe UpdateStatusService, type: :service do
 | 
			
		||||
  subject { described_class.new }
 | 
			
		||||
 | 
			
		||||
  context 'when text changes' do
 | 
			
		||||
    let!(:status) { Fabricate(:status, text: 'Foo') }
 | 
			
		||||
    let(:preview_card) { Fabricate(:preview_card) }
 | 
			
		||||
 | 
			
		||||
    before do
 | 
			
		||||
      status.preview_cards << preview_card
 | 
			
		||||
      subject.call(status, status.account_id, text: 'Bar')
 | 
			
		||||
    end
 | 
			
		||||
 | 
			
		||||
    it 'updates text' do
 | 
			
		||||
      expect(status.reload.text).to eq 'Bar'
 | 
			
		||||
    end
 | 
			
		||||
 | 
			
		||||
    it 'resets preview card' do
 | 
			
		||||
      expect(status.reload.preview_card).to be_nil
 | 
			
		||||
    end
 | 
			
		||||
 | 
			
		||||
    it 'saves edit history' do
 | 
			
		||||
      expect(status.edits.pluck(:text, :media_attachments_changed)).to eq [['Foo', false], ['Bar', false]]
 | 
			
		||||
    end
 | 
			
		||||
  end
 | 
			
		||||
 | 
			
		||||
  context 'when content warning changes' do
 | 
			
		||||
    let!(:status) { Fabricate(:status, text: 'Foo', spoiler_text: '') }
 | 
			
		||||
    let(:preview_card) { Fabricate(:preview_card) }
 | 
			
		||||
 | 
			
		||||
    before do
 | 
			
		||||
      status.preview_cards << preview_card
 | 
			
		||||
      subject.call(status, status.account_id, text: 'Foo', spoiler_text: 'Bar')
 | 
			
		||||
    end
 | 
			
		||||
 | 
			
		||||
    it 'updates content warning' do
 | 
			
		||||
      expect(status.reload.spoiler_text).to eq 'Bar'
 | 
			
		||||
    end
 | 
			
		||||
 | 
			
		||||
    it 'saves edit history' do
 | 
			
		||||
      expect(status.edits.pluck(:text, :spoiler_text, :media_attachments_changed)).to eq [['Foo', '', false], ['Foo', 'Bar', false]]
 | 
			
		||||
    end
 | 
			
		||||
  end
 | 
			
		||||
 | 
			
		||||
  context 'when media attachments change' do
 | 
			
		||||
    let!(:status) { Fabricate(:status, text: 'Foo') }
 | 
			
		||||
    let!(:detached_media_attachment) { Fabricate(:media_attachment, account: status.account) }
 | 
			
		||||
    let!(:attached_media_attachment) { Fabricate(:media_attachment, account: status.account) }
 | 
			
		||||
 | 
			
		||||
    before do
 | 
			
		||||
      status.media_attachments << detached_media_attachment
 | 
			
		||||
      subject.call(status, status.account_id, text: 'Foo', media_ids: [attached_media_attachment.id])
 | 
			
		||||
    end
 | 
			
		||||
 | 
			
		||||
    it 'updates media attachments' do
 | 
			
		||||
      expect(status.media_attachments.to_a).to eq [attached_media_attachment]
 | 
			
		||||
    end
 | 
			
		||||
 | 
			
		||||
    it 'detaches detached media attachments' do
 | 
			
		||||
      expect(detached_media_attachment.reload.status_id).to be_nil
 | 
			
		||||
    end
 | 
			
		||||
 | 
			
		||||
    it 'attaches attached media attachments' do
 | 
			
		||||
      expect(attached_media_attachment.reload.status_id).to eq status.id
 | 
			
		||||
    end
 | 
			
		||||
 | 
			
		||||
    it 'saves edit history' do
 | 
			
		||||
      expect(status.edits.pluck(:text, :media_attachments_changed)).to eq [['Foo', false], ['Foo', true]]
 | 
			
		||||
    end
 | 
			
		||||
  end
 | 
			
		||||
 | 
			
		||||
  context 'when poll changes' do
 | 
			
		||||
    let!(:status) { Fabricate(:status, text: 'Foo') }
 | 
			
		||||
    let!(:poll) { Fabricate(:poll, options: %w(Foo Bar)) }
 | 
			
		||||
 | 
			
		||||
    before do
 | 
			
		||||
      status.update(poll: poll)
 | 
			
		||||
      subject.call(status, status.account_id, text: 'Foo', poll: { options: %w(Bar Baz), expires_in: 5.days.to_i })
 | 
			
		||||
    end
 | 
			
		||||
 | 
			
		||||
    it 'updates poll' do
 | 
			
		||||
      expect(status.poll).to_not eq poll
 | 
			
		||||
      expect(status.poll.options).to eq %w(Bar Baz)
 | 
			
		||||
    end
 | 
			
		||||
 | 
			
		||||
    it 'saves edit history' do
 | 
			
		||||
      expect(status.edits.pluck(:text, :media_attachments_changed)).to eq [['Foo', false], ['Foo', true]]
 | 
			
		||||
    end
 | 
			
		||||
  end
 | 
			
		||||
 | 
			
		||||
  context 'when mentions in text change' do
 | 
			
		||||
    let!(:account) { Fabricate(:account) }
 | 
			
		||||
    let!(:alice) { Fabricate(:account, username: 'alice') }
 | 
			
		||||
    let!(:bob) { Fabricate(:account, username: 'bob') }
 | 
			
		||||
    let!(:status) { PostStatusService.new.call(account, text: 'Hello @alice') }
 | 
			
		||||
 | 
			
		||||
    before do
 | 
			
		||||
      subject.call(status, status.account_id, text: 'Hello @bob')
 | 
			
		||||
    end
 | 
			
		||||
 | 
			
		||||
    it 'changes mentions' do
 | 
			
		||||
      expect(status.active_mentions.pluck(:account_id)).to eq [bob.id]
 | 
			
		||||
    end
 | 
			
		||||
 | 
			
		||||
    it 'keeps old mentions as silent mentions' do
 | 
			
		||||
      expect(status.mentions.pluck(:account_id)).to eq [alice.id, bob.id]
 | 
			
		||||
    end
 | 
			
		||||
  end
 | 
			
		||||
 | 
			
		||||
  context 'when hashtags in text change' do
 | 
			
		||||
    let!(:account) { Fabricate(:account) }
 | 
			
		||||
    let!(:status) { PostStatusService.new.call(account, text: 'Hello #foo') }
 | 
			
		||||
 | 
			
		||||
    before do
 | 
			
		||||
      subject.call(status, status.account_id, text: 'Hello #bar')
 | 
			
		||||
    end
 | 
			
		||||
 | 
			
		||||
    it 'changes tags' do
 | 
			
		||||
      expect(status.tags.pluck(:name)).to eq %w(bar)
 | 
			
		||||
    end
 | 
			
		||||
  end
 | 
			
		||||
 | 
			
		||||
  it 'notifies ActivityPub about the update' do
 | 
			
		||||
    status = Fabricate(:status, text: 'Foo')
 | 
			
		||||
    allow(ActivityPub::DistributionWorker).to receive(:perform_async)
 | 
			
		||||
    subject.call(status, status.account_id, text: 'Bar')
 | 
			
		||||
    expect(ActivityPub::DistributionWorker).to have_received(:perform_async)
 | 
			
		||||
  end
 | 
			
		||||
end
 | 
			
		||||
		Reference in New Issue
	
	Block a user