about summary refs log tree commit diff
path: root/app/workers
diff options
context:
space:
mode:
authorDavid Yip <yipdw@member.fsf.org>2018-05-04 03:23:57 -0500
committerDavid Yip <yipdw@member.fsf.org>2018-05-04 03:23:57 -0500
commitda70208b452bf751af92128ec46eea9707e1e6a9 (patch)
treed969e5e6092b5cd00ca8db5b12f83130dec4a010 /app/workers
parent2d392fb3b80c04df5c575d72e4f7424a84909300 (diff)
parentc61ddd82495f8997fc3034faa8281165f553280c (diff)
Merge remote-tracking branch 'origin/master' into merge-upstream
Diffstat (limited to 'app/workers')
-rw-r--r--app/workers/activitypub/processing_worker.rb2
-rw-r--r--app/workers/processing_worker.rb2
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