fix: A/B test 17: channel playlists lockupViewModel

src/client/response/mod.rs

@@ -188,13 +188,13 @@ pub(crate) enum ChannelBadgeStyle {
 #[derive(Debug, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub(crate) struct Alert {
-    pub alert_renderer: AlertRenderer,
+    pub alert_renderer: TextBox,
 }
 
 #[serde_as]
 #[derive(Debug, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub(crate) struct AlertRenderer {
+pub(crate) struct TextBox {
     #[serde_as(as = "Text")]
     pub text: String,
 }
@@ -523,3 +523,50 @@ pub(crate) struct AvatarStackViewModel {
     #[serde_as(deserialize_as = "AttributedText")]
     pub text: TextComponent,
 }
+
+#[derive(Debug, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub(crate) struct ContentImage {
+    pub collection_thumbnail_view_model: CollectionThumbnailViewModel,
+}
+
+#[derive(Debug, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub(crate) struct CollectionThumbnailViewModel {
+    pub primary_thumbnail: ThumbnailViewModelWrap,
+}
+
+#[derive(Debug, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub(crate) struct ThumbnailViewModelWrap {
+    pub thumbnail_view_model: ImageViewOl,
+}
+
+#[serde_as]
+#[derive(Debug, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub(crate) struct ImageViewOl {
+    pub image: Thumbnails,
+    #[serde_as(as = "VecSkipError<_>")]
+    pub overlays: Vec<ImageViewOverlay>,
+}
+
+#[derive(Debug, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub(crate) struct ImageViewOverlay {
+    pub thumbnail_overlay_badge_view_model: ThumbnailOverlayBadgeViewModel,
+}
+
+#[serde_as]
+#[derive(Debug, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub(crate) struct ThumbnailOverlayBadgeViewModel {
+    #[serde_as(as = "VecSkipError<_>")]
+    pub thumbnail_badges: Vec<ThumbnailBadges>,
+}
+
+#[derive(Debug, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub(crate) struct ThumbnailBadges {
+    pub thumbnail_badge_view_model: TextBox,
+}

src/client/response/music_details.rs

@@ -3,8 +3,8 @@ use serde_with::{serde_as, DefaultOnError, VecSkipError};
 
 use crate::serializer::text::Text;
 
-use super::AlertRenderer;
 use super::ContentsRenderer;
+use super::TextBox;
 use super::{
     music_item::{ItemSection, PlaylistPanelRenderer},
     ContentRenderer,
@@ -115,7 +115,7 @@ pub(crate) struct MusicLyrics {
 #[serde(rename_all = "camelCase")]
 pub(crate) enum ListOrMessage<T> {
     SectionListRenderer(ContentsRenderer<T>),
-    MessageRenderer(AlertRenderer),
+    MessageRenderer(TextBox),
 }
 
 #[derive(Debug, Deserialize)]

src/client/response/playlist.rs

@@ -4,9 +4,9 @@ use serde_with::{serde_as, DefaultOnError, VecSkipError};
 use crate::serializer::text::{AttributedText, Text, TextComponent, TextComponents};
 
 use super::{
-    url_endpoint::NavigationEndpoint, video_item::YouTubeListRenderer, Alert, ContentRenderer,
-    ContentsRenderer, ImageView, PageHeaderRendererContent, PhMetadataView, ResponseContext,
-    SectionList, Tab, ThumbnailsWrap, TwoColumnBrowseResults,
+    url_endpoint::OnTap, video_item::YouTubeListRenderer, Alert, ContentRenderer, ContentsRenderer,
+    ImageView, PageHeaderRendererContent, PhMetadataView, ResponseContext, SectionList, Tab,
+    TextBox, ThumbnailsWrap, TwoColumnBrowseResults,
 };
 
 #[serde_as]
@@ -70,15 +70,7 @@ pub(crate) struct PlaylistHeaderBanner {
 #[derive(Debug, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub(crate) struct Byline {
-    pub playlist_byline_renderer: BylineRenderer,
-}
-
-#[serde_as]
-#[derive(Debug, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub(crate) struct BylineRenderer {
-    #[serde_as(as = "Text")]
-    pub text: String,
+    pub playlist_byline_renderer: TextBox,
 }
 
 #[derive(Debug, Deserialize)]
@@ -187,11 +179,5 @@ pub(crate) struct ButtonAction {
 #[derive(Debug, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub(crate) struct ButtonViewModel {
-    pub on_tap: ActionOnTap,
-}
-
-#[derive(Debug, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub(crate) struct ActionOnTap {
-    pub innertube_command: NavigationEndpoint,
+    pub on_tap: OnTap,
 }

src/client/response/url_endpoint.rs

@@ -157,6 +157,12 @@ pub(crate) struct WatchEndpointConfig {
     pub music_video_type: MusicVideoType,
 }
 
+#[derive(Debug, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub(crate) struct OnTap {
+    pub innertube_command: NavigationEndpoint,
+}
+
 #[derive(Default, Debug, Clone, Copy, Deserialize, PartialEq, Eq)]
 pub(crate) enum MusicVideoType {
     #[default]

src/client/response/video_item.rs

@@ -4,7 +4,7 @@ use serde_with::{
 };
 use time::OffsetDateTime;
 
-use super::{ChannelBadge, ContinuationEndpoint, Thumbnails};
+use super::{ChannelBadge, ContentImage, ContinuationEndpoint, Thumbnails};
 use crate::{
     model::{
         Channel, ChannelId, ChannelItem, ChannelTag, PlaylistItem, Verification, VideoItem,
@@ -33,6 +33,8 @@ pub(crate) enum YouTubeListItem {
 
     ChannelRenderer(ChannelRenderer),
 
+    LockupViewModel(LockupViewModel),
+
     /// Continauation items are located at the end of a list
     /// and contain the continuation token for progressive loading
     #[serde(rename_all = "camelCase")]
@@ -165,6 +167,41 @@ pub(crate) struct ShortsOverlayMetadata {
     pub secondary_text: Option<String>,
 }
 
+/// Generalized list item, currently only used for playlists
+#[serde_as]
+#[derive(Debug, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub(crate) struct LockupViewModel {
+    pub content_image: ContentImage,
+    pub metadata: LockupViewModelMetadata,
+    pub content_id: String,
+    #[serde(default)]
+    #[serde_as(deserialize_as = "DefaultOnError")]
+    pub content_type: LockupContentType,
+}
+
+#[derive(Default, Debug, Deserialize)]
+#[serde(rename_all = "SCREAMING_SNAKE_CASE")]
+pub(crate) enum LockupContentType {
+    LockupContentTypePlaylist,
+    #[default]
+    Unknown,
+}
+
+#[derive(Debug, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub(crate) struct LockupViewModelMetadata {
+    pub lockup_metadata_view_model: LockupViewModelMetadataInner,
+}
+
+#[serde_as]
+#[derive(Debug, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub(crate) struct LockupViewModelMetadataInner {
+    #[serde_as(as = "AttributedText")]
+    pub title: String,
+}
+
 /// Video displayed in a playlist
 #[serde_as]
 #[derive(Debug, Deserialize)]
@@ -681,6 +718,38 @@ impl<T> YouTubeListMapper<T> {
             short_description: channel.description_snippet,
         }
     }
+
+    fn map_lockup(&mut self, lockup: LockupViewModel) -> Option<PlaylistItem> {
+        let md = lockup.metadata.lockup_metadata_view_model;
+        let tn = lockup
+            .content_image
+            .collection_thumbnail_view_model
+            .primary_thumbnail
+            .thumbnail_view_model;
+        match lockup.content_type {
+            LockupContentType::LockupContentTypePlaylist => Some(PlaylistItem {
+                id: lockup.content_id,
+                name: md.title,
+                thumbnail: tn.image.into(),
+                channel: self.channel.clone(),
+                video_count: tn
+                    .overlays
+                    .first()
+                    .and_then(|ol| {
+                        ol.thumbnail_overlay_badge_view_model
+                            .thumbnail_badges
+                            .first()
+                    })
+                    .and_then(|badge| {
+                        util::parse_numeric_or_warn(
+                            &badge.thumbnail_badge_view_model.text,
+                            &mut self.warnings,
+                        )
+                    }),
+            }),
+            LockupContentType::Unknown => None,
+        }
+    }
 }
 
 impl YouTubeListMapper<YouTubeItem> {
@@ -711,6 +780,11 @@ impl YouTubeListMapper<YouTubeItem> {
                 let mapped = YouTubeItem::Channel(self.map_channel(channel));
                 self.items.push(mapped);
             }
+            YouTubeListItem::LockupViewModel(lockup) => {
+                if let Some(mapped) = self.map_lockup(lockup) {
+                    self.items.push(YouTubeItem::Playlist(mapped));
+                }
+            }
             YouTubeListItem::ContinuationItemRenderer {
                 continuation_endpoint,
             } => self.ctoken = Some(continuation_endpoint.continuation_command.token),
@@ -784,6 +858,11 @@ impl YouTubeListMapper<PlaylistItem> {
                 let mapped = self.map_playlist(playlist);
                 self.items.push(mapped);
             }
+            YouTubeListItem::LockupViewModel(lockup) => {
+                if let Some(mapped) = self.map_lockup(lockup) {
+                    self.items.push(mapped);
+                }
+            }
             YouTubeListItem::ContinuationItemRenderer {
                 continuation_endpoint,
             } => self.ctoken = Some(continuation_endpoint.continuation_command.token),