fix: parsing videos using LockupViewModel (Music video recommendations)

src/client/channel.rs

@@ -9,7 +9,7 @@ use crate::{
     error::{Error, ExtractionError},
     model::{
         paginator::{ContinuationEndpoint, Paginator},
-        Channel, ChannelInfo, PlaylistItem, VideoItem,
+        Channel, ChannelInfo, PlaylistItem, Verification, VideoItem,
     },
     param::{ChannelOrder, ChannelVideoTab, Language},
     serializer::{text::TextComponent, MapResult},
@@ -489,7 +489,7 @@ fn map_channel(
                         .avatar_view_model
                         .image
                         .into(),
-                    verification: hdata.title.into(),
+                    verification: hdata.title.map(Verification::from).unwrap_or_default(),
                     description: metadata.description,
                     tags: microformat.microformat_data_renderer.tags,
                     banner: hdata.banner.image_banner_view_model.image.into(),

src/client/response/channel.rs

@@ -2,11 +2,14 @@ use serde::Deserialize;
 use serde_with::{rust::deserialize_ignore_any, serde_as, DefaultOnError, VecSkipError};
 
 use super::{
-    video_item::YouTubeListRenderer, Alert, ChannelBadge, ContentRenderer, ContentsRenderer,
+    video_item::YouTubeListRenderer, Alert, AttachmentRun, ChannelBadge, ContentRenderer,
-    ContinuationActionWrap, ImageView, PageHeaderRendererContent, PhMetadataView, ResponseContext,
+    ContentsRenderer, ContinuationActionWrap, ImageView, PageHeaderRendererContent, PhMetadataView,
-    Thumbnails, TwoColumnBrowseResults,
+    ResponseContext, Thumbnails, TwoColumnBrowseResults,
+};
+use crate::{
+    model::Verification,
+    serializer::text::{AttributedText, Text, TextComponent},
 };
-use crate::serializer::text::{AttributedText, Text, TextComponent};
 
 #[serde_as]
 #[derive(Debug, Deserialize)]
@@ -121,7 +124,7 @@ pub(crate) enum CarouselHeaderRendererItem {
 pub(crate) struct PageHeaderRendererInner {
     /// Channel title (only used to extract verification badges)
     #[serde_as(as = "DefaultOnError")]
-    pub title: PhTitleView,
+    pub title: Option<PhTitleView>,
     /// Channel avatar
     pub image: PhAvatarView,
     /// Channel metadata (subscribers, video count)
@@ -130,7 +133,7 @@ pub(crate) struct PageHeaderRendererInner {
     pub banner: PhBannerView,
 }
 
-#[derive(Default, Debug, Deserialize)]
+#[derive(Debug, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub(crate) struct PhTitleView {
     pub dynamic_text_view_model: PhTitleView2,
@@ -150,58 +153,6 @@ pub(crate) struct PhTitleView3 {
     pub attachment_runs: Vec<AttachmentRun>,
 }
 
-#[derive(Debug, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub(crate) struct AttachmentRun {
-    pub element: AttachmentRunElement,
-}
-
-#[derive(Debug, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub(crate) struct AttachmentRunElement {
-    #[serde(rename = "type")]
-    pub typ: AttachmentRunElementType,
-}
-
-#[derive(Debug, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub(crate) struct AttachmentRunElementType {
-    pub image_type: AttachmentRunElementImageType,
-}
-
-#[derive(Debug, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub(crate) struct AttachmentRunElementImageType {
-    pub image: AttachmentRunElementImage,
-}
-
-#[serde_as]
-#[derive(Debug, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub(crate) struct AttachmentRunElementImage {
-    #[serde_as(as = "VecSkipError<_>")]
-    pub sources: Vec<AttachmentRunElementImageSource>,
-}
-
-#[derive(Debug, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub(crate) struct AttachmentRunElementImageSource {
-    pub client_resource: ClientResource,
-}
-
-#[derive(Debug, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub(crate) struct ClientResource {
-    pub image_name: IconName,
-}
-
-#[derive(Debug, Deserialize)]
-#[serde(rename_all = "SCREAMING_SNAKE_CASE")]
-pub(crate) enum IconName {
-    CheckCircleFilled,
-    MusicFilled,
-}
-
 #[derive(Debug, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub(crate) struct PhAvatarView {
@@ -330,15 +281,9 @@ impl From<PhTitleView> for crate::model::Verification {
             .dynamic_text_view_model
             .text
             .attachment_runs
-            .iter()
+            .into_iter()
-            .find_map(|r| {
+            .next()
-                r.element.typ.image_type.image.sources.first().map(|s| {
+            .map(Verification::from)
-                    match s.client_resource.image_name {
-                        IconName::CheckCircleFilled => crate::model::Verification::Verified,
-                        IconName::MusicFilled => crate::model::Verification::Artist,
-                    }
-                })
-            })
             .unwrap_or_default()
     }
 }

src/client/response/mod.rs

@@ -199,12 +199,73 @@ pub(crate) struct TextBox {
     pub text: String,
 }
 
+#[serde_as]
+#[derive(Debug, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub(crate) struct TextComponentBox {
+    #[serde_as(deserialize_as = "AttributedText")]
+    pub text: TextComponent,
+}
+
 #[derive(Debug, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub(crate) struct ResponseContext {
     pub visitor_data: Option<String>,
 }
 
+#[derive(Debug, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub(crate) struct AttachmentRun {
+    pub element: AttachmentRunElement,
+}
+
+#[derive(Debug, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub(crate) struct AttachmentRunElement {
+    #[serde(rename = "type")]
+    pub typ: AttachmentRunElementType,
+}
+
+#[derive(Debug, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub(crate) struct AttachmentRunElementType {
+    pub image_type: AttachmentRunElementImageType,
+}
+
+#[derive(Debug, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub(crate) struct AttachmentRunElementImageType {
+    pub image: AttachmentRunElementImage,
+}
+
+#[serde_as]
+#[derive(Debug, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub(crate) struct AttachmentRunElementImage {
+    #[serde_as(as = "VecSkipError<_>")]
+    pub sources: Vec<AttachmentRunElementImageSource>,
+}
+
+#[derive(Debug, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub(crate) struct AttachmentRunElementImageSource {
+    pub client_resource: ClientResource,
+}
+
+#[derive(Debug, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub(crate) struct ClientResource {
+    pub image_name: IconName,
+}
+
+#[derive(Debug, Deserialize)]
+#[serde(rename_all = "SCREAMING_SNAKE_CASE")]
+pub enum IconName {
+    CheckCircleFilled,
+    #[serde(alias = "AUDIO_BADGE")]
+    MusicFilled,
+}
+
 // CONTINUATION
 
 #[serde_as]
@@ -343,6 +404,17 @@ impl From<Thumbnails> for Vec<crate::model::Thumbnail> {
     }
 }
 
+impl ContentImage {
+    pub(crate) fn into_image(self) -> ImageViewOl {
+        match self {
+            ContentImage::ThumbnailViewModel(image) => image,
+            ContentImage::CollectionThumbnailViewModel { primary_thumbnail } => {
+                primary_thumbnail.thumbnail_view_model
+            }
+        }
+    }
+}
+
 impl From<Vec<ChannelBadge>> for crate::model::Verification {
     fn from(badges: Vec<ChannelBadge>) -> Self {
         badges
@@ -366,6 +438,25 @@ impl From<Icon> for crate::model::Verification {
     }
 }
 
+impl From<AttachmentRun> for crate::model::Verification {
+    fn from(value: AttachmentRun) -> Self {
+        match value
+            .element
+            .typ
+            .image_type
+            .image
+            .sources
+            .into_iter()
+            .next()
+            .map(|s| s.client_resource.image_name)
+        {
+            Some(IconName::CheckCircleFilled) => Self::Verified,
+            Some(IconName::MusicFilled) => Self::Artist,
+            None => Self::None,
+        }
+    }
+}
+
 pub(crate) fn alerts_to_err(id: &str, alerts: Option<Vec<Alert>>) -> ExtractionError {
     ExtractionError::NotFound {
         id: id.to_owned(),
@@ -480,9 +571,11 @@ pub(crate) struct PhMetadataView {
     pub content_metadata_view_model: PhMetadataView2,
 }
 
+#[serde_as]
 #[derive(Debug, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub(crate) struct PhMetadataView2 {
+    #[serde_as(as = "VecSkipError<_>")]
     pub metadata_rows: Vec<PhMetadataRow>,
 }
 
@@ -498,17 +591,26 @@ pub(crate) struct PhMetadataRow {
 #[derive(Debug, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub(crate) enum MetadataPart {
-    Text(#[serde_as(deserialize_as = "AttributedText")] String),
+    Text(#[serde_as(deserialize_as = "AttributedText")] TextComponent),
     #[serde(rename_all = "camelCase")]
     AvatarStack {
-        avatar_stack_view_model: AvatarStackViewModel,
+        avatar_stack_view_model: TextComponentBox,
     },
 }
 
 impl MetadataPart {
+    pub fn into_text_component(self) -> TextComponent {
+        match self {
+            MetadataPart::Text(text_component) => text_component,
+            MetadataPart::AvatarStack {
+                avatar_stack_view_model,
+            } => avatar_stack_view_model.text,
+        }
+    }
+
     pub fn as_str(&self) -> &str {
         match self {
-            MetadataPart::Text(s) => s,
+            MetadataPart::Text(s) => s.as_str(),
             MetadataPart::AvatarStack {
                 avatar_stack_view_model,
             } => avatar_stack_view_model.text.as_str(),
@@ -516,24 +618,14 @@ impl MetadataPart {
     }
 }
 
-#[serde_as]
 #[derive(Debug, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub(crate) struct AvatarStackViewModel {
+pub(crate) enum ContentImage {
-    #[serde_as(deserialize_as = "AttributedText")]
+    ThumbnailViewModel(ImageViewOl),
-    pub text: TextComponent,
+    #[serde(rename_all = "camelCase")]
-}
+    CollectionThumbnailViewModel {
-
+        primary_thumbnail: ThumbnailViewModelWrap,
-#[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)]

src/client/response/video_item.rs

@@ -4,12 +4,9 @@ use serde_with::{
 };
 use time::OffsetDateTime;
 
-use super::{ChannelBadge, ContentImage, ContinuationEndpoint, Thumbnails};
+use super::{ChannelBadge, ContentImage, ContinuationEndpoint, PhMetadataView, Thumbnails};
 use crate::{
-    model::{
+    model::{Channel, ChannelItem, ChannelTag, PlaylistItem, VideoItem, YouTubeItem},
-        Channel, ChannelId, ChannelItem, ChannelTag, PlaylistItem, Verification, VideoItem,
-        YouTubeItem,
-    },
     param::Language,
     serializer::{
         text::{AttributedText, Text, TextComponent},
@@ -167,23 +164,25 @@ pub(crate) struct ShortsOverlayMetadata {
     pub secondary_text: Option<String>,
 }
 
-/// Generalized list item, currently only used for playlists
+/// Generalized list item, currently only used for channel playlists and YTM items
 #[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,
+    pub content_image: ContentImage,
+    pub metadata: LockupViewModelMetadata,
 }
 
 #[derive(Default, Debug, Deserialize)]
 #[serde(rename_all = "SCREAMING_SNAKE_CASE")]
+#[allow(clippy::enum_variant_names)]
 pub(crate) enum LockupContentType {
     LockupContentTypePlaylist,
+    LockupContentTypeVideo,
     #[default]
     Unknown,
 }
@@ -200,6 +199,7 @@ pub(crate) struct LockupViewModelMetadata {
 pub(crate) struct LockupViewModelMetadataInner {
     #[serde_as(as = "AttributedText")]
     pub title: String,
+    pub metadata: PhMetadataView,
 }
 
 /// Video displayed in a playlist
@@ -509,19 +509,18 @@ impl<T> YouTubeListMapper<T> {
             thumbnail: video.thumbnail.into(),
             channel: video
                 .channel
-                .and_then(|c| {
+                .and_then(|c| ChannelTag::try_from(c).ok())
-                    ChannelId::try_from(c).ok().map(|c| ChannelTag {
+                .map(|mut c| {
-                        id: c.id,
+                    c.avatar = video
-                        name: c.name,
+                        .channel_thumbnail_supported_renderers
-                        avatar: video
+                        .map(|tn| tn.channel_thumbnail_with_link_renderer.thumbnail)
-                            .channel_thumbnail_supported_renderers
+                        .or(video.channel_thumbnail)
-                            .map(|tn| tn.channel_thumbnail_with_link_renderer.thumbnail)
+                        .unwrap_or_default()
-                            .or(video.channel_thumbnail)
+                        .into();
-                            .unwrap_or_default()
+                    if !c.verification.verified() {
-                            .into(),
+                        c.verification = video.owner_badges.into();
-                        verification: video.owner_badges.into(),
+                    }
-                        subscriber_count: None,
+                    c
-                    })
                 })
                 .or_else(|| self.channel.clone()),
             publish_date: video
@@ -603,16 +602,7 @@ impl<T> YouTubeListMapper<T> {
     }
 
     fn map_playlist_video(&mut self, video: PlaylistVideoRenderer) -> VideoItem {
-        let channel = ChannelId::try_from(video.channel)
+        let channel = ChannelTag::try_from(video.channel).ok();
-            .ok()
-            .map(|ch| ChannelTag {
-                id: ch.id,
-                name: ch.name,
-                avatar: Vec::new(),
-                verification: Verification::None,
-                subscriber_count: None,
-            });
-
         let mut video_info = video.video_info.into_iter();
         let video_info1 = video_info
             .next()
@@ -675,14 +665,12 @@ impl<T> YouTubeListMapper<T> {
                 .into(),
             channel: playlist
                 .channel
-                .and_then(|c| {
+                .and_then(|c| ChannelTag::try_from(c).ok())
-                    ChannelId::try_from(c).ok().map(|c| ChannelTag {
+                .map(|mut c| {
-                        id: c.id,
+                    if !c.verification.verified() {
-                        name: c.name,
+                        c.verification = playlist.owner_badges.into();
-                        avatar: Vec::new(),
+                    }
-                        verification: playlist.owner_badges.into(),
+                    c
-                        subscriber_count: None,
-                    })
                 })
                 .or_else(|| self.channel.clone()),
             video_count: playlist.video_count.or_else(|| {
@@ -719,34 +707,88 @@ impl<T> YouTubeListMapper<T> {
         }
     }
 
-    fn map_lockup(&mut self, lockup: LockupViewModel) -> Option<PlaylistItem> {
+    fn map_lockup(&mut self, lockup: LockupViewModel) -> Option<YouTubeItem> {
         let md = lockup.metadata.lockup_metadata_view_model;
-        let tn = lockup
+        let tn = lockup.content_image.into_image();
-            .content_image
-            .collection_thumbnail_view_model
-            .primary_thumbnail
-            .thumbnail_view_model;
         match lockup.content_type {
-            LockupContentType::LockupContentTypePlaylist => Some(PlaylistItem {
+            LockupContentType::LockupContentTypePlaylist => {
-                id: lockup.content_id,
+                Some(YouTubeItem::Playlist(PlaylistItem {
-                name: md.title,
+                    id: lockup.content_id,
-                thumbnail: tn.image.into(),
+                    name: md.title,
-                channel: self.channel.clone(),
+                    thumbnail: tn.image.into(),
-                video_count: tn
+                    channel: self.channel.clone(),
-                    .overlays
+                    video_count: tn
-                    .first()
+                        .overlays
-                    .and_then(|ol| {
+                        .first()
-                        ol.thumbnail_overlay_badge_view_model
+                        .and_then(|ol| {
-                            .thumbnail_badges
+                            ol.thumbnail_overlay_badge_view_model
-                            .first()
+                                .thumbnail_badges
-                    })
+                                .first()
-                    .and_then(|badge| {
+                        })
-                        util::parse_numeric_or_warn(
+                        .and_then(|badge| {
-                            &badge.thumbnail_badge_view_model.text,
+                            util::parse_numeric_or_warn(
-                            &mut self.warnings,
+                                &badge.thumbnail_badge_view_model.text,
+                                &mut self.warnings,
+                            )
+                        }),
+                }))
+            }
+            LockupContentType::LockupContentTypeVideo => {
+                let mut mdr = md
+                    .metadata
+                    .content_metadata_view_model
+                    .metadata_rows
+                    .into_iter();
+                let channel = mdr
+                    .next()
+                    .and_then(|r| r.metadata_parts.into_iter().next())
+                    .and_then(|p| ChannelTag::try_from(p.into_text_component()).ok());
+                let (view_count, publish_date_txt) = mdr
+                    .next()
+                    .map(|metadata_row| {
+                        let mut parts = metadata_row.metadata_parts.into_iter();
+                        let p1 = parts.next();
+                        let p2 = parts.next();
+                        (
+                            p1.and_then(|p| {
+                                util::parse_large_numstr_or_warn(
+                                    p.as_str(),
+                                    self.lang,
+                                    &mut self.warnings,
+                                )
+                            }),
+                            p2.map(|p2| p2.into_text_component().into_string()),
                         )
+                    })
+                    .unwrap_or_default();
+
+                Some(YouTubeItem::Video(VideoItem {
+                    id: lockup.content_id,
+                    name: md.title,
+                    duration: tn
+                        .overlays
+                        .first()
+                        .and_then(|ol| {
+                            ol.thumbnail_overlay_badge_view_model
+                                .thumbnail_badges
+                                .first()
+                        })
+                        .and_then(|badge| {
+                            util::parse_video_length(&badge.thumbnail_badge_view_model.text)
+                        }),
+                    thumbnail: tn.image.into(),
+                    channel,
+                    publish_date: publish_date_txt.as_deref().and_then(|t| {
+                        timeago::parse_textual_date_or_warn(self.lang, t, &mut self.warnings)
                     }),
-            }),
+                    publish_date_txt,
+                    view_count,
+                    is_live: false,
+                    is_short: false,
+                    is_upcoming: false,
+                    short_description: None,
+                }))
+            }
             LockupContentType::Unknown => None,
         }
     }
@@ -782,7 +824,7 @@ impl YouTubeListMapper<YouTubeItem> {
             }
             YouTubeListItem::LockupViewModel(lockup) => {
                 if let Some(mapped) = self.map_lockup(lockup) {
-                    self.items.push(YouTubeItem::Playlist(mapped));
+                    self.items.push(mapped);
                 }
             }
             YouTubeListItem::ContinuationItemRenderer {
@@ -828,6 +870,11 @@ impl YouTubeListMapper<VideoItem> {
                 let mapped = self.map_playlist_video(video);
                 self.items.push(mapped);
             }
+            YouTubeListItem::LockupViewModel(lockup) => {
+                if let Some(YouTubeItem::Video(mapped)) = self.map_lockup(lockup) {
+                    self.items.push(mapped);
+                }
+            }
             YouTubeListItem::ContinuationItemRenderer {
                 continuation_endpoint,
             } => self.ctoken = Some(continuation_endpoint.continuation_command.token),
@@ -859,7 +906,7 @@ impl YouTubeListMapper<PlaylistItem> {
                 self.items.push(mapped);
             }
             YouTubeListItem::LockupViewModel(lockup) => {
-                if let Some(mapped) = self.map_lockup(lockup) {
+                if let Some(YouTubeItem::Playlist(mapped)) = self.map_lockup(lockup) {
                     self.items.push(mapped);
                 }
             }

src/client/video_details.rs

@@ -252,6 +252,7 @@ impl MapResponse<VideoDetails> for response::VideoDetails {
                 text,
                 page_type,
                 browse_id,
+                ..
             } => match page_type {
                 response::url_endpoint::PageType::Channel => (browse_id, text),
                 _ => {

src/serializer/snapshots/rustypipe__serializer__text__tests__t_attributed_description.snap

@@ -139,6 +139,7 @@ SAttributed {
                 text: "#aespa",
                 page_type: Unknown,
                 browse_id: "FEhashtag",
+                verification: None,
             },
             Text {
                 text: " ",
@@ -152,6 +153,7 @@ SAttributed {
                 text: "#æspa",
                 page_type: Unknown,
                 browse_id: "FEhashtag",
+                verification: None,
             },
             Text {
                 text: " ",
@@ -165,6 +167,7 @@ SAttributed {
                 text: "#BlackMamba",
                 page_type: Unknown,
                 browse_id: "FEhashtag",
+                verification: None,
             },
             Text {
                 text: " ",
@@ -178,6 +181,7 @@ SAttributed {
                 text: "#블랙맘바",
                 page_type: Unknown,
                 browse_id: "FEhashtag",
+                verification: None,
             },
             Text {
                 text: " ",
@@ -191,6 +195,7 @@ SAttributed {
                 text: "#에스파",
                 page_type: Unknown,
                 browse_id: "FEhashtag",
+                verification: None,
             },
             Text {
                 text: "\naespa 에스파 'Black Mamba' MV ℗ SM Entertainment",

src/serializer/text.rs

@@ -4,10 +4,13 @@ use serde::{Deserialize, Deserializer};
 use serde_with::{serde_as, DefaultOnError, DeserializeAs, VecSkipError};
 
 use crate::{
-    client::response::url_endpoint::{
+    client::response::{
-        MusicPage, MusicPageType, MusicVideoType, NavigationEndpoint, OnTap, PageType,
+        url_endpoint::{
+            MusicPage, MusicPageType, MusicVideoType, NavigationEndpoint, OnTap, PageType,
+        },
+        AttachmentRun,
     },
-    model::{richtext::Style, UrlTarget},
+    model::{richtext::Style, UrlTarget, Verification},
     util,
 };
 
@@ -101,6 +104,7 @@ pub(crate) enum TextComponent {
         text: String,
         page_type: PageType,
         browse_id: String,
+        verification: Verification,
     },
     Web {
         text: String,
@@ -151,6 +155,9 @@ pub(crate) struct AttributedText {
     #[serde(default)]
     #[serde_as(as = "VecSkipError<_>")]
     style_runs: Vec<StyleRun>,
+    #[serde(default)]
+    #[serde_as(as = "VecSkipError<_>")]
+    attachment_runs: Vec<AttachmentRun>,
 }
 
 #[serde_as]
@@ -229,6 +236,7 @@ impl From<RichTextRun> for TextComponent {
                 strikethrough: run.strikethrough,
             },
             run.navigation_endpoint,
+            Verification::None,
         )
     }
 }
@@ -272,6 +280,7 @@ fn map_text_component(
     text: String,
     style: Style,
     nav: Option<NavigationEndpoint>,
+    verification: Verification,
 ) -> TextComponent {
     match nav {
         Some(NavigationEndpoint::Watch { watch_endpoint }) => TextComponent::Video {
@@ -296,6 +305,7 @@ fn map_text_component(
             },
             text,
             browse_id: browse_endpoint.browse_id,
+            verification,
         },
         Some(NavigationEndpoint::Url { url_endpoint }) => TextComponent::Web {
             text,
@@ -307,6 +317,7 @@ fn map_text_component(
             text,
             page_type: PageType::Playlist,
             browse_id: watch_playlist_endpoint.playlist_id,
+            verification,
         },
         None => TextComponent::Text { text, style },
     }
@@ -385,6 +396,13 @@ impl<'de> DeserializeAs<'de, TextComponents> for AttributedText {
         );
         runs.sort_by_key(|run| run.start_index);
 
+        let verification = text
+            .attachment_runs
+            .into_iter()
+            .next()
+            .map(Verification::from)
+            .unwrap_or_default();
+
         let mut components = Vec::with_capacity(runs.len() + 1);
         for run in runs {
             let txt_before = take_chars(run.start_index);
@@ -415,12 +433,14 @@ impl<'de> DeserializeAs<'de, TextComponents> for AttributedText {
                                         format!("{first_word}: {txt_link}"),
                                         Style::default(),
                                         Some(link),
+                                        verification,
                                     )
                                 } else {
                                     map_text_component(
                                         txt_link.to_owned(),
                                         Style::default(),
                                         Some(link),
+                                        verification,
                                     )
                                 }
                             }
@@ -428,14 +448,15 @@ impl<'de> DeserializeAs<'de, TextComponents> for AttributedText {
                                 txt_link.to_owned(),
                                 Style::default(),
                                 Some(link),
+                                verification,
                             ),
                         }
                     } else {
-                        map_text_component(txt_link, Style::default(), Some(link))
+                        map_text_component(txt_link, Style::default(), Some(link), verification)
                     }
                 }
                 AttributedTextRunContent::Style(style) => {
-                    map_text_component(txt_run.to_string(), style, None)
+                    map_text_component(txt_run.to_string(), style, None, verification)
                 }
             })
         }
@@ -485,6 +506,7 @@ impl TryFrom<TextComponent> for crate::model::ChannelId {
                 text,
                 page_type: PageType::Channel | PageType::Artist,
                 browse_id,
+                ..
             } => Ok(crate::model::ChannelId {
                 id: browse_id,
                 name: text,
@@ -494,6 +516,28 @@ impl TryFrom<TextComponent> for crate::model::ChannelId {
     }
 }
 
+impl TryFrom<TextComponent> for crate::model::ChannelTag {
+    type Error = ();
+
+    fn try_from(value: TextComponent) -> Result<Self, Self::Error> {
+        match value {
+            TextComponent::Browse {
+                text,
+                page_type: PageType::Channel | PageType::Artist,
+                browse_id,
+                verification,
+            } => Ok(crate::model::ChannelTag {
+                id: browse_id,
+                name: text,
+                avatar: Vec::new(),
+                verification,
+                subscriber_count: None,
+            }),
+            _ => Err(()),
+        }
+    }
+}
+
 impl TryFrom<TextComponent> for crate::model::AlbumId {
     type Error = ();
 
@@ -503,6 +547,7 @@ impl TryFrom<TextComponent> for crate::model::AlbumId {
                 text,
                 page_type: PageType::Album,
                 browse_id,
+                ..
             } => Ok(Self {
                 id: browse_id,
                 name: text,
@@ -519,6 +564,7 @@ impl From<TextComponent> for crate::model::ArtistId {
                 text,
                 page_type,
                 browse_id,
+                ..
             } => match page_type {
                 PageType::Channel | PageType::Artist => Self {
                     id: Some(browse_id),
@@ -558,6 +604,7 @@ impl From<TextComponent> for crate::model::richtext::TextComponent {
                 text,
                 page_type,
                 browse_id,
+                ..
             } => match page_type.to_url_target(browse_id) {
                 Some(target) => Self::YouTube { text, target },
                 None => Self::Text {
@@ -597,6 +644,15 @@ impl TextComponent {
         }
     }
 
+    pub fn into_string(self) -> String {
+        match self {
+            TextComponent::Video { text, .. }
+            | TextComponent::Browse { text, .. }
+            | TextComponent::Web { text, .. }
+            | TextComponent::Text { text, .. } => text,
+        }
+    }
+
     pub fn music_page(self) -> Option<MusicPage> {
         match self {
             TextComponent::Video {
@@ -844,6 +900,7 @@ mod tests {
                 text: "DEEP - The 1st Mini Album",
                 page_type: Album,
                 browse_id: "MPREb_TKV2ccxsj5i",
+                verification: None,
             },
         }
         "###);
@@ -878,6 +935,7 @@ mod tests {
                 text: "laserluca",
                 page_type: Channel,
                 browse_id: "UCmxc6kXbU1J-0pR2F3wIx9A",
+                verification: None,
             },
         }
         "###);
@@ -993,6 +1051,7 @@ mod tests {
                         text: "Roland Kaiser",
                         page_type: Artist,
                         browse_id: "UCtqi0viP-suK-okUQfaw8Ew",
+                        verification: None,
                     },
                     Text {
                         text: " & ",
@@ -1006,6 +1065,7 @@ mod tests {
                         text: "Maite Kelly",
                         page_type: Artist,
                         browse_id: "UCY06CayCwdaOd1CnDgjy6uw",
+                        verification: None,
                     },
                 ],
             ),