gearheads
/
mastodon
Archived
2
0
Fork 0

Fix PeerTube videos appearing with an erroneous “Edited at” marker (#18100)

* Fix PeerTube videos appearing with an erroneous “Edited at” marker

PeerTube videos have an `updated` field equal to `published`.
When processing an incoming activity that has the same value for `updated` and
`published`, assume this doesn't represent an actual edit.

* Please CodeClimate
gh/stable
Claire 2022-04-26 21:25:26 +02:00 committed by GitHub
parent 33cd80d69c
commit 0360135d4d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 53 additions and 1 deletions

View File

@ -117,7 +117,7 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
language: @status_parser.language, language: @status_parser.language,
spoiler_text: converted_object_type? ? '' : (@status_parser.spoiler_text || ''), spoiler_text: converted_object_type? ? '' : (@status_parser.spoiler_text || ''),
created_at: @status_parser.created_at, created_at: @status_parser.created_at,
edited_at: @status_parser.edited_at, edited_at: @status_parser.edited_at && @status_parser.edited_at != @status_parser.created_at ? @status_parser.edited_at : nil,
override_timestamps: @options[:override_timestamps], override_timestamps: @options[:override_timestamps],
reply: @status_parser.reply, reply: @status_parser.reply,
sensitive: @account.sensitized? || @status_parser.sensitive || false, sensitive: @account.sensitized? || @status_parser.sensitive || false,

View File

@ -29,6 +29,58 @@ RSpec.describe ActivityPub::Activity::Create do
subject.perform subject.perform
end end
context 'object has been edited' do
let(:object_json) do
{
id: [ActivityPub::TagManager.instance.uri_for(sender), '#bar'].join,
type: 'Note',
content: 'Lorem ipsum',
published: '2022-01-22T15:00:00Z',
updated: '2022-01-22T16:00:00Z',
}
end
it 'creates status' do
status = sender.statuses.first
expect(status).to_not be_nil
expect(status.text).to eq 'Lorem ipsum'
end
it 'marks status as edited' do
status = sender.statuses.first
expect(status).to_not be_nil
expect(status.edited?).to eq true
end
end
context 'object has update date equal to creation date' do
let(:object_json) do
{
id: [ActivityPub::TagManager.instance.uri_for(sender), '#bar'].join,
type: 'Note',
content: 'Lorem ipsum',
published: '2022-01-22T15:00:00Z',
updated: '2022-01-22T15:00:00Z',
}
end
it 'creates status' do
status = sender.statuses.first
expect(status).to_not be_nil
expect(status.text).to eq 'Lorem ipsum'
end
it 'does not mark status as edited' do
status = sender.statuses.first
expect(status).to_not be_nil
expect(status.edited?).to eq false
end
end
context 'unknown object type' do context 'unknown object type' do
let(:object_json) do let(:object_json) do
{ {