fix: A/B test 18: music playlist facepile avatar model

src/client/response/channel.rs

@@ -2,9 +2,9 @@ use serde::Deserialize;
 use serde_with::{rust::deserialize_ignore_any, serde_as, DefaultOnError, VecSkipError};
 
 use super::{
-    video_item::YouTubeListRenderer, Alert, AttachmentRun, ChannelBadge, ContentRenderer,
-    ContentsRenderer, ContinuationActionWrap, ImageView, PageHeaderRendererContent, PhMetadataView,
-    ResponseContext, Thumbnails, TwoColumnBrowseResults,
+    video_item::YouTubeListRenderer, Alert, AttachmentRun, AvatarViewModel, ChannelBadge,
+    ContentRenderer, ContentsRenderer, ContinuationActionWrap, ImageView,
+    PageHeaderRendererContent, PhMetadataView, ResponseContext, Thumbnails, TwoColumnBrowseResults,
 };
 use crate::{
     model::Verification,
@@ -162,13 +162,7 @@ pub(crate) struct PhAvatarView {
 #[derive(Debug, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub(crate) struct PhAvatarView2 {
-    pub avatar: PhAvatarView3,
-}
-
-#[derive(Debug, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub(crate) struct PhAvatarView3 {
-    pub avatar_view_model: ImageView,
+    pub avatar: AvatarViewModel,
 }
 
 #[derive(Default, Debug, Deserialize)]

src/client/response/mod.rs

@@ -113,6 +113,12 @@ pub(crate) struct ImageView {
     pub image: Thumbnails,
 }
 
+#[derive(Debug, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub(crate) struct AvatarViewModel {
+    pub avatar_view_model: ImageView,
+}
+
 /// List of images in different resolutions.
 /// Not only used for thumbnails, but also for avatars and banners.
 #[derive(Default, Debug, Deserialize)]
@@ -203,7 +209,7 @@ pub(crate) struct TextBox {
 #[derive(Debug, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub(crate) struct TextComponentBox {
-    #[serde_as(deserialize_as = "AttributedText")]
+    #[serde_as(as = "AttributedText")]
     pub text: TextComponent,
 }
 
@@ -591,7 +597,7 @@ pub(crate) struct PhMetadataRow {
 #[derive(Debug, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub(crate) enum MetadataPart {
-    Text(#[serde_as(deserialize_as = "AttributedText")] TextComponent),
+    Text(#[serde_as(as = "AttributedText")] TextComponent),
     #[serde(rename_all = "camelCase")]
     AvatarStack {
         avatar_stack_view_model: TextComponentBox,

src/client/response/music_playlist.rs

@@ -1,12 +1,13 @@
 use serde::Deserialize;
 use serde_with::{serde_as, DefaultOnError, VecSkipError};
 
-use crate::serializer::text::{Text, TextComponents};
+use crate::serializer::text::{AttributedText, Text, TextComponents};
 
 use super::{
     music_item::{
         Button, ItemSection, MusicContentsRenderer, MusicItemMenuEntry, MusicThumbnailRenderer,
     },
+    url_endpoint::OnTapWrap,
     ContentsRenderer, SectionList, Tab,
 };
 
@@ -83,6 +84,10 @@ pub(crate) struct HeaderRenderer {
     #[serde(default)]
     #[serde_as(as = "Text")]
     pub second_subtitle: Vec<String>,
+    /// Channel (newer data model)
+    #[serde(default)]
+    #[serde_as(as = "DefaultOnError")]
+    pub facepile: Option<AvatarStackViewModelWrap>,
     #[serde(default)]
     #[serde_as(as = "DefaultOnError")]
     pub menu: Option<HeaderMenu>,
@@ -135,6 +140,29 @@ impl From<Description> for TextComponents {
     }
 }
 
+#[derive(Debug, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub(crate) struct AvatarStackViewModelWrap {
+    pub avatar_stack_view_model: AvatarStackViewModel,
+}
+
+#[serde_as]
+#[derive(Debug, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub(crate) struct AvatarStackViewModel {
+    // #[serde(default)]
+    // pub avatars: Vec<AvatarViewModel>,
+    #[serde_as(as = "AttributedText")]
+    pub text: String,
+    pub renderer_context: AvatarStackRendererContext,
+}
+
+#[derive(Debug, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub(crate) struct AvatarStackRendererContext {
+    pub command_context: Option<OnTapWrap>,
+}
+
 #[derive(Debug, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub(crate) struct Microformat {

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::OnTap, video_item::YouTubeListRenderer, Alert, ContentRenderer, ContentsRenderer,
-    ImageView, PageHeaderRendererContent, PhMetadataView, ResponseContext, SectionList, Tab,
-    TextBox, ThumbnailsWrap, TwoColumnBrowseResults,
+    url_endpoint::OnTapWrap, video_item::YouTubeListRenderer, Alert, ContentRenderer,
+    ContentsRenderer, ImageView, PageHeaderRendererContent, PhMetadataView, ResponseContext,
+    SectionList, Tab, TextBox, ThumbnailsWrap, TwoColumnBrowseResults,
 };
 
 #[serde_as]
@@ -173,11 +173,5 @@ pub(crate) struct ActionsRow {
 #[derive(Debug, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub(crate) struct ButtonAction {
-    pub button_view_model: ButtonViewModel,
-}
-
-#[derive(Debug, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub(crate) struct ButtonViewModel {
-    pub on_tap: OnTap,
+    pub button_view_model: OnTapWrap,
 }

src/client/response/url_endpoint.rs

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