From 53cdee2c08ede23288c6935a353aa0cdc08611c4 Mon Sep 17 00:00:00 2001
From: Svallinn <41585298+Svallinn@users.noreply.github.com>
Date: Wed, 24 Mar 2021 04:52:20 +0000
Subject: [PATCH] Move page verification to inner function

---
 src/invidious.cr        | 2 +-
 src/invidious/search.cr | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/invidious.cr b/src/invidious.cr
index 698981c3..8d579f92 100644
--- a/src/invidious.cr
+++ b/src/invidious.cr
@@ -2521,7 +2521,7 @@ get "/api/v1/channels/search/:ucid" do |env|
   query ||= ""
 
   page = env.params.query["page"]?.try &.to_i?
-  page = 1 if !page || page <= 0
+  page ||= 1
 
   count, search_results = channel_search(query, page, ucid)
   JSON.build do |json|
diff --git a/src/invidious/search.cr b/src/invidious/search.cr
index c4a1ae2d..adb17e6b 100644
--- a/src/invidious/search.cr
+++ b/src/invidious/search.cr
@@ -369,6 +369,12 @@ def produce_search_params(page = 1, sort : String = "relevance", date : String =
 end
 
 def produce_channel_search_continuation(ucid, query, page)
+  if page <= 1
+    idx = 0_i64
+  else
+    idx = 30_i64 * (page - 1)
+  end
+
   object = {
     "80226972:embedded" => {
       "2:string" => ucid,
@@ -378,7 +384,7 @@ def produce_channel_search_continuation(ucid, query, page)
         "7:varint" => 1_i64,
         "12:varint" => 1_i64,
         "15:base64" => {
-          "3:varint" => 30_i64 * (page - 1),
+          "3:varint" => idx,
         },
         "23:varint" => 0_i64
       },