refactor: update trends response model

src/client/response/mod.rs

@@ -17,7 +17,6 @@ pub use playlist_music::PlaylistMusic;
 pub use search::Search;
 pub use search::SearchCont;
 pub use trends::Startpage;
-pub use trends::StartpageCont;
 pub use trends::Trending;
 pub use url_endpoint::ResolvedUrl;
 pub use video_details::VideoComments;

src/client/response/trends.rs

@@ -1,9 +1,9 @@
 use serde::Deserialize;
 use serde_with::{serde_as, VecSkipError};
 
-use crate::serializer::{ignore_any, MapResult, VecLogError};
+use crate::serializer::{MapResult, VecLogError};
 
-use super::{ContentRenderer, ContentsRenderer, VideoListItem, VideoRenderer};
+use super::{ContentRenderer, YouTubeListItem};
 
 #[derive(Debug, Deserialize)]
 #[serde(rename_all = "camelCase")]
@@ -12,15 +12,6 @@ pub struct Startpage {
     pub response_context: ResponseContext,
 }
 
-#[serde_as]
-#[derive(Debug, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct StartpageCont {
-    #[serde(default)]
-    #[serde_as(as = "VecSkipError<_>")]
-    pub on_response_received_actions: Vec<OnResponseReceivedAction>,
-}
-
 #[derive(Debug, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct Contents<T> {
@@ -60,7 +51,7 @@ pub struct StartpageTabContent {
 #[serde(rename_all = "camelCase")]
 pub struct RichGridRenderer {
     #[serde_as(as = "VecLogError<_>")]
-    pub contents: MapResult<Vec<VideoListItem>>,
+    pub contents: MapResult<Vec<YouTubeListItem>>,
 }
 
 #[derive(Debug, Deserialize)]
@@ -72,33 +63,15 @@ pub struct Trending {
 #[derive(Debug, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct TrendingTabContent {
-    pub section_list_renderer: ContentsRenderer<ItemSectionRenderer>,
-}
-
-#[derive(Debug, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct ItemSectionRenderer {
-    pub item_section_renderer: ContentsRenderer<ShelfRenderer>,
-}
-
-#[derive(Debug, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct ShelfRenderer {
-    pub shelf_renderer: ContentRenderer<ShelfContents>,
-}
-
-#[derive(Debug, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct ShelfContents {
-    pub expanded_shelf_contents_renderer: Option<ShelfContentsRenderer>,
+    pub section_list_renderer: SectionListRenderer,
 }
 
 #[serde_as]
 #[derive(Debug, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct ShelfContentsRenderer {
+pub struct SectionListRenderer {
     #[serde_as(as = "VecLogError<_>")]
-    pub items: MapResult<Vec<TrendingListItem>>,
+    pub contents: MapResult<Vec<YouTubeListItem>>,
 }
 
 #[derive(Debug, Deserialize)]
@@ -106,28 +79,3 @@ pub struct ShelfContentsRenderer {
 pub struct ResponseContext {
     pub visitor_data: Option<String>,
 }
-
-#[serde_as]
-#[derive(Debug, Deserialize)]
-#[serde(rename_all = "camelCase")]
-#[allow(clippy::large_enum_variant)]
-pub enum TrendingListItem {
-    VideoRenderer(VideoRenderer),
-
-    #[serde(other, deserialize_with = "ignore_any")]
-    None,
-}
-
-#[derive(Debug, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct OnResponseReceivedAction {
-    pub append_continuation_items_action: AppendAction,
-}
-
-#[serde_as]
-#[derive(Debug, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct AppendAction {
-    #[serde_as(as = "VecLogError<_>")]
-    pub continuation_items: MapResult<Vec<VideoListItem>>,
-}

src/client/response/video_item.rs

@@ -49,6 +49,7 @@ pub enum YouTubeListItem {
     ///
     /// Seems to be currently A/B tested on the channel page,
     /// as of 11.10.2022
+    #[serde(alias = "shelfRenderer")]
     RichItemRenderer {
         content: Box<YouTubeListItem>,
     },
@@ -57,7 +58,9 @@ pub enum YouTubeListItem {
     ///
     /// Seems to be currently A/B tested on the video details page,
     /// as of 11.10.2022
+    #[serde(alias = "expandedShelfContentsRenderer")]
     ItemSectionRenderer {
+        #[serde(alias = "items")]
         #[serde_as(as = "VecLogError<_>")]
         contents: MapResult<Vec<YouTubeListItem>>,
     },
@@ -375,32 +378,3 @@ impl YouTubeListMapper<PlaylistItem> {
         res.c.into_iter().for_each(|item| self.map_item(item));
     }
 }
-
-impl YouTubeListMapper<ChannelItem> {
-    fn map_item(&mut self, item: YouTubeListItem) {
-        match item {
-            YouTubeListItem::ChannelRenderer(channel) => {
-                self.items.push(Self::map_channel(channel));
-            }
-            YouTubeListItem::ContinuationItemRenderer {
-                continuation_endpoint,
-            } => self.ctoken = Some(continuation_endpoint.continuation_command.token),
-            YouTubeListItem::ShowingResultsForRenderer { corrected_query } => {
-                self.corrected_query = Some(corrected_query);
-            }
-            YouTubeListItem::RichItemRenderer { content } => {
-                self.map_item(*content);
-            }
-            YouTubeListItem::ItemSectionRenderer { mut contents } => {
-                self.warnings.append(&mut contents.warnings);
-                contents.c.into_iter().for_each(|it| self.map_item(it));
-            }
-            _ => {}
-        }
-    }
-
-    pub fn map_response(&mut self, mut res: MapResult<Vec<YouTubeListItem>>) {
-        self.warnings.append(&mut res.warnings);
-        res.c.into_iter().for_each(|item| self.map_item(item));
-    }
-}