Minor refactor

src/invidious/helpers/helpers.cr

@@ -146,7 +146,7 @@ def rank_videos(db, n)
       published = rs.read(Time)
 
       # Exponential decay, older videos tend to rank lower
-      temperature = wilson_score * Math.exp(-0.000005*((Time.now - published).total_minutes))
+      temperature = wilson_score * Math.exp(-0.000005*((Time.utc - published).total_minutes))
       top << {temperature, id}
     end
   end
@@ -346,7 +346,7 @@ def extract_items(nodeset, ucid = nil, author_name = nil)
         published ||= Time.unix(metadata[0].xpath_node(%q(.//span)).not_nil!["data-timestamp"].to_i64)
       rescue ex
       end
-      published ||= Time.now
+      published ||= Time.utc
 
       begin
         view_count = metadata[0].content.rchop(" watching").delete(",").try &.to_i64?
@@ -676,7 +676,7 @@ def create_notification_stream(env, proxies, config, kemal_config, decrypt_funct
         loop do
           time_span = [0, 0, 0, 0]
           time_span[rand(4)] = rand(30) + 5
-          published = Time.now - Time::Span.new(time_span[0], time_span[1], time_span[2], time_span[3])
+          published = Time.utc - Time::Span.new(time_span[0], time_span[1], time_span[2], time_span[3])
           video_id = TEST_IDS[rand(TEST_IDS.size)]
 
           video = get_video(video_id, PG_DB, proxies)
@@ -783,7 +783,7 @@ def create_notification_stream(env, proxies, config, kemal_config, decrypt_funct
   begin
     # Send heartbeat
     loop do
-      env.response.puts ":keepalive #{Time.now.to_unix}"
+      env.response.puts ":keepalive #{Time.utc.to_unix}"
       env.response.puts
       env.response.flush
       sleep (20 + rand(11)).seconds

src/invidious/helpers/jobs.cr

@@ -22,10 +22,10 @@ def refresh_channels(db, logger, config)
             begin
               channel = fetch_channel(id, db, config.full_refresh)
 
-              db.exec("UPDATE channels SET updated = $1, author = $2, deleted = false WHERE id = $3", Time.now, channel.author, id)
+              db.exec("UPDATE channels SET updated = $1, author = $2, deleted = false WHERE id = $3", Time.utc, channel.author, id)
             rescue ex
               if ex.message == "Deleted or invalid channel"
-                db.exec("UPDATE channels SET updated = $1, deleted = true WHERE id = $2", Time.now, id)
+                db.exec("UPDATE channels SET updated = $1, deleted = true WHERE id = $2", Time.utc, id)
               end
               logger.write("#{id} : #{ex.message}\n")
             end

src/invidious/helpers/logger.cr

@@ -5,9 +5,9 @@ class Invidious::LogHandler < Kemal::BaseLogHandler
   end
 
   def call(context : HTTP::Server::Context)
-    time = Time.now
+    time = Time.utc
     call_next(context)
-    elapsed_text = elapsed_text(Time.now - time)
+    elapsed_text = elapsed_text(Time.utc - time)
 
     @io << time << ' ' << context.response.status_code << ' ' << context.request.method << ' ' << context.request.resource << ' ' << elapsed_text << '\n'
 

src/invidious/helpers/tokens.cr

@@ -1,6 +1,6 @@
 def generate_token(email, scopes, expire, key, db)
   session = "v1:#{Base64.urlsafe_encode(Random::Secure.random_bytes(32))}"
-  PG_DB.exec("INSERT INTO session_ids VALUES ($1, $2, $3)", session, email, Time.now)
+  PG_DB.exec("INSERT INTO session_ids VALUES ($1, $2, $3)", session, email, Time.utc)
 
   token = {
     "session" => session,
@@ -18,7 +18,7 @@ def generate_token(email, scopes, expire, key, db)
 end
 
 def generate_response(session, scopes, key, db, expire = 6.hours, use_nonce = false)
-  expire = Time.now + expire
+  expire = Time.utc + expire
 
   token = {
     "session" => session,
@@ -85,7 +85,7 @@ def validate_request(token, session, request, key, db, locale = nil)
   end
 
   if token["nonce"]? && (nonce = db.query_one?("SELECT * FROM nonces WHERE nonce = $1", token["nonce"], as: {String, Time}))
-    if nonce[1] > Time.now
+    if nonce[1] > Time.utc
       db.exec("UPDATE nonces SET expire = $1 WHERE nonce = $2", Time.new(1990, 1, 1), nonce[0])
     else
       raise translate(locale, "Erroneous token")
@@ -100,7 +100,7 @@ def validate_request(token, session, request, key, db, locale = nil)
   end
 
   expire = token["expire"]?.try &.as_i
-  if expire.try &.< Time.now.to_unix
+  if expire.try &.< Time.utc.to_unix
     raise translate(locale, "Token is expired, please try again")
   end
 

src/invidious/helpers/utils.cr

@@ -110,9 +110,9 @@ def decode_date(string : String)
 
   case string
   when "today"
-    return Time.now
+    return Time.utc
   when "yesterday"
-    return Time.now - 1.day
+    return Time.utc - 1.day
   end
 
   # String matches format "20 hours ago", "4 months ago"...
@@ -138,11 +138,11 @@ def decode_date(string : String)
     raise "Could not parse #{string}"
   end
 
-  return Time.now - delta
+  return Time.utc - delta
 end
 
 def recode_date(time : Time, locale)
-  span = Time.now - time
+  span = Time.utc - time
 
   if span.total_days > 365.0
     span = translate(locale, "`x` years", (span.total_days.to_i / 365).to_s)
@@ -327,3 +327,34 @@ def sha256(text)
   digest << text
   return digest.hexdigest
 end
+
+def subscribe_pubsub(topic, key, config)
+  case topic
+  when .match(/^UC[A-Za-z0-9_-]{22}$/)
+    topic = "channel_id=#{topic}"
+  when .match(/^(?:PL|LL|EC|UU|FL|UL|OLAK5uy_)[0-9A-Za-z-_]{10,}$/)
+    # There's a couple missing from the above regex, namely TL and RD, which
+    # don't have feeds
+    topic = "playlist_id=#{topic}"
+  else
+    # TODO
+  end
+
+  client = make_client(PUBSUB_URL)
+  time = Time.utc.to_unix.to_s
+  nonce = Random::Secure.hex(4)
+  signature = "#{time}:#{nonce}"
+
+  host_url = make_host_url(config, Kemal.config)
+
+  body = {
+    "hub.callback"      => "#{host_url}/feed/webhook/v1:#{time}:#{nonce}:#{OpenSSL::HMAC.hexdigest(:sha1, key, signature)}",
+    "hub.topic"         => "https://www.youtube.com/xml/feeds/videos.xml?#{topic}",
+    "hub.verify"        => "async",
+    "hub.mode"          => "subscribe",
+    "hub.lease_seconds" => "432000",
+    "hub.secret"        => key.to_s,
+  }
+
+  return client.post("/subscribe", form: body)
+end