Merge pull request #1583 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes

2 files changed, 5 insertions, 4 deletions

diff --git a/lib/mastodon/snowflake.rb b/lib/mastodon/snowflake.rb
index 9e5bc7383..8e2d82a97 100644
--- a/lib/mastodon/snowflake.rb
+++ b/lib/mastodon/snowflake.rb
@@ -138,10 +138,11 @@ module Mastodon::Snowflake
       end
     end
 
-    def id_at(timestamp)
-      id  = timestamp.to_i * 1000 + rand(1000)
+    def id_at(timestamp, with_random: true)
+      id  = timestamp.to_i * 1000
+      id += rand(1000) if with_random
       id  = id << 16
-      id += rand(2**16)
+      id += rand(2**16) if with_random
       id
     end
 
diff --git a/lib/paperclip/transcoder.rb b/lib/paperclip/transcoder.rb
index e99704086..ec1305038 100644
--- a/lib/paperclip/transcoder.rb
+++ b/lib/paperclip/transcoder.rb
@@ -19,7 +19,7 @@ module Paperclip
       metadata = VideoMetadataExtractor.new(@file.path)
 
       unless metadata.valid?
-        log("Unsupported file #{@file.path}")
+        Paperclip.log("Unsupported file #{@file.path}")
         return File.open(@file.path)
       end