diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2018-05-03 12:32:33 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-03 12:32:33 +0200 |
| commit | d5fa4fbcd2649341f3f2809060c5a64e25ebfa81 (patch) | |
| tree | 442d0b717129d7c2e1709b58e10294ce928478e3 /app | |
| parent | dfa6bccb64d9ee5512dddc10afd9a484db2dbb25 (diff) | |
Revert "Do not override timestamps for incoming toots" (#7330)
* Revert "Weblate translations 20180503 (#7325)" This reverts commit dfa6bccb64d9ee5512dddc10afd9a484db2dbb25. * Revert "Prevent timeline from moving when cursor is hovering over it (fixes #7278) (#7327)" This reverts commit 58852695c8ec490239ed3812f82971f8c1e6c172. * Revert "Add pry-byebug (#7307)" This reverts commit ab773e4d5ffdd78a61d3ebf0f79e60ee5c9f7e92. * Revert "Do not override timestamps for incoming toots (#7326)" This reverts commit bd367918328daedb37f49727f4e16e33679fdb15.
Diffstat (limited to 'app')
| -rw-r--r-- | app/workers/activitypub/processing_worker.rb | 2 | ||||
| -rw-r--r-- | app/workers/processing_worker.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/workers/activitypub/processing_worker.rb b/app/workers/activitypub/processing_worker.rb index bb9adf64b..0e2e0eddd 100644 --- a/app/workers/activitypub/processing_worker.rb +++ b/app/workers/activitypub/processing_worker.rb @@ -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 diff --git a/app/workers/processing_worker.rb b/app/workers/processing_worker.rb index 5df404bcc..978c3aba2 100644 --- a/app/workers/processing_worker.rb +++ b/app/workers/processing_worker.rb @@ -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 |