zelo72
/
mastodon
mirror of https://github.com/mastodon/mastodon
2
2
Fork 1
Code Issues 10 Releases Wiki Activity

Revert "Do not override timestamps for incoming toots" (#7330) 

* Revert "Weblate translations 20180503 (#7325)"

This reverts commit dfa6bccb64.

* Revert "Prevent timeline from moving when cursor is hovering over it (fixes #7278) (#7327)"

This reverts commit 58852695c8.

* Revert "Add pry-byebug (#7307)"

This reverts commit ab773e4d5f.

* Revert "Do not override timestamps for incoming toots (#7326)"

This reverts commit bd36791832.
This commit is contained in:
Eugen Rochko 2018-05-03 12:32:33 +02:00 committed by GitHub
parent dfa6bccb64
commit d5fa4fbcd2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/workers/activitypub/processing_worker.rb
View File

@ -6,6 +6,6 @@ class ActivityPub::ProcessingWorker
sidekiq_options backtrace: true sidekiq_options backtrace: true
def perform(account_id, body) def perform(account_id, body)
ActivityPub::ProcessCollectionService.new.call(body, Account.find(account_id)) ActivityPub::ProcessCollectionService.new.call(body, Account.find(account_id), override_timestamps: true)
end end
end end

2
app/workers/processing_worker.rb
View File

@ -6,6 +6,6 @@ class ProcessingWorker
sidekiq_options backtrace: true sidekiq_options backtrace: true
def perform(account_id, body) def perform(account_id, body)
ProcessFeedService.new.call(body, Account.find(account_id)) ProcessFeedService.new.call(body, Account.find(account_id), override_timestamps: true)
end end
end end