about summary refs log tree commit diff
path: root/app/lib/activitypub/activity/create.rb
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/lib/activitypub/activity/create.rb
parent2d392fb3b80c04df5c575d72e4f7424a84909300 (diff)
parentc61ddd82495f8997fc3034faa8281165f553280c (diff)
Merge remote-tracking branch 'origin/master' into merge-upstream
Diffstat (limited to 'app/lib/activitypub/activity/create.rb')
-rw-r--r--app/lib/activitypub/activity/create.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/app/lib/activitypub/activity/create.rb b/app/lib/activitypub/activity/create.rb
index edee2691f..8d17a4ebe 100644
--- a/app/lib/activitypub/activity/create.rb
+++ b/app/lib/activitypub/activity/create.rb
@@ -48,6 +48,7 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
       language: detected_language,
       spoiler_text: @object['summary'] || '',
       created_at: @object['published'],
+      override_timestamps: @options[:override_timestamps],
       reply: @object['inReplyTo'].present?,
       sensitive: @object['sensitive'] || false,
       visibility: visibility_from_audience,