treehouse
/
mastodon
20
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity

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

* Revert "Weblate translations 20180503 (#7325)"

This reverts commit b84b11c41a.

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

This reverts commit 9188537f5f.

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

This reverts commit 7236e9effe.

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

This reverts commit b6f4e83c93.
lolsob-rspec
Eugen Rochko 2018-05-03 12:32:33 +02:00 committed by GitHub
parent b84b11c41a
commit 9bd3723f06
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
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

2
app/workers/processing_worker.rb
View File

@ -6,6 +6,6 @@ class ProcessingWorker
sidekiq_options backtrace: true
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