diff options
| author | David Yip <yipdw@member.fsf.org> | 2018-05-04 03:23:57 -0500 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2018-05-04 03:23:57 -0500 |
| commit | da70208b452bf751af92128ec46eea9707e1e6a9 (patch) | |
| tree | d969e5e6092b5cd00ca8db5b12f83130dec4a010 /lib | |
| parent | 2d392fb3b80c04df5c575d72e4f7424a84909300 (diff) | |
| parent | c61ddd82495f8997fc3034faa8281165f553280c (diff) | |
Merge remote-tracking branch 'origin/master' into merge-upstream
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/mastodon/snowflake.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/mastodon/snowflake.rb b/lib/mastodon/snowflake.rb index 219e323d4..9e5bc7383 100644 --- a/lib/mastodon/snowflake.rb +++ b/lib/mastodon/snowflake.rb @@ -7,7 +7,7 @@ module Mastodon::Snowflake def self.around_create(record) now = Time.now.utc - if record.created_at.nil? || record.created_at >= now || record.created_at == record.updated_at + if record.created_at.nil? || record.created_at >= now || record.created_at == record.updated_at || record.override_timestamps yield else record.id = Mastodon::Snowflake.id_at(record.created_at) |