From c243d08afb8509f7a98cd7aa1b77d4f409a7a823 Mon Sep 17 00:00:00 2001
From: Brahim Hadriche <brahim.hadriche@gmail.com>
Date: Wed, 30 Oct 2024 13:38:13 -0400
Subject: [PATCH] refactor

---
 src/invidious/channels/videos.cr | 49 +++++++++++++-------------------
 1 file changed, 19 insertions(+), 30 deletions(-)

diff --git a/src/invidious/channels/videos.cr b/src/invidious/channels/videos.cr
index e29d80ed5..bcdc8d8f8 100644
--- a/src/invidious/channels/videos.cr
+++ b/src/invidious/channels/videos.cr
@@ -23,6 +23,13 @@ def produce_channel_content_continuation(ucid, content_type, page = 1, auto_gene
     else                    15 # Fallback to "videos"
     end
 
+  sort_type_numerical =
+    case content_type
+    when "videos"      then 3
+    when "livestreams" then 5
+    else                    3 # Fallback to "videos"
+    end
+
   if content_type == "livestreams"
     sort_by_numerical =
       case sort_by
@@ -41,39 +48,21 @@ def produce_channel_content_continuation(ucid, content_type, page = 1, auto_gene
       end
   end
 
-  if content_type == "livestreams"
-    object_inner_1 = {
-      "110:embedded" => {
-        "3:embedded" => {
-          "#{content_type_numerical}:embedded" => {
-            "1:embedded" => {
-              "1:string" => object_inner_2_encoded,
-            },
-            "2:embedded" => {
-              "1:string" => "00000000-0000-0000-0000-000000000000",
-            },
-            "5:varint" => sort_by_numerical,
+  object_inner_1 = {
+    "110:embedded" => {
+      "3:embedded" => {
+        "#{content_type_numerical}:embedded" => {
+          "1:embedded" => {
+            "1:string" => object_inner_2_encoded,
           },
+          "2:embedded" => {
+            "1:string" => "00000000-0000-0000-0000-000000000000",
+          },
+          "#{sort_type_numerical}:varint" => sort_by_numerical,
         },
       },
-    }
-  else
-    object_inner_1 = {
-      "110:embedded" => {
-        "3:embedded" => {
-          "#{content_type_numerical}:embedded" => {
-            "1:embedded" => {
-              "1:string" => object_inner_2_encoded,
-            },
-            "2:embedded" => {
-              "1:string" => "00000000-0000-0000-0000-000000000000",
-            },
-            "3:varint" => sort_by_numerical,
-          },
-        },
-      },
-    }
-  end
+    },
+  }
 
   object_inner_1_encoded = object_inner_1
     .try { |i| Protodec::Any.cast_json(i) }