From 17bfc87e46fdf1c2c513b6af5e6b1c9fe4141549 Mon Sep 17 00:00:00 2001
From: girst <tobi@isticktoit.net>
Date: Tue, 15 Aug 2023 19:48:03 +0000
Subject: [PATCH] browse: remove unused make_channel_params parameters page and
 v3

note that this removes the SearchOffset object from the "search"
subpage. stuff still seems to work, though.
---
 app/browse/__init__.py |  2 +-
 app/browse/protobuf.py | 17 ++++++-----------
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/app/browse/__init__.py b/app/browse/__init__.py
index 586dcf9..de8148a 100644
--- a/app/browse/__init__.py
+++ b/app/browse/__init__.py
@@ -69,7 +69,7 @@ def channel(channel_id, subpage="videos"):
 
     # if we don't have a continuation, we create parameters for page 1 manually:
     continuation = request.args.get('continuation') or \
-        make_channel_params(channel_id, subpage, 1, sort_by, query, v3=(subpage != "search"))
+        make_channel_params(channel_id, subpage, sort_by, query)
     result = fetch_ajax("browse", continuation=continuation)
     error = find_and_parse_error(result)
 
diff --git a/app/browse/protobuf.py b/app/browse/protobuf.py
index 666f6ff..6af50d9 100644
--- a/app/browse/protobuf.py
+++ b/app/browse/protobuf.py
@@ -55,7 +55,7 @@ def make_sp(sort=None, date=None, type=None, len=None, features=[], extras=[]):
     ).dumps())
 # }}} SEARCH
 
-# CHANNEL v1/v3 {{{
+# CHANNEL {{{
 @message
 @dataclass
 class SearchOffset:
@@ -98,7 +98,7 @@ class NewChannelDataContainerOuter:
 class Subparams:
     type_s: str = field(2)
     type_i: Optional[int64] = field(4)
-    page: Optional[str] = field(15)
+    page: Optional[str] = field(15, default=None)
     sort: Optional[int64] = field(3, default=None)
     unknown_const1: int64 = field(7, default=1)
     unknown_const2: int64 = field(23, default=0)
@@ -114,7 +114,7 @@ class Params:
 @dataclass
 class Continuation:
     params: Params = field(80226972)
-def make_channel_params(subject, typ="videos", page=1, sort=None, query=None, v3=False):
+def make_channel_params(subject, typ="videos", sort=None, query=None):
     typestr = dict(videos="videos", playlists="playlists", search="search")
     typeint = dict(videos=0, playlists=1, search=None) # not supporting autogen'd
     sortorder = dict(newest=1, popular=2)
@@ -141,10 +141,6 @@ def make_channel_params(subject, typ="videos", page=1, sort=None, query=None, v3
             )
         ).dumps())
 
-    if page and typ=="search":
-        _page = b64e(SearchOffset(offset=(page-1)*30).dumps(), padding=False)
-    else: _page = None
-
     return b64e(Continuation(
         params=Params(
             subject=subject,
@@ -152,21 +148,20 @@ def make_channel_params(subject, typ="videos", page=1, sort=None, query=None, v3
                 type_s=typestr.get(typ),
                 type_i=typeint.get(typ),
                 sort=sortorder.get(sort),
-                page=_page,
                 field61=b64e(
                     ChannelDataContainer(
                         data=b64e(
                             ChannelDataInner(
-                                offset=(page-1)*30
+                                offset=0
                             ).dumps(), padding=False
                         )
                     ).dumps(), padding=False
-                ) if v3 else None
+                ) if (typ != "search") else None
             ).dumps()),
             query=query,
         ),
     ).dumps())
-# }}} CHANNEL v1/v3
+# }}} CHANNEL
 
 # PLAYLIST {{{
 @message
-- 
2.39.3