From f109d812a1d8ea92a4ebdeb7ce03ad93bcbd9a91 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A9ry=20Mathieu=20=28Mathius=29?=
 <ferymathieuy@gmail.com>
Date: Tue, 22 Feb 2022 01:34:19 +0100
Subject: [PATCH] Move TimeSpanConverter with another Converters

Follow indications :
https://github.com/iv-org/invidious/pull/2915#discussion_r811373953
---
 src/invidious/config.cr           |  2 +-
 src/invidious/helpers/utils.cr    | 14 --------------
 src/invidious/user/preferences.cr | 16 +++++++++++++++-
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/invidious/config.cr b/src/invidious/config.cr
index 158a05cc1..cf705d218 100644
--- a/src/invidious/config.cr
+++ b/src/invidious/config.cr
@@ -59,7 +59,7 @@ class Config
   # Number of threads to use for crawling videos from channels (for updating subscriptions)
   property channel_threads : Int32 = 1
   # Time between two jobs for crawling videos from channels
-  @[YAML::Field(converter: TimeSpanConverter)]
+  @[YAML::Field(converter: Preferences::TimeSpanConverter)]
   property channel_refresh_interval : Time::Span = 30.minutes
   # Number of threads to use for updating feeds
   property feed_threads : Int32 = 1
diff --git a/src/invidious/helpers/utils.cr b/src/invidious/helpers/utils.cr
index 2702c5e93..22575c57a 100644
--- a/src/invidious/helpers/utils.cr
+++ b/src/invidious/helpers/utils.cr
@@ -18,20 +18,6 @@ def elapsed_text(elapsed)
   "#{(millis * 1000).round(2)}µs"
 end
 
-module TimeSpanConverter
-  def self.to_yaml(value : Time::Span, yaml : YAML::Nodes::Builder)
-    return yaml.scalar recode_length_seconds(value.total_seconds.to_i32)
-  end
-
-  def self.from_yaml(ctx : YAML::ParseContext, node : YAML::Nodes::Node) : Time::Span
-    if node.is_a?(YAML::Nodes::Scalar)
-      return decode_time_span(node.value)
-    else
-      node.raise "Expected scalar, not #{node.class}"
-    end
-  end
-end
-
 def decode_time_span(string : String) : Time::Span
   time_span = string.gsub(/[^0-9:]/, "")
   return Time::Span.new(seconds: 0) if time_span.empty?
diff --git a/src/invidious/user/preferences.cr b/src/invidious/user/preferences.cr
index bf7ea401f..c01bdd821 100644
--- a/src/invidious/user/preferences.cr
+++ b/src/invidious/user/preferences.cr
@@ -256,4 +256,18 @@ struct Preferences
       cookies
     end
   end
-end
+
+  module TimeSpanConverter
+    def self.to_yaml(value : Time::Span, yaml : YAML::Nodes::Builder)
+      return yaml.scalar recode_length_seconds(value.total_seconds.to_i32)
+    end
+
+    def self.from_yaml(ctx : YAML::ParseContext, node : YAML::Nodes::Node) : Time::Span
+      if node.is_a?(YAML::Nodes::Scalar)
+        return decode_time_span(node.value)
+      else
+        node.raise "Expected scalar, not #{node.class}"
+      end
+    end
+  end
+end
\ No newline at end of file