From 1f6a9a5aaa7063e94773c71d45d3bbf26ea04f26 Mon Sep 17 00:00:00 2001
From: ThetaDev <t.testboy@gmail.com>
Date: Mon, 10 Oct 2022 22:08:08 +0200
Subject: [PATCH] refactor: make video view count non-optional

---
 src/client/channel.rs                         |  5 +-
 src/client/search.rs                          |  3 +-
 ...annel__tests__map_channel_videos_base.snap | 60 +++++++++----------
 ...annel__tests__map_channel_videos_cont.snap | 60 +++++++++----------
 ...annel__tests__map_channel_videos_live.snap | 42 ++++++-------
 ...nel__tests__map_channel_videos_shorts.snap | 60 +++++++++----------
 ...l__tests__map_channel_videos_upcoming.snap | 60 +++++++++----------
 ...lient__search__tests__map_search_cont.snap | 32 +++++-----
 ...nt__search__tests__map_search_default.snap | 38 ++++++------
 ...o_details__tests__map_recommendations.snap | 38 ++++++------
 ...ls__tests__map_video_details_ccommons.snap | 38 ++++++------
 ...ls__tests__map_video_details_chapters.snap | 38 ++++++------
 ...etails__tests__map_video_details_live.snap | 40 ++++++-------
 ...tails__tests__map_video_details_music.snap | 28 ++++-----
 ..._details__tests__map_video_details_mv.snap | 36 +++++------
 ...ils__tests__map_video_details_newdesc.snap | 34 +++++------
 src/client/video_details.rs                   |  3 +-
 src/model/mod.rs                              |  8 +--
 18 files changed, 312 insertions(+), 311 deletions(-)

diff --git a/src/client/channel.rs b/src/client/channel.rs
index 954b91c..6b16fa7 100644
--- a/src/client/channel.rs
+++ b/src/client/channel.rs
@@ -351,7 +351,8 @@ fn map_videos(
                     publish_date_txt: video.published_time_text,
                     view_count: video
                         .view_count_text
-                        .map(|txt| util::parse_numeric(&txt).unwrap_or_default()),
+                        .and_then(|txt| util::parse_numeric(&txt).ok())
+                        .unwrap_or_default(),
                     is_live,
                     is_short,
                     is_upcoming: video.upcoming_event_data.is_some(),
@@ -537,7 +538,7 @@ mod tests {
             }
             ChannelOrder::Popular => {
                 assert!(
-                    first_video.view_count.unwrap() > 2300000,
+                    first_video.view_count > 2300000,
                     "most popular video < 2.3M views"
                 )
             }
diff --git a/src/client/search.rs b/src/client/search.rs
index 8e601e7..5b1e8b5 100644
--- a/src/client/search.rs
+++ b/src/client/search.rs
@@ -209,7 +209,8 @@ fn map_search_items(
                         publish_date_txt: video.published_time_text,
                         view_count: video
                             .view_count_text
-                            .map(|txt| util::parse_numeric(&txt).unwrap_or_default()),
+                            .and_then(|txt| util::parse_numeric(&txt).ok())
+                            .unwrap_or_default(),
                         is_live: video.thumbnail_overlays.is_live(),
                         is_short: video.thumbnail_overlays.is_short(),
                         short_description: video
diff --git a/src/client/snapshots/rustypipe__client__channel__tests__map_channel_videos_base.snap b/src/client/snapshots/rustypipe__client__channel__tests__map_channel_videos_base.snap
index 58d38a5..ffa8d43 100644
--- a/src/client/snapshots/rustypipe__client__channel__tests__map_channel_videos_base.snap
+++ b/src/client/snapshots/rustypipe__client__channel__tests__map_channel_videos_base.snap
@@ -172,7 +172,7 @@ Channel(
         ],
         publish_date: "[date]",
         publish_date_txt: Some("20 hours ago"),
-        view_count: Some(19739),
+        view_count: 19739,
         is_live: false,
         is_short: false,
         is_upcoming: false,
@@ -205,7 +205,7 @@ Channel(
         ],
         publish_date: "[date]",
         publish_date_txt: Some("5 days ago"),
-        view_count: Some(24194),
+        view_count: 24194,
         is_live: false,
         is_short: false,
         is_upcoming: false,
@@ -238,7 +238,7 @@ Channel(
         ],
         publish_date: "[date]",
         publish_date_txt: Some("7 days ago"),
-        view_count: Some(51443),
+        view_count: 51443,
         is_live: false,
         is_short: false,
         is_upcoming: false,
@@ -271,7 +271,7 @@ Channel(
         ],
         publish_date: "[date]",
         publish_date_txt: Some("13 days ago"),
-        view_count: Some(72324),
+        view_count: 72324,
         is_live: false,
         is_short: false,
         is_upcoming: false,
@@ -304,7 +304,7 @@ Channel(
         ],
         publish_date: "[date]",
         publish_date_txt: Some("2 weeks ago"),
-        view_count: Some(57348),
+        view_count: 57348,
         is_live: false,
         is_short: false,
         is_upcoming: false,
@@ -337,7 +337,7 @@ Channel(
         ],
         publish_date: "[date]",
         publish_date_txt: Some("2 weeks ago"),
-        view_count: Some(68645),
+        view_count: 68645,
         is_live: false,
         is_short: false,
         is_upcoming: false,
@@ -370,7 +370,7 @@ Channel(
         ],
         publish_date: "[date]",
         publish_date_txt: Some("3 weeks ago"),
-        view_count: Some(91388),
+        view_count: 91388,
         is_live: false,
         is_short: false,
         is_upcoming: false,
@@ -403,7 +403,7 @@ Channel(
         ],
         publish_date: "[date]",
         publish_date_txt: Some("3 weeks ago"),
-        view_count: Some(39993),
+        view_count: 39993,
         is_live: false,
         is_short: false,
         is_upcoming: false,
@@ -436,7 +436,7 @@ Channel(
         ],
         publish_date: "[date]",
         publish_date_txt: Some("4 weeks ago"),
-        view_count: Some(22512),
+        view_count: 22512,
         is_live: false,
         is_short: false,
         is_upcoming: false,
@@ -469,7 +469,7 @@ Channel(
         ],
         publish_date: "[date]",
         publish_date_txt: Some("1 month ago"),
-        view_count: Some(40137),
+        view_count: 40137,
         is_live: false,
         is_short: false,
         is_upcoming: false,
@@ -502,7 +502,7 @@ Channel(
         ],
         publish_date: "[date]",
         publish_date_txt: Some("1 month ago"),
-        view_count: Some(74510),
+        view_count: 74510,
         is_live: false,
         is_short: false,
         is_upcoming: false,
@@ -535,7 +535,7 @@ Channel(
         ],
         publish_date: "[date]",
         publish_date_txt: Some("1 month ago"),
-        view_count: Some(34487),
+        view_count: 34487,
         is_live: false,
         is_short: false,
         is_upcoming: false,
@@ -568,7 +568,7 @@ Channel(
         ],
         publish_date: "[date]",
         publish_date_txt: Some("1 month ago"),
-        view_count: Some(44928),
+        view_count: 44928,
         is_live: false,
         is_short: false,
         is_upcoming: false,
@@ -601,7 +601,7 @@ Channel(
         ],
         publish_date: "[date]",
         publish_date_txt: Some("1 month ago"),
-        view_count: Some(34324),
+        view_count: 34324,
         is_live: false,
         is_short: false,
         is_upcoming: false,
@@ -634,7 +634,7 @@ Channel(
         ],
         publish_date: "[date]",
         publish_date_txt: Some("1 month ago"),
-        view_count: Some(63763),
+        view_count: 63763,
         is_live: false,
         is_short: false,
         is_upcoming: false,
@@ -667,7 +667,7 @@ Channel(
         ],
         publish_date: "[date]",
         publish_date_txt: Some("1 month ago"),
-        view_count: Some(149186),
+        view_count: 149186,
         is_live: false,
         is_short: false,
         is_upcoming: false,
@@ -700,7 +700,7 @@ Channel(
         ],
         publish_date: "[date]",
         publish_date_txt: Some("1 month ago"),
-        view_count: Some(30130),
+        view_count: 30130,
         is_live: false,
         is_short: false,
         is_upcoming: false,
@@ -733,7 +733,7 @@ Channel(
         ],
         publish_date: "[date]",
         publish_date_txt: Some("2 months ago"),
-        view_count: Some(48037),
+        view_count: 48037,
         is_live: false,
         is_short: false,
         is_upcoming: false,
@@ -766,7 +766,7 @@ Channel(
         ],
         publish_date: "[date]",
         publish_date_txt: Some("2 months ago"),
-        view_count: Some(81958),
+        view_count: 81958,
         is_live: false,
         is_short: false,
         is_upcoming: false,
@@ -799,7 +799,7 @@ Channel(
         ],
         publish_date: "[date]",
         publish_date_txt: Some("2 months ago"),
-        view_count: Some(42635),
+        view_count: 42635,
         is_live: false,
         is_short: false,
         is_upcoming: false,
@@ -832,7 +832,7 @@ Channel(
         ],
         publish_date: "[date]",
         publish_date_txt: Some("2 months ago"),
-        view_count: Some(25860),
+        view_count: 25860,
         is_live: false,
         is_short: false,
         is_upcoming: false,
@@ -865,7 +865,7 @@ Channel(
         ],
         publish_date: "[date]",
         publish_date_txt: Some("2 months ago"),
-        view_count: Some(63035),
+        view_count: 63035,
         is_live: false,
         is_short: false,
         is_upcoming: false,
@@ -898,7 +898,7 @@ Channel(
         ],
         publish_date: "[date]",
         publish_date_txt: Some("2 months ago"),
-        view_count: Some(22731),
+        view_count: 22731,
         is_live: false,
         is_short: false,
         is_upcoming: false,
@@ -931,7 +931,7 @@ Channel(
         ],
         publish_date: "[date]",
         publish_date_txt: Some("2 months ago"),
-        view_count: Some(65765),
+        view_count: 65765,
         is_live: false,
         is_short: false,
         is_upcoming: false,
@@ -964,7 +964,7 @@ Channel(
         ],
         publish_date: "[date]",
         publish_date_txt: Some("2 months ago"),
-        view_count: Some(51555),
+        view_count: 51555,
         is_live: false,
         is_short: false,
         is_upcoming: false,
@@ -997,7 +997,7 @@ Channel(
         ],
         publish_date: "[date]",
         publish_date_txt: Some("2 months ago"),
-        view_count: Some(46638),
+        view_count: 46638,
         is_live: false,
         is_short: false,
         is_upcoming: false,
@@ -1030,7 +1030,7 @@ Channel(
         ],
         publish_date: "[date]",
         publish_date_txt: Some("3 months ago"),
-        view_count: Some(62921),
+        view_count: 62921,
         is_live: false,
         is_short: false,
         is_upcoming: false,
@@ -1063,7 +1063,7 @@ Channel(
         ],
         publish_date: "[date]",
         publish_date_txt: Some("3 months ago"),
-        view_count: Some(66895),
+        view_count: 66895,
         is_live: false,
         is_short: false,
         is_upcoming: false,
@@ -1096,7 +1096,7 @@ Channel(
         ],
         publish_date: "[date]",
         publish_date_txt: Some("3 months ago"),
-        view_count: Some(25894),
+        view_count: 25894,
         is_live: false,
         is_short: false,
         is_upcoming: false,
@@ -1129,7 +1129,7 @@ Channel(
         ],
         publish_date: "[date]",
         publish_date_txt: Some("3 months ago"),
-        view_count: Some(80173),
+        view_count: 80173,
         is_live: false,
         is_short: false,
         is_upcoming: false,
diff --git a/src/client/snapshots/rustypipe__client__channel__tests__map_channel_videos_cont.snap b/src/client/snapshots/rustypipe__client__channel__tests__map_channel_videos_cont.snap
index 9018a4a..1710148 100644
--- a/src/client/snapshots/rustypipe__client__channel__tests__map_channel_videos_cont.snap
+++ b/src/client/snapshots/rustypipe__client__channel__tests__map_channel_videos_cont.snap
@@ -33,7 +33,7 @@ Paginator(
       ],
       publish_date: "[date]",
       publish_date_txt: Some("3 months ago"),
-      view_count: Some(80296),
+      view_count: 80296,
       is_live: false,
       is_short: false,
       is_upcoming: false,
@@ -66,7 +66,7 @@ Paginator(
       ],
       publish_date: "[date]",
       publish_date_txt: Some("3 months ago"),
-      view_count: Some(36294),
+      view_count: 36294,
       is_live: false,
       is_short: false,
       is_upcoming: false,
@@ -99,7 +99,7 @@ Paginator(
       ],
       publish_date: "[date]",
       publish_date_txt: Some("3 months ago"),
-      view_count: Some(34736),
+      view_count: 34736,
       is_live: false,
       is_short: false,
       is_upcoming: false,
@@ -132,7 +132,7 @@ Paginator(
       ],
       publish_date: "[date]",
       publish_date_txt: Some("3 months ago"),
-      view_count: Some(73544),
+      view_count: 73544,
       is_live: false,
       is_short: false,
       is_upcoming: false,
@@ -165,7 +165,7 @@ Paginator(
       ],
       publish_date: "[date]",
       publish_date_txt: Some("4 months ago"),
-      view_count: Some(67231),
+      view_count: 67231,
       is_live: false,
       is_short: false,
       is_upcoming: false,
@@ -198,7 +198,7 @@ Paginator(
       ],
       publish_date: "[date]",
       publish_date_txt: Some("4 months ago"),
-      view_count: Some(44946),
+      view_count: 44946,
       is_live: false,
       is_short: false,
       is_upcoming: false,
@@ -231,7 +231,7 @@ Paginator(
       ],
       publish_date: "[date]",
       publish_date_txt: Some("4 months ago"),
-      view_count: Some(43264),
+      view_count: 43264,
       is_live: false,
       is_short: false,
       is_upcoming: false,
@@ -264,7 +264,7 @@ Paginator(
       ],
       publish_date: "[date]",
       publish_date_txt: Some("4 months ago"),
-      view_count: Some(98175),
+      view_count: 98175,
       is_live: false,
       is_short: false,
       is_upcoming: false,
@@ -297,7 +297,7 @@ Paginator(
       ],
       publish_date: "[date]",
       publish_date_txt: Some("4 months ago"),
-      view_count: Some(59376),
+      view_count: 59376,
       is_live: false,
       is_short: false,
       is_upcoming: false,
@@ -330,7 +330,7 @@ Paginator(
       ],
       publish_date: "[date]",
       publish_date_txt: Some("5 months ago"),
-      view_count: Some(25496),
+      view_count: 25496,
       is_live: false,
       is_short: false,
       is_upcoming: false,
@@ -363,7 +363,7 @@ Paginator(
       ],
       publish_date: "[date]",
       publish_date_txt: Some("5 months ago"),
-      view_count: Some(22982),
+      view_count: 22982,
       is_live: false,
       is_short: false,
       is_upcoming: false,
@@ -396,7 +396,7 @@ Paginator(
       ],
       publish_date: "[date]",
       publish_date_txt: Some("5 months ago"),
-      view_count: Some(38804),
+      view_count: 38804,
       is_live: false,
       is_short: false,
       is_upcoming: false,
@@ -429,7 +429,7 @@ Paginator(
       ],
       publish_date: "[date]",
       publish_date_txt: Some("5 months ago"),
-      view_count: Some(25505),
+      view_count: 25505,
       is_live: false,
       is_short: false,
       is_upcoming: false,
@@ -462,7 +462,7 @@ Paginator(
       ],
       publish_date: "[date]",
       publish_date_txt: Some("5 months ago"),
-      view_count: Some(98432),
+      view_count: 98432,
       is_live: false,
       is_short: false,
       is_upcoming: false,
@@ -495,7 +495,7 @@ Paginator(
       ],
       publish_date: "[date]",
       publish_date_txt: Some("5 months ago"),
-      view_count: Some(53410),
+      view_count: 53410,
       is_live: false,
       is_short: false,
       is_upcoming: false,
@@ -528,7 +528,7 @@ Paginator(
       ],
       publish_date: "[date]",
       publish_date_txt: Some("5 months ago"),
-      view_count: Some(54771),
+      view_count: 54771,
       is_live: false,
       is_short: false,
       is_upcoming: false,
@@ -561,7 +561,7 @@ Paginator(
       ],
       publish_date: "[date]",
       publish_date_txt: Some("6 months ago"),
-      view_count: Some(39823),
+      view_count: 39823,
       is_live: false,
       is_short: false,
       is_upcoming: false,
@@ -594,7 +594,7 @@ Paginator(
       ],
       publish_date: "[date]",
       publish_date_txt: Some("6 months ago"),
-      view_count: Some(51596),
+      view_count: 51596,
       is_live: false,
       is_short: false,
       is_upcoming: false,
@@ -627,7 +627,7 @@ Paginator(
       ],
       publish_date: "[date]",
       publish_date_txt: Some("6 months ago"),
-      view_count: Some(125391),
+      view_count: 125391,
       is_live: false,
       is_short: false,
       is_upcoming: false,
@@ -660,7 +660,7 @@ Paginator(
       ],
       publish_date: "[date]",
       publish_date_txt: Some("6 months ago"),
-      view_count: Some(120457),
+      view_count: 120457,
       is_live: false,
       is_short: false,
       is_upcoming: false,
@@ -693,7 +693,7 @@ Paginator(
       ],
       publish_date: "[date]",
       publish_date_txt: Some("6 months ago"),
-      view_count: Some(49062),
+      view_count: 49062,
       is_live: false,
       is_short: false,
       is_upcoming: false,
@@ -726,7 +726,7 @@ Paginator(
       ],
       publish_date: "[date]",
       publish_date_txt: Some("6 months ago"),
-      view_count: Some(49032),
+      view_count: 49032,
       is_live: false,
       is_short: false,
       is_upcoming: false,
@@ -759,7 +759,7 @@ Paginator(
       ],
       publish_date: "[date]",
       publish_date_txt: Some("7 months ago"),
-      view_count: Some(64108),
+      view_count: 64108,
       is_live: false,
       is_short: false,
       is_upcoming: false,
@@ -792,7 +792,7 @@ Paginator(
       ],
       publish_date: "[date]",
       publish_date_txt: Some("7 months ago"),
-      view_count: Some(76831),
+      view_count: 76831,
       is_live: false,
       is_short: false,
       is_upcoming: false,
@@ -825,7 +825,7 @@ Paginator(
       ],
       publish_date: "[date]",
       publish_date_txt: Some("7 months ago"),
-      view_count: Some(49961),
+      view_count: 49961,
       is_live: false,
       is_short: false,
       is_upcoming: false,
@@ -858,7 +858,7 @@ Paginator(
       ],
       publish_date: "[date]",
       publish_date_txt: Some("7 months ago"),
-      view_count: Some(17393),
+      view_count: 17393,
       is_live: false,
       is_short: false,
       is_upcoming: false,
@@ -891,7 +891,7 @@ Paginator(
       ],
       publish_date: "[date]",
       publish_date_txt: Some("7 months ago"),
-      view_count: Some(38281),
+      view_count: 38281,
       is_live: false,
       is_short: false,
       is_upcoming: false,
@@ -924,7 +924,7 @@ Paginator(
       ],
       publish_date: "[date]",
       publish_date_txt: Some("7 months ago"),
-      view_count: Some(70004),
+      view_count: 70004,
       is_live: false,
       is_short: false,
       is_upcoming: false,
@@ -957,7 +957,7 @@ Paginator(
       ],
       publish_date: "[date]",
       publish_date_txt: Some("7 months ago"),
-      view_count: Some(93700),
+      view_count: 93700,
       is_live: false,
       is_short: false,
       is_upcoming: false,
@@ -990,7 +990,7 @@ Paginator(
       ],
       publish_date: "[date]",
       publish_date_txt: Some("7 months ago"),
-      view_count: Some(37515),
+      view_count: 37515,
       is_live: false,
       is_short: false,
       is_upcoming: false,
diff --git a/src/client/snapshots/rustypipe__client__channel__tests__map_channel_videos_live.snap b/src/client/snapshots/rustypipe__client__channel__tests__map_channel_videos_live.snap
index ca07094..4efa2fd 100644
--- a/src/client/snapshots/rustypipe__client__channel__tests__map_channel_videos_live.snap
+++ b/src/client/snapshots/rustypipe__client__channel__tests__map_channel_videos_live.snap
@@ -156,7 +156,7 @@ Channel(
         ],
         publish_date: "[date]",
         publish_date_txt: None,
-        view_count: Some(94),
+        view_count: 94,
         is_live: true,
         is_short: false,
         is_upcoming: false,
@@ -189,7 +189,7 @@ Channel(
         ],
         publish_date: "[date]",
         publish_date_txt: None,
-        view_count: Some(381),
+        view_count: 381,
         is_live: true,
         is_short: false,
         is_upcoming: false,
@@ -222,7 +222,7 @@ Channel(
         ],
         publish_date: "[date]",
         publish_date_txt: Some("1 year ago"),
-        view_count: Some(241528),
+        view_count: 241528,
         is_live: false,
         is_short: false,
         is_upcoming: false,
@@ -255,7 +255,7 @@ Channel(
         ],
         publish_date: "[date]",
         publish_date_txt: Some("1 year ago"),
-        view_count: Some(118351),
+        view_count: 118351,
         is_live: false,
         is_short: false,
         is_upcoming: false,
@@ -288,7 +288,7 @@ Channel(
         ],
         publish_date: "[date]",
         publish_date_txt: Some("1 year ago"),
-        view_count: Some(157971),
+        view_count: 157971,
         is_live: false,
         is_short: false,
         is_upcoming: false,
@@ -321,7 +321,7 @@ Channel(
         ],
         publish_date: "[date]",
         publish_date_txt: Some("1 year ago"),
-        view_count: Some(82309),
+        view_count: 82309,
         is_live: false,
         is_short: false,
         is_upcoming: false,
@@ -354,7 +354,7 @@ Channel(
         ],
         publish_date: "[date]",
         publish_date_txt: None,
-        view_count: Some(2043),
+        view_count: 2043,
         is_live: true,
         is_short: false,
         is_upcoming: false,
@@ -387,7 +387,7 @@ Channel(
         ],
         publish_date: "[date]",
         publish_date_txt: Some("2 years ago"),
-        view_count: Some(186475),
+        view_count: 186475,
         is_live: false,
         is_short: false,
         is_upcoming: false,
@@ -420,7 +420,7 @@ Channel(
         ],
         publish_date: "[date]",
         publish_date_txt: Some("2 years ago"),
-        view_count: Some(66425),
+        view_count: 66425,
         is_live: false,
         is_short: false,
         is_upcoming: false,
@@ -453,7 +453,7 @@ Channel(
         ],
         publish_date: "[date]",
         publish_date_txt: Some("2 years ago"),
-        view_count: Some(1520020),
+        view_count: 1520020,
         is_live: false,
         is_short: false,
         is_upcoming: false,
@@ -486,7 +486,7 @@ Channel(
         ],
         publish_date: "[date]",
         publish_date_txt: Some("2 years ago"),
-        view_count: Some(37549),
+        view_count: 37549,
         is_live: false,
         is_short: false,
         is_upcoming: false,
@@ -519,7 +519,7 @@ Channel(
         ],
         publish_date: "[date]",
         publish_date_txt: Some("2 years ago"),
-        view_count: Some(33002),
+        view_count: 33002,
         is_live: false,
         is_short: false,
         is_upcoming: false,
@@ -552,7 +552,7 @@ Channel(
         ],
         publish_date: "[date]",
         publish_date_txt: Some("2 years ago"),
-        view_count: Some(42036),
+        view_count: 42036,
         is_live: false,
         is_short: false,
         is_upcoming: false,
@@ -585,7 +585,7 @@ Channel(
         ],
         publish_date: "[date]",
         publish_date_txt: Some("2 years ago"),
-        view_count: Some(322935),
+        view_count: 322935,
         is_live: false,
         is_short: false,
         is_upcoming: false,
@@ -618,7 +618,7 @@ Channel(
         ],
         publish_date: "[date]",
         publish_date_txt: Some("2 years ago"),
-        view_count: Some(91980),
+        view_count: 91980,
         is_live: false,
         is_short: false,
         is_upcoming: false,
@@ -651,7 +651,7 @@ Channel(
         ],
         publish_date: "[date]",
         publish_date_txt: None,
-        view_count: Some(4030),
+        view_count: 4030,
         is_live: true,
         is_short: false,
         is_upcoming: false,
@@ -684,7 +684,7 @@ Channel(
         ],
         publish_date: "[date]",
         publish_date_txt: Some("2 years ago"),
-        view_count: Some(288098),
+        view_count: 288098,
         is_live: false,
         is_short: false,
         is_upcoming: false,
@@ -717,7 +717,7 @@ Channel(
         ],
         publish_date: "[date]",
         publish_date_txt: Some("2 years ago"),
-        view_count: Some(50818),
+        view_count: 50818,
         is_live: false,
         is_short: false,
         is_upcoming: false,
@@ -750,7 +750,7 @@ Channel(
         ],
         publish_date: "[date]",
         publish_date_txt: Some("2 years ago"),
-        view_count: Some(98431),
+        view_count: 98431,
         is_live: false,
         is_short: false,
         is_upcoming: false,
@@ -783,7 +783,7 @@ Channel(
         ],
         publish_date: "[date]",
         publish_date_txt: Some("3 years ago"),
-        view_count: Some(572456),
+        view_count: 572456,
         is_live: false,
         is_short: false,
         is_upcoming: false,
@@ -816,7 +816,7 @@ Channel(
         ],
         publish_date: "[date]",
         publish_date_txt: Some("3 years ago"),
-        view_count: Some(3114909),
+        view_count: 3114909,
         is_live: false,
         is_short: false,
         is_upcoming: false,
diff --git a/src/client/snapshots/rustypipe__client__channel__tests__map_channel_videos_shorts.snap b/src/client/snapshots/rustypipe__client__channel__tests__map_channel_videos_shorts.snap
index 1532dc5..9b501b5 100644
--- a/src/client/snapshots/rustypipe__client__channel__tests__map_channel_videos_shorts.snap
+++ b/src/client/snapshots/rustypipe__client__channel__tests__map_channel_videos_shorts.snap
@@ -128,7 +128,7 @@ Channel(
         ],
         publish_date: "[date]",
         publish_date_txt: Some("1 day ago"),
-        view_count: Some(443549),
+        view_count: 443549,
         is_live: false,
         is_short: true,
         is_upcoming: false,
@@ -146,7 +146,7 @@ Channel(
         ],
         publish_date: "[date]",
         publish_date_txt: Some("2 days ago"),
-        view_count: Some(1154962),
+        view_count: 1154962,
         is_live: false,
         is_short: true,
         is_upcoming: false,
@@ -179,7 +179,7 @@ Channel(
         ],
         publish_date: "[date]",
         publish_date_txt: Some("3 days ago"),
-        view_count: Some(477460),
+        view_count: 477460,
         is_live: false,
         is_short: false,
         is_upcoming: false,
@@ -197,7 +197,7 @@ Channel(
         ],
         publish_date: "[date]",
         publish_date_txt: Some("6 days ago"),
-        view_count: Some(1388173),
+        view_count: 1388173,
         is_live: false,
         is_short: true,
         is_upcoming: false,
@@ -215,7 +215,7 @@ Channel(
         ],
         publish_date: "[date]",
         publish_date_txt: Some("7 days ago"),
-        view_count: Some(1738301),
+        view_count: 1738301,
         is_live: false,
         is_short: true,
         is_upcoming: false,
@@ -233,7 +233,7 @@ Channel(
         ],
         publish_date: "[date]",
         publish_date_txt: Some("9 days ago"),
-        view_count: Some(1316594),
+        view_count: 1316594,
         is_live: false,
         is_short: true,
         is_upcoming: false,
@@ -266,7 +266,7 @@ Channel(
         ],
         publish_date: "[date]",
         publish_date_txt: Some("10 days ago"),
-        view_count: Some(478703),
+        view_count: 478703,
         is_live: false,
         is_short: false,
         is_upcoming: false,
@@ -284,7 +284,7 @@ Channel(
         ],
         publish_date: "[date]",
         publish_date_txt: Some("11 days ago"),
-        view_count: Some(1412213),
+        view_count: 1412213,
         is_live: false,
         is_short: true,
         is_upcoming: false,
@@ -302,7 +302,7 @@ Channel(
         ],
         publish_date: "[date]",
         publish_date_txt: Some("13 days ago"),
-        view_count: Some(1513305),
+        view_count: 1513305,
         is_live: false,
         is_short: true,
         is_upcoming: false,
@@ -320,7 +320,7 @@ Channel(
         ],
         publish_date: "[date]",
         publish_date_txt: Some("2 weeks ago"),
-        view_count: Some(8936223),
+        view_count: 8936223,
         is_live: false,
         is_short: true,
         is_upcoming: false,
@@ -353,7 +353,7 @@ Channel(
         ],
         publish_date: "[date]",
         publish_date_txt: Some("2 weeks ago"),
-        view_count: Some(987083),
+        view_count: 987083,
         is_live: false,
         is_short: false,
         is_upcoming: false,
@@ -371,7 +371,7 @@ Channel(
         ],
         publish_date: "[date]",
         publish_date_txt: Some("2 weeks ago"),
-        view_count: Some(2769717),
+        view_count: 2769717,
         is_live: false,
         is_short: true,
         is_upcoming: false,
@@ -404,7 +404,7 @@ Channel(
         ],
         publish_date: "[date]",
         publish_date_txt: Some("3 weeks ago"),
-        view_count: Some(497660),
+        view_count: 497660,
         is_live: false,
         is_short: false,
         is_upcoming: false,
@@ -422,7 +422,7 @@ Channel(
         ],
         publish_date: "[date]",
         publish_date_txt: Some("3 weeks ago"),
-        view_count: Some(572107),
+        view_count: 572107,
         is_live: false,
         is_short: true,
         is_upcoming: false,
@@ -440,7 +440,7 @@ Channel(
         ],
         publish_date: "[date]",
         publish_date_txt: Some("3 weeks ago"),
-        view_count: Some(1707132),
+        view_count: 1707132,
         is_live: false,
         is_short: true,
         is_upcoming: false,
@@ -458,7 +458,7 @@ Channel(
         ],
         publish_date: "[date]",
         publish_date_txt: Some("3 weeks ago"),
-        view_count: Some(933094),
+        view_count: 933094,
         is_live: false,
         is_short: true,
         is_upcoming: false,
@@ -476,7 +476,7 @@ Channel(
         ],
         publish_date: "[date]",
         publish_date_txt: Some("1 month ago"),
-        view_count: Some(5985184),
+        view_count: 5985184,
         is_live: false,
         is_short: true,
         is_upcoming: false,
@@ -494,7 +494,7 @@ Channel(
         ],
         publish_date: "[date]",
         publish_date_txt: Some("1 month ago"),
-        view_count: Some(14741387),
+        view_count: 14741387,
         is_live: false,
         is_short: true,
         is_upcoming: false,
@@ -512,7 +512,7 @@ Channel(
         ],
         publish_date: "[date]",
         publish_date_txt: Some("1 month ago"),
-        view_count: Some(2511322),
+        view_count: 2511322,
         is_live: false,
         is_short: true,
         is_upcoming: false,
@@ -530,7 +530,7 @@ Channel(
         ],
         publish_date: "[date]",
         publish_date_txt: Some("1 month ago"),
-        view_count: Some(2364408),
+        view_count: 2364408,
         is_live: false,
         is_short: true,
         is_upcoming: false,
@@ -563,7 +563,7 @@ Channel(
         ],
         publish_date: "[date]",
         publish_date_txt: Some("1 month ago"),
-        view_count: Some(706059),
+        view_count: 706059,
         is_live: false,
         is_short: false,
         is_upcoming: false,
@@ -581,7 +581,7 @@ Channel(
         ],
         publish_date: "[date]",
         publish_date_txt: Some("1 month ago"),
-        view_count: Some(1947627),
+        view_count: 1947627,
         is_live: false,
         is_short: true,
         is_upcoming: false,
@@ -599,7 +599,7 @@ Channel(
         ],
         publish_date: "[date]",
         publish_date_txt: Some("1 month ago"),
-        view_count: Some(4763839),
+        view_count: 4763839,
         is_live: false,
         is_short: true,
         is_upcoming: false,
@@ -617,7 +617,7 @@ Channel(
         ],
         publish_date: "[date]",
         publish_date_txt: Some("1 month ago"),
-        view_count: Some(1915695),
+        view_count: 1915695,
         is_live: false,
         is_short: true,
         is_upcoming: false,
@@ -635,7 +635,7 @@ Channel(
         ],
         publish_date: "[date]",
         publish_date_txt: Some("1 month ago"),
-        view_count: Some(7268944),
+        view_count: 7268944,
         is_live: false,
         is_short: true,
         is_upcoming: false,
@@ -653,7 +653,7 @@ Channel(
         ],
         publish_date: "[date]",
         publish_date_txt: Some("1 month ago"),
-        view_count: Some(2539103),
+        view_count: 2539103,
         is_live: false,
         is_short: true,
         is_upcoming: false,
@@ -671,7 +671,7 @@ Channel(
         ],
         publish_date: "[date]",
         publish_date_txt: Some("2 months ago"),
-        view_count: Some(5545680),
+        view_count: 5545680,
         is_live: false,
         is_short: true,
         is_upcoming: false,
@@ -689,7 +689,7 @@ Channel(
         ],
         publish_date: "[date]",
         publish_date_txt: Some("2 months ago"),
-        view_count: Some(2202314),
+        view_count: 2202314,
         is_live: false,
         is_short: true,
         is_upcoming: false,
@@ -722,7 +722,7 @@ Channel(
         ],
         publish_date: "[date]",
         publish_date_txt: Some("2 months ago"),
-        view_count: Some(613416),
+        view_count: 613416,
         is_live: false,
         is_short: false,
         is_upcoming: false,
@@ -740,7 +740,7 @@ Channel(
         ],
         publish_date: "[date]",
         publish_date_txt: Some("2 months ago"),
-        view_count: Some(6443699),
+        view_count: 6443699,
         is_live: false,
         is_short: true,
         is_upcoming: false,
diff --git a/src/client/snapshots/rustypipe__client__channel__tests__map_channel_videos_upcoming.snap b/src/client/snapshots/rustypipe__client__channel__tests__map_channel_videos_upcoming.snap
index c67f1fb..3877486 100644
--- a/src/client/snapshots/rustypipe__client__channel__tests__map_channel_videos_upcoming.snap
+++ b/src/client/snapshots/rustypipe__client__channel__tests__map_channel_videos_upcoming.snap
@@ -160,7 +160,7 @@ Channel(
         ],
         publish_date: Some("2022-09-27T18:00:00+02:00"),
         publish_date_txt: None,
-        view_count: Some(237),
+        view_count: 237,
         is_live: false,
         is_short: false,
         is_upcoming: true,
@@ -193,7 +193,7 @@ Channel(
         ],
         publish_date: "[date]",
         publish_date_txt: Some("13 days ago"),
-        view_count: Some(742284),
+        view_count: 742284,
         is_live: false,
         is_short: false,
         is_upcoming: false,
@@ -226,7 +226,7 @@ Channel(
         ],
         publish_date: "[date]",
         publish_date_txt: Some("3 weeks ago"),
-        view_count: Some(420368),
+        view_count: 420368,
         is_live: false,
         is_short: false,
         is_upcoming: false,
@@ -259,7 +259,7 @@ Channel(
         ],
         publish_date: "[date]",
         publish_date_txt: Some("3 weeks ago"),
-        view_count: Some(528718),
+        view_count: 528718,
         is_live: false,
         is_short: false,
         is_upcoming: false,
@@ -292,7 +292,7 @@ Channel(
         ],
         publish_date: "[date]",
         publish_date_txt: Some("1 month ago"),
-        view_count: Some(897237),
+        view_count: 897237,
         is_live: false,
         is_short: false,
         is_upcoming: false,
@@ -325,7 +325,7 @@ Channel(
         ],
         publish_date: "[date]",
         publish_date_txt: Some("1 month ago"),
-        view_count: Some(526638),
+        view_count: 526638,
         is_live: false,
         is_short: false,
         is_upcoming: false,
@@ -358,7 +358,7 @@ Channel(
         ],
         publish_date: "[date]",
         publish_date_txt: Some("1 month ago"),
-        view_count: Some(368801),
+        view_count: 368801,
         is_live: false,
         is_short: false,
         is_upcoming: false,
@@ -391,7 +391,7 @@ Channel(
         ],
         publish_date: "[date]",
         publish_date_txt: Some("1 month ago"),
-        view_count: Some(286737),
+        view_count: 286737,
         is_live: false,
         is_short: false,
         is_upcoming: false,
@@ -424,7 +424,7 @@ Channel(
         ],
         publish_date: "[date]",
         publish_date_txt: Some("1 month ago"),
-        view_count: Some(664499),
+        view_count: 664499,
         is_live: false,
         is_short: false,
         is_upcoming: false,
@@ -457,7 +457,7 @@ Channel(
         ],
         publish_date: "[date]",
         publish_date_txt: Some("2 months ago"),
-        view_count: Some(592227),
+        view_count: 592227,
         is_live: false,
         is_short: false,
         is_upcoming: false,
@@ -490,7 +490,7 @@ Channel(
         ],
         publish_date: "[date]",
         publish_date_txt: Some("2 months ago"),
-        view_count: Some(396946),
+        view_count: 396946,
         is_live: false,
         is_short: false,
         is_upcoming: false,
@@ -523,7 +523,7 @@ Channel(
         ],
         publish_date: "[date]",
         publish_date_txt: Some("2 months ago"),
-        view_count: Some(778430),
+        view_count: 778430,
         is_live: false,
         is_short: false,
         is_upcoming: false,
@@ -556,7 +556,7 @@ Channel(
         ],
         publish_date: "[date]",
         publish_date_txt: Some("3 months ago"),
-        view_count: Some(2118499),
+        view_count: 2118499,
         is_live: false,
         is_short: false,
         is_upcoming: false,
@@ -589,7 +589,7 @@ Channel(
         ],
         publish_date: "[date]",
         publish_date_txt: Some("3 months ago"),
-        view_count: Some(525824),
+        view_count: 525824,
         is_live: false,
         is_short: false,
         is_upcoming: false,
@@ -622,7 +622,7 @@ Channel(
         ],
         publish_date: "[date]",
         publish_date_txt: Some("3 months ago"),
-        view_count: Some(1097056),
+        view_count: 1097056,
         is_live: false,
         is_short: false,
         is_upcoming: false,
@@ -655,7 +655,7 @@ Channel(
         ],
         publish_date: "[date]",
         publish_date_txt: Some("4 months ago"),
-        view_count: Some(1532114),
+        view_count: 1532114,
         is_live: false,
         is_short: false,
         is_upcoming: false,
@@ -688,7 +688,7 @@ Channel(
         ],
         publish_date: "[date]",
         publish_date_txt: Some("4 months ago"),
-        view_count: Some(511601),
+        view_count: 511601,
         is_live: false,
         is_short: false,
         is_upcoming: false,
@@ -721,7 +721,7 @@ Channel(
         ],
         publish_date: "[date]",
         publish_date_txt: Some("4 months ago"),
-        view_count: Some(662099),
+        view_count: 662099,
         is_live: false,
         is_short: false,
         is_upcoming: false,
@@ -754,7 +754,7 @@ Channel(
         ],
         publish_date: "[date]",
         publish_date_txt: Some("4 months ago"),
-        view_count: Some(549826),
+        view_count: 549826,
         is_live: false,
         is_short: false,
         is_upcoming: false,
@@ -787,7 +787,7 @@ Channel(
         ],
         publish_date: "[date]",
         publish_date_txt: Some("4 months ago"),
-        view_count: Some(538197),
+        view_count: 538197,
         is_live: false,
         is_short: false,
         is_upcoming: false,
@@ -820,7 +820,7 @@ Channel(
         ],
         publish_date: "[date]",
         publish_date_txt: Some("5 months ago"),
-        view_count: Some(536648),
+        view_count: 536648,
         is_live: false,
         is_short: false,
         is_upcoming: false,
@@ -853,7 +853,7 @@ Channel(
         ],
         publish_date: "[date]",
         publish_date_txt: Some("5 months ago"),
-        view_count: Some(724630),
+        view_count: 724630,
         is_live: false,
         is_short: false,
         is_upcoming: false,
@@ -886,7 +886,7 @@ Channel(
         ],
         publish_date: "[date]",
         publish_date_txt: Some("5 months ago"),
-        view_count: Some(426960),
+        view_count: 426960,
         is_live: false,
         is_short: false,
         is_upcoming: false,
@@ -919,7 +919,7 @@ Channel(
         ],
         publish_date: "[date]",
         publish_date_txt: Some("6 months ago"),
-        view_count: Some(735941),
+        view_count: 735941,
         is_live: false,
         is_short: false,
         is_upcoming: false,
@@ -952,7 +952,7 @@ Channel(
         ],
         publish_date: "[date]",
         publish_date_txt: Some("6 months ago"),
-        view_count: Some(502205),
+        view_count: 502205,
         is_live: false,
         is_short: false,
         is_upcoming: false,
@@ -985,7 +985,7 @@ Channel(
         ],
         publish_date: "[date]",
         publish_date_txt: Some("6 months ago"),
-        view_count: Some(718668),
+        view_count: 718668,
         is_live: false,
         is_short: false,
         is_upcoming: false,
@@ -1018,7 +1018,7 @@ Channel(
         ],
         publish_date: "[date]",
         publish_date_txt: Some("7 months ago"),
-        view_count: Some(775830),
+        view_count: 775830,
         is_live: false,
         is_short: false,
         is_upcoming: false,
@@ -1051,7 +1051,7 @@ Channel(
         ],
         publish_date: "[date]",
         publish_date_txt: Some("7 months ago"),
-        view_count: Some(480357),
+        view_count: 480357,
         is_live: false,
         is_short: false,
         is_upcoming: false,
@@ -1084,7 +1084,7 @@ Channel(
         ],
         publish_date: "[date]",
         publish_date_txt: Some("7 months ago"),
-        view_count: Some(460878),
+        view_count: 460878,
         is_live: false,
         is_short: false,
         is_upcoming: false,
@@ -1117,7 +1117,7 @@ Channel(
         ],
         publish_date: "[date]",
         publish_date_txt: Some("7 months ago"),
-        view_count: Some(228151),
+        view_count: 228151,
         is_live: false,
         is_short: false,
         is_upcoming: false,
diff --git a/src/client/snapshots/rustypipe__client__search__tests__map_search_cont.snap b/src/client/snapshots/rustypipe__client__search__tests__map_search_cont.snap
index 8a9c1e1..937e40b 100644
--- a/src/client/snapshots/rustypipe__client__search__tests__map_search_cont.snap
+++ b/src/client/snapshots/rustypipe__client__search__tests__map_search_cont.snap
@@ -31,7 +31,7 @@ Paginator(
       ),
       publish_date: "[date]",
       publish_date_txt: Some("1 day ago"),
-      view_count: Some(859366),
+      view_count: 859366,
       is_live: false,
       is_short: true,
       short_description: "shorts #jam https://doobydobap.com/recipe/hongsi_jam Instagram @doobydobap Join my discord!",
@@ -62,7 +62,7 @@ Paginator(
       ),
       publish_date: "[date]",
       publish_date_txt: Some("3 days ago"),
-      view_count: Some(1000402),
+      view_count: 1000402,
       is_live: false,
       is_short: true,
       short_description: "shorts #fruit #mukbang Instagram @doobydobap Join my discord! https://discord.gg/doobyverse www.doobydobap.com for\u{a0}...",
@@ -98,7 +98,7 @@ Paginator(
       ),
       publish_date: "[date]",
       publish_date_txt: Some("4 months ago"),
-      view_count: Some(528795),
+      view_count: 528795,
       is_live: false,
       is_short: false,
       short_description: "So many questions I wasn\'t able to answer, but if you comment below I\'ll try and answer every single one of them!!!! A little bit of\u{a0}...",
@@ -129,7 +129,7 @@ Paginator(
       ),
       publish_date: "[date]",
       publish_date_txt: Some("8 days ago"),
-      view_count: Some(1096055),
+      view_count: 1096055,
       is_live: false,
       is_short: true,
       short_description: "Ingredients: ** Citrus Filling** 1 cup mandarin juice or any orange-y citrus in season! 6 eggs 1 1/2 cup sugar ⅓ cup flour zest of 1\u{a0}...",
@@ -165,7 +165,7 @@ Paginator(
       ),
       publish_date: "[date]",
       publish_date_txt: Some("8 months ago"),
-      view_count: Some(928968),
+      view_count: 928968,
       is_live: false,
       is_short: false,
       short_description: "Sesame Granola Recipe 2 cups old-fashioned instant oats 2 cups mixture of seeds / nuts of your choice (I used ½ cup each of\u{a0}...",
@@ -201,7 +201,7 @@ Paginator(
       ),
       publish_date: "[date]",
       publish_date_txt: Some("7 months ago"),
-      view_count: Some(1137138),
+      view_count: 1137138,
       is_live: false,
       is_short: false,
       short_description: "Tomato Beef Curry 1 packet Japanese Curry Roux 250g thinly sliced beef 2 large onions 2 tbsp butter 2 tbsp neutral oil 1 can\u{a0}...",
@@ -237,7 +237,7 @@ Paginator(
       ),
       publish_date: "[date]",
       publish_date_txt: Some("8 months ago"),
-      view_count: Some(462437),
+      view_count: 462437,
       is_live: false,
       is_short: false,
       short_description: "Stekki-Don (for two, or for one very hungry person) 500g Ribeye 1 tsp Kosher salt 2 tbsp unsalted butter Sauce 4 tbsp light soy\u{a0}...",
@@ -268,7 +268,7 @@ Paginator(
       ),
       publish_date: "[date]",
       publish_date_txt: Some("1 month ago"),
-      view_count: Some(11285067),
+      view_count: 11285067,
       is_live: false,
       is_short: true,
       short_description: "shorts Instagram @doobydobap Join my discord! https://discord.gg/doobyverse www.doobydobap.com for recipes & stories.",
@@ -299,7 +299,7 @@ Paginator(
       ),
       publish_date: "[date]",
       publish_date_txt: Some("3 weeks ago"),
-      view_count: Some(2415040),
+      view_count: 2415040,
       is_live: false,
       is_short: true,
       short_description: "shorts #icecream Instagram @doobydobap Join my discord! https://discord.gg/doobyverse www.doobydobap.com for recipes\u{a0}...",
@@ -330,7 +330,7 @@ Paginator(
       ),
       publish_date: "[date]",
       publish_date_txt: Some("2 months ago"),
-      view_count: Some(5100787),
+      view_count: 5100787,
       is_live: false,
       is_short: true,
       short_description: "mcdonalds #michelin #fastfood Instagram @doobydobap Join my discord! https://discord.gg/doobyverse\u{a0}...",
@@ -361,7 +361,7 @@ Paginator(
       ),
       publish_date: "[date]",
       publish_date_txt: Some("10 months ago"),
-      view_count: Some(55308394),
+      view_count: 55308394,
       is_live: false,
       is_short: true,
       short_description: "shorts ASMR version on my Instagram @doobydobap Join my discord! https://discord.gg/doobyverse www.doobydobap.com\u{a0}...",
@@ -397,7 +397,7 @@ Paginator(
       ),
       publish_date: "[date]",
       publish_date_txt: Some("8 months ago"),
-      view_count: Some(774061),
+      view_count: 774061,
       is_live: false,
       is_short: false,
       short_description: "Stay on for bloopers! Vlog coming on Tuesday!! Location   의천각 Uicheongag 수정구 신흥동 6907번지 성남시 경기도 KR\u{a0}...",
@@ -428,7 +428,7 @@ Paginator(
       ),
       publish_date: "[date]",
       publish_date_txt: Some("8 months ago"),
-      view_count: Some(12314192),
+      view_count: 12314192,
       is_live: false,
       is_short: true,
       short_description: "shorts another deal breaker: people who like chocolate chip banana bread over regular-- you heard me Recipe: Wet: 3 very ripe\u{a0}...",
@@ -459,7 +459,7 @@ Paginator(
       ),
       publish_date: "[date]",
       publish_date_txt: Some("1 year ago"),
-      view_count: Some(4266748),
+      view_count: 4266748,
       is_live: false,
       is_short: true,
       short_description: "shorts Recipe on my website at www.doobydobap.com/recipe.",
@@ -495,7 +495,7 @@ Paginator(
       ),
       publish_date: "[date]",
       publish_date_txt: Some("9 months ago"),
-      view_count: Some(439888),
+      view_count: 439888,
       is_live: false,
       is_short: false,
       short_description: "Ingredients for jjaglee 1 cup pork belly 1 cup fermented kimchi ½ onion 1 leek 1 firm tofu 1.5 tbsp gochujang 2 tbsp coarse\u{a0}...",
@@ -526,7 +526,7 @@ Paginator(
       ),
       publish_date: "[date]",
       publish_date_txt: Some("6 months ago"),
-      view_count: Some(9312774),
+      view_count: 9312774,
       is_live: false,
       is_short: true,
       short_description: "shorts #japanese #curry Tomato Beef Curry 1 packet Japanese Curry Roux 250g thinly sliced beef 2 large onions 2 tbsp butter 2\u{a0}...",
diff --git a/src/client/snapshots/rustypipe__client__search__tests__map_search_default.snap b/src/client/snapshots/rustypipe__client__search__tests__map_search_default.snap
index a520b61..5b27ca5 100644
--- a/src/client/snapshots/rustypipe__client__search__tests__map_search_default.snap
+++ b/src/client/snapshots/rustypipe__client__search__tests__map_search_default.snap
@@ -56,7 +56,7 @@ SearchResult(
         ),
         publish_date: "[date]",
         publish_date_txt: Some("6 months ago"),
-        view_count: Some(531580),
+        view_count: 531580,
         is_live: false,
         is_short: false,
         short_description: "I know it\'s a little long, but I hope you enjoyed this Paris vlog :} Location   Udon Restaurant: Sanukiya 9 Rue d\'Argenteuil, Paris\u{a0}...",
@@ -92,7 +92,7 @@ SearchResult(
         ),
         publish_date: "[date]",
         publish_date_txt: Some("7 days ago"),
-        view_count: Some(974475),
+        view_count: 974475,
         is_live: false,
         is_short: false,
         short_description: "or the start of something new~~~~~ Thank you for your patience on the vlog, it took some time to adjust to my new normal. Excited\u{a0}...",
@@ -128,7 +128,7 @@ SearchResult(
         ),
         publish_date: "[date]",
         publish_date_txt: Some("4 months ago"),
-        view_count: Some(1034415),
+        view_count: 1034415,
         is_live: false,
         is_short: false,
         short_description: "https://partner.bokksu.com/doobydobap use code DOOBYDOBAP to get $15 off your first bokksu order! Instagram @doobydobap\u{a0}...",
@@ -164,7 +164,7 @@ SearchResult(
         ),
         publish_date: "[date]",
         publish_date_txt: Some("4 months ago"),
-        view_count: Some(831908),
+        view_count: 831908,
         is_live: false,
         is_short: false,
         short_description: "I could palpably feel how I\'m so much happier than before when I was reviewing my footage All the finalized recipes will be\u{a0}...",
@@ -200,7 +200,7 @@ SearchResult(
         ),
         publish_date: "[date]",
         publish_date_txt: Some("2 weeks ago"),
-        view_count: Some(354486),
+        view_count: 354486,
         is_live: false,
         is_short: false,
         short_description: "I haven\'t done a doob gourmand series in so so long! I hope you enjoyed it, let me know what kind of food you\'re interested in\u{a0}...",
@@ -236,7 +236,7 @@ SearchResult(
         ),
         publish_date: "[date]",
         publish_date_txt: Some("1 month ago"),
-        view_count: Some(524950),
+        view_count: 524950,
         is_live: false,
         is_short: false,
         short_description: "I missed you guys. Happy to see you guys back. I\'ve really been working on my mental health, educating myself with different food\u{a0}...",
@@ -272,7 +272,7 @@ SearchResult(
         ),
         publish_date: "[date]",
         publish_date_txt: Some("4 weeks ago"),
-        view_count: Some(528595),
+        view_count: 528595,
         is_live: false,
         is_short: false,
         short_description: "The word repair stems from the Latin word reparare, from re- \'back\' and parare \'make ready.\' And I feel that\'s exactly how I feel\u{a0}...",
@@ -308,7 +308,7 @@ SearchResult(
         ),
         publish_date: "[date]",
         publish_date_txt: Some("2 months ago"),
-        view_count: Some(717515),
+        view_count: 717515,
         is_live: false,
         is_short: false,
         short_description: "for now... more adventures to come! Music by Mark Generous - A Summer Day - https://thmatc.co/?l=CF6C5FFF Instagram\u{a0}...",
@@ -344,7 +344,7 @@ SearchResult(
         ),
         publish_date: "[date]",
         publish_date_txt: Some("2 months ago"),
-        view_count: Some(624386),
+        view_count: 624386,
         is_live: false,
         is_short: false,
         short_description: "Please be respectful in the comments section! I will not be tolerating any hateful/derogatory speech *barking noise* Music\u{a0}...",
@@ -380,7 +380,7 @@ SearchResult(
         ),
         publish_date: "[date]",
         publish_date_txt: Some("3 months ago"),
-        view_count: Some(696942),
+        view_count: 696942,
         is_live: false,
         is_short: false,
         short_description: "Korea has an interesting rent structure called junseh where you pay a higher security deposit in turn for lower rent! And before\u{a0}...",
@@ -416,7 +416,7 @@ SearchResult(
         ),
         publish_date: "[date]",
         publish_date_txt: Some("3 months ago"),
-        view_count: Some(923749),
+        view_count: 923749,
         is_live: false,
         is_short: false,
         short_description: "tuna kimchi jook 2 cups cooked rice 3 cups water 1 cup kimchi 320g canned tuna 1 tbsp perilla seed oil 1 onion 1 tbsp gochujang\u{a0}...",
@@ -452,7 +452,7 @@ SearchResult(
         ),
         publish_date: "[date]",
         publish_date_txt: Some("6 months ago"),
-        view_count: Some(1282467),
+        view_count: 1282467,
         is_live: false,
         is_short: false,
         short_description: "Today we introduce @Doobydobap to the best of British desserts! Massive thanks to Dooby for joining us for this episode.",
@@ -488,7 +488,7 @@ SearchResult(
         ),
         publish_date: "[date]",
         publish_date_txt: Some("8 months ago"),
-        view_count: Some(1649656),
+        view_count: 1649656,
         is_live: false,
         is_short: false,
         short_description: "Hey doobies, I know I promised a cookie recipe in my last vlog, but I haven\'t yet developed one of my own just yet-- still recipe\u{a0}...",
@@ -524,7 +524,7 @@ SearchResult(
         ),
         publish_date: "[date]",
         publish_date_txt: Some("4 months ago"),
-        view_count: Some(1085725),
+        view_count: 1085725,
         is_live: false,
         is_short: false,
         short_description: "A busy, but calm week for me here in Seoul living alone. Planning on exploring more parts of Korea, please let me know in the\u{a0}...",
@@ -560,7 +560,7 @@ SearchResult(
         ),
         publish_date: "[date]",
         publish_date_txt: Some("10 months ago"),
-        view_count: Some(1327833),
+        view_count: 1327833,
         is_live: false,
         is_short: false,
         short_description: "Broth * 1 large chicken * 1 leek & ½ onion charred * 1 leek & ½ onion * 1 tbsp ginger * 6 garlic cloves Tare * leftover cha shu\u{a0}...",
@@ -596,7 +596,7 @@ SearchResult(
         ),
         publish_date: "[date]",
         publish_date_txt: Some("3 months ago"),
-        view_count: Some(1052801),
+        view_count: 1052801,
         is_live: false,
         is_short: false,
         short_description: "Ginger Pork Recipe! https://doobydobap.com/recipe/ginger-pork-shogayaki - Instagram @doobydobap Join my discord!",
@@ -632,7 +632,7 @@ SearchResult(
         ),
         publish_date: "[date]",
         publish_date_txt: Some("7 months ago"),
-        view_count: Some(1137136),
+        view_count: 1137136,
         is_live: false,
         is_short: false,
         short_description: "Tomato Beef Curry 1 packet Japanese Curry Roux 250g thinly sliced beef 2 large onions 2 tbsp butter 2 tbsp neutral oil 1 can\u{a0}...",
@@ -668,7 +668,7 @@ SearchResult(
         ),
         publish_date: "[date]",
         publish_date_txt: Some("8 months ago"),
-        view_count: Some(928967),
+        view_count: 928967,
         is_live: false,
         is_short: false,
         short_description: "Sesame Granola Recipe 2 cups old-fashioned instant oats 2 cups mixture of seeds / nuts of your choice (I used ½ cup each of\u{a0}...",
@@ -704,7 +704,7 @@ SearchResult(
         ),
         publish_date: "[date]",
         publish_date_txt: Some("8 months ago"),
-        view_count: Some(1077297),
+        view_count: 1077297,
         is_live: false,
         is_short: false,
         short_description: "Pecan Banana Bread with Coffee Liquor Recipe https://doobydobap.com/recipe/pecan-banana-bread-with-coffee-liquor Music\u{a0}...",
diff --git a/src/client/snapshots/rustypipe__client__video_details__tests__map_recommendations.snap b/src/client/snapshots/rustypipe__client__video_details__tests__map_recommendations.snap
index f42b372..0b5b63d 100644
--- a/src/client/snapshots/rustypipe__client__video_details__tests__map_recommendations.snap
+++ b/src/client/snapshots/rustypipe__client__video_details__tests__map_recommendations.snap
@@ -36,7 +36,7 @@ Paginator(
       ),
       publish_date: "[date]",
       publish_date_txt: Some("11 months ago"),
-      view_count: Some(216222873),
+      view_count: 216222873,
       is_live: false,
       is_short: false,
     ),
@@ -71,7 +71,7 @@ Paginator(
       ),
       publish_date: "[date]",
       publish_date_txt: Some("5 months ago"),
-      view_count: Some(155106313),
+      view_count: 155106313,
       is_live: false,
       is_short: false,
     ),
@@ -106,7 +106,7 @@ Paginator(
       ),
       publish_date: "[date]",
       publish_date_txt: Some("2 years ago"),
-      view_count: Some(265238677),
+      view_count: 265238677,
       is_live: false,
       is_short: false,
     ),
@@ -141,7 +141,7 @@ Paginator(
       ),
       publish_date: "[date]",
       publish_date_txt: Some("1 year ago"),
-      view_count: Some(9989591),
+      view_count: 9989591,
       is_live: false,
       is_short: false,
     ),
@@ -176,7 +176,7 @@ Paginator(
       ),
       publish_date: "[date]",
       publish_date_txt: Some("1 year ago"),
-      view_count: Some(34588526),
+      view_count: 34588526,
       is_live: false,
       is_short: false,
     ),
@@ -211,7 +211,7 @@ Paginator(
       ),
       publish_date: "[date]",
       publish_date_txt: Some("1 year ago"),
-      view_count: Some(242737870),
+      view_count: 242737870,
       is_live: false,
       is_short: false,
     ),
@@ -246,7 +246,7 @@ Paginator(
       ),
       publish_date: "[date]",
       publish_date_txt: Some("2 years ago"),
-      view_count: Some(126677200),
+      view_count: 126677200,
       is_live: false,
       is_short: false,
     ),
@@ -281,7 +281,7 @@ Paginator(
       ),
       publish_date: "[date]",
       publish_date_txt: Some("1 month ago"),
-      view_count: Some(335903776),
+      view_count: 335903776,
       is_live: false,
       is_short: false,
     ),
@@ -316,7 +316,7 @@ Paginator(
       ),
       publish_date: "[date]",
       publish_date_txt: Some("1 year ago"),
-      view_count: Some(86125645),
+      view_count: 86125645,
       is_live: false,
       is_short: false,
     ),
@@ -351,7 +351,7 @@ Paginator(
       ),
       publish_date: "[date]",
       publish_date_txt: Some("6 months ago"),
-      view_count: Some(170016610),
+      view_count: 170016610,
       is_live: false,
       is_short: false,
     ),
@@ -386,7 +386,7 @@ Paginator(
       ),
       publish_date: "[date]",
       publish_date_txt: Some("1 year ago"),
-      view_count: Some(123861096),
+      view_count: 123861096,
       is_live: false,
       is_short: false,
     ),
@@ -421,7 +421,7 @@ Paginator(
       ),
       publish_date: "[date]",
       publish_date_txt: Some("2 months ago"),
-      view_count: Some(101968219),
+      view_count: 101968219,
       is_live: false,
       is_short: false,
     ),
@@ -456,7 +456,7 @@ Paginator(
       ),
       publish_date: "[date]",
       publish_date_txt: Some("2 years ago"),
-      view_count: Some(322510403),
+      view_count: 322510403,
       is_live: false,
       is_short: false,
     ),
@@ -491,7 +491,7 @@ Paginator(
       ),
       publish_date: "[date]",
       publish_date_txt: Some("2 years ago"),
-      view_count: Some(345491789),
+      view_count: 345491789,
       is_live: false,
       is_short: false,
     ),
@@ -526,7 +526,7 @@ Paginator(
       ),
       publish_date: "[date]",
       publish_date_txt: Some("11 months ago"),
-      view_count: Some(314744776),
+      view_count: 314744776,
       is_live: false,
       is_short: false,
     ),
@@ -561,7 +561,7 @@ Paginator(
       ),
       publish_date: "[date]",
       publish_date_txt: Some("1 year ago"),
-      view_count: Some(18830758),
+      view_count: 18830758,
       is_live: false,
       is_short: false,
     ),
@@ -596,7 +596,7 @@ Paginator(
       ),
       publish_date: "[date]",
       publish_date_txt: Some("1 year ago"),
-      view_count: Some(282957370),
+      view_count: 282957370,
       is_live: false,
       is_short: false,
     ),
@@ -631,7 +631,7 @@ Paginator(
       ),
       publish_date: "[date]",
       publish_date_txt: Some("2 years ago"),
-      view_count: Some(355203298),
+      view_count: 355203298,
       is_live: false,
       is_short: false,
     ),
@@ -666,7 +666,7 @@ Paginator(
       ),
       publish_date: "[date]",
       publish_date_txt: Some("2 years ago"),
-      view_count: Some(157400947),
+      view_count: 157400947,
       is_live: false,
       is_short: false,
     ),
diff --git a/src/client/snapshots/rustypipe__client__video_details__tests__map_video_details_ccommons.snap b/src/client/snapshots/rustypipe__client__video_details__tests__map_video_details_ccommons.snap
index 6664a87..83554b9 100644
--- a/src/client/snapshots/rustypipe__client__video_details__tests__map_video_details_ccommons.snap
+++ b/src/client/snapshots/rustypipe__client__video_details__tests__map_video_details_ccommons.snap
@@ -82,7 +82,7 @@ VideoDetails(
         ),
         publish_date: "[date]",
         publish_date_txt: Some("5 years ago"),
-        view_count: Some(2749364),
+        view_count: 2749364,
         is_live: false,
         is_short: false,
       ),
@@ -117,7 +117,7 @@ VideoDetails(
         ),
         publish_date: "[date]",
         publish_date_txt: Some("2 years ago"),
-        view_count: Some(2266658),
+        view_count: 2266658,
         is_live: false,
         is_short: false,
       ),
@@ -152,7 +152,7 @@ VideoDetails(
         ),
         publish_date: "[date]",
         publish_date_txt: Some("2 years ago"),
-        view_count: Some(260941),
+        view_count: 260941,
         is_live: false,
         is_short: false,
       ),
@@ -187,7 +187,7 @@ VideoDetails(
         ),
         publish_date: "[date]",
         publish_date_txt: Some("6 years ago"),
-        view_count: Some(1229987),
+        view_count: 1229987,
         is_live: false,
         is_short: false,
       ),
@@ -222,7 +222,7 @@ VideoDetails(
         ),
         publish_date: "[date]",
         publish_date_txt: Some("7 years ago"),
-        view_count: Some(6095028),
+        view_count: 6095028,
         is_live: false,
         is_short: false,
       ),
@@ -257,7 +257,7 @@ VideoDetails(
         ),
         publish_date: "[date]",
         publish_date_txt: Some("3 years ago"),
-        view_count: Some(46470),
+        view_count: 46470,
         is_live: false,
         is_short: false,
       ),
@@ -292,7 +292,7 @@ VideoDetails(
         ),
         publish_date: "[date]",
         publish_date_txt: Some("3 years ago"),
-        view_count: Some(25136),
+        view_count: 25136,
         is_live: false,
         is_short: false,
       ),
@@ -327,7 +327,7 @@ VideoDetails(
         ),
         publish_date: "[date]",
         publish_date_txt: Some("6 years ago"),
-        view_count: Some(44410),
+        view_count: 44410,
         is_live: false,
         is_short: false,
       ),
@@ -362,7 +362,7 @@ VideoDetails(
         ),
         publish_date: "[date]",
         publish_date_txt: Some("11 years ago"),
-        view_count: Some(4184357),
+        view_count: 4184357,
         is_live: false,
         is_short: false,
       ),
@@ -397,7 +397,7 @@ VideoDetails(
         ),
         publish_date: "[date]",
         publish_date_txt: Some("5 years ago"),
-        view_count: Some(36111),
+        view_count: 36111,
         is_live: false,
         is_short: false,
       ),
@@ -432,7 +432,7 @@ VideoDetails(
         ),
         publish_date: "[date]",
         publish_date_txt: Some("3 years ago"),
-        view_count: Some(20322),
+        view_count: 20322,
         is_live: false,
         is_short: false,
       ),
@@ -467,7 +467,7 @@ VideoDetails(
         ),
         publish_date: "[date]",
         publish_date_txt: Some("6 years ago"),
-        view_count: Some(482258),
+        view_count: 482258,
         is_live: false,
         is_short: false,
       ),
@@ -502,7 +502,7 @@ VideoDetails(
         ),
         publish_date: "[date]",
         publish_date_txt: Some("12 days ago"),
-        view_count: Some(427756),
+        view_count: 427756,
         is_live: false,
         is_short: false,
       ),
@@ -537,7 +537,7 @@ VideoDetails(
         ),
         publish_date: "[date]",
         publish_date_txt: Some("2 years ago"),
-        view_count: Some(26926),
+        view_count: 26926,
         is_live: false,
         is_short: false,
       ),
@@ -572,7 +572,7 @@ VideoDetails(
         ),
         publish_date: "[date]",
         publish_date_txt: Some("3 years ago"),
-        view_count: Some(126093),
+        view_count: 126093,
         is_live: false,
         is_short: false,
       ),
@@ -607,7 +607,7 @@ VideoDetails(
         ),
         publish_date: "[date]",
         publish_date_txt: Some("3 years ago"),
-        view_count: Some(13243),
+        view_count: 13243,
         is_live: false,
         is_short: false,
       ),
@@ -642,7 +642,7 @@ VideoDetails(
         ),
         publish_date: "[date]",
         publish_date_txt: Some("6 years ago"),
-        view_count: Some(80624),
+        view_count: 80624,
         is_live: false,
         is_short: false,
       ),
@@ -677,7 +677,7 @@ VideoDetails(
         ),
         publish_date: "[date]",
         publish_date_txt: Some("5 years ago"),
-        view_count: Some(29009),
+        view_count: 29009,
         is_live: false,
         is_short: false,
       ),
@@ -712,7 +712,7 @@ VideoDetails(
         ),
         publish_date: "[date]",
         publish_date_txt: Some("3 months ago"),
-        view_count: Some(67538),
+        view_count: 67538,
         is_live: false,
         is_short: false,
       ),
diff --git a/src/client/snapshots/rustypipe__client__video_details__tests__map_video_details_chapters.snap b/src/client/snapshots/rustypipe__client__video_details__tests__map_video_details_chapters.snap
index 72c313b..12225df 100644
--- a/src/client/snapshots/rustypipe__client__video_details__tests__map_video_details_chapters.snap
+++ b/src/client/snapshots/rustypipe__client__video_details__tests__map_video_details_chapters.snap
@@ -518,7 +518,7 @@ VideoDetails(
         ),
         publish_date: "[date]",
         publish_date_txt: Some("2 days ago"),
-        view_count: Some(1862544),
+        view_count: 1862544,
         is_live: false,
         is_short: false,
       ),
@@ -553,7 +553,7 @@ VideoDetails(
         ),
         publish_date: "[date]",
         publish_date_txt: Some("Streamed 8 days ago"),
-        view_count: Some(946996),
+        view_count: 946996,
         is_live: false,
         is_short: false,
       ),
@@ -588,7 +588,7 @@ VideoDetails(
         ),
         publish_date: "[date]",
         publish_date_txt: Some("1 day ago"),
-        view_count: Some(349251),
+        view_count: 349251,
         is_live: false,
         is_short: false,
       ),
@@ -623,7 +623,7 @@ VideoDetails(
         ),
         publish_date: "[date]",
         publish_date_txt: Some("1 day ago"),
-        view_count: Some(375458),
+        view_count: 375458,
         is_live: false,
         is_short: false,
       ),
@@ -658,7 +658,7 @@ VideoDetails(
         ),
         publish_date: "[date]",
         publish_date_txt: Some("Streamed 6 days ago"),
-        view_count: Some(734463),
+        view_count: 734463,
         is_live: false,
         is_short: false,
       ),
@@ -693,7 +693,7 @@ VideoDetails(
         ),
         publish_date: "[date]",
         publish_date_txt: Some("11 months ago"),
-        view_count: Some(2773698),
+        view_count: 2773698,
         is_live: false,
         is_short: false,
       ),
@@ -728,7 +728,7 @@ VideoDetails(
         ),
         publish_date: "[date]",
         publish_date_txt: Some("8 hours ago"),
-        view_count: Some(219605),
+        view_count: 219605,
         is_live: false,
         is_short: false,
       ),
@@ -763,7 +763,7 @@ VideoDetails(
         ),
         publish_date: "[date]",
         publish_date_txt: Some("4 hours ago"),
-        view_count: Some(145345),
+        view_count: 145345,
         is_live: false,
         is_short: false,
       ),
@@ -798,7 +798,7 @@ VideoDetails(
         ),
         publish_date: "[date]",
         publish_date_txt: Some("6 hours ago"),
-        view_count: Some(50033),
+        view_count: 50033,
         is_live: false,
         is_short: false,
       ),
@@ -833,7 +833,7 @@ VideoDetails(
         ),
         publish_date: "[date]",
         publish_date_txt: Some("1 month ago"),
-        view_count: Some(1163652),
+        view_count: 1163652,
         is_live: false,
         is_short: false,
       ),
@@ -868,7 +868,7 @@ VideoDetails(
         ),
         publish_date: "[date]",
         publish_date_txt: Some("1 year ago"),
-        view_count: Some(3266169),
+        view_count: 3266169,
         is_live: false,
         is_short: false,
       ),
@@ -903,7 +903,7 @@ VideoDetails(
         ),
         publish_date: "[date]",
         publish_date_txt: Some("2 weeks ago"),
-        view_count: Some(678935),
+        view_count: 678935,
         is_live: false,
         is_short: false,
       ),
@@ -938,7 +938,7 @@ VideoDetails(
         ),
         publish_date: "[date]",
         publish_date_txt: Some("3 weeks ago"),
-        view_count: Some(7569956),
+        view_count: 7569956,
         is_live: false,
         is_short: false,
       ),
@@ -973,7 +973,7 @@ VideoDetails(
         ),
         publish_date: "[date]",
         publish_date_txt: Some("5 months ago"),
-        view_count: Some(3374461),
+        view_count: 3374461,
         is_live: false,
         is_short: false,
       ),
@@ -1008,7 +1008,7 @@ VideoDetails(
         ),
         publish_date: "[date]",
         publish_date_txt: Some("5 days ago"),
-        view_count: Some(1322625),
+        view_count: 1322625,
         is_live: false,
         is_short: false,
       ),
@@ -1043,7 +1043,7 @@ VideoDetails(
         ),
         publish_date: "[date]",
         publish_date_txt: Some("3 weeks ago"),
-        view_count: Some(255945),
+        view_count: 255945,
         is_live: false,
         is_short: false,
       ),
@@ -1078,7 +1078,7 @@ VideoDetails(
         ),
         publish_date: "[date]",
         publish_date_txt: Some("2 weeks ago"),
-        view_count: Some(2930532),
+        view_count: 2930532,
         is_live: false,
         is_short: false,
       ),
@@ -1113,7 +1113,7 @@ VideoDetails(
         ),
         publish_date: "[date]",
         publish_date_txt: Some("12 days ago"),
-        view_count: Some(2743664),
+        view_count: 2743664,
         is_live: false,
         is_short: false,
       ),
@@ -1148,7 +1148,7 @@ VideoDetails(
         ),
         publish_date: "[date]",
         publish_date_txt: Some("3 weeks ago"),
-        view_count: Some(7958495),
+        view_count: 7958495,
         is_live: false,
         is_short: false,
       ),
diff --git a/src/client/snapshots/rustypipe__client__video_details__tests__map_video_details_live.snap b/src/client/snapshots/rustypipe__client__video_details__tests__map_video_details_live.snap
index 06e6ce6..9f63a5c 100644
--- a/src/client/snapshots/rustypipe__client__video_details__tests__map_video_details_live.snap
+++ b/src/client/snapshots/rustypipe__client__video_details__tests__map_video_details_live.snap
@@ -102,7 +102,7 @@ VideoDetails(
         ),
         publish_date: "[date]",
         publish_date_txt: Some("7 years ago"),
-        view_count: Some(90280310),
+        view_count: 90280310,
         is_live: false,
         is_short: false,
       ),
@@ -137,7 +137,7 @@ VideoDetails(
         ),
         publish_date: "[date]",
         publish_date_txt: None,
-        view_count: Some(80),
+        view_count: 80,
         is_live: true,
         is_short: false,
       ),
@@ -172,7 +172,7 @@ VideoDetails(
         ),
         publish_date: "[date]",
         publish_date_txt: Some("10 hours ago"),
-        view_count: Some(13),
+        view_count: 13,
         is_live: false,
         is_short: false,
       ),
@@ -207,7 +207,7 @@ VideoDetails(
         ),
         publish_date: "[date]",
         publish_date_txt: None,
-        view_count: Some(23),
+        view_count: 23,
         is_live: true,
         is_short: false,
       ),
@@ -242,7 +242,7 @@ VideoDetails(
         ),
         publish_date: "[date]",
         publish_date_txt: Some("11 years ago"),
-        view_count: Some(118635723),
+        view_count: 118635723,
         is_live: false,
         is_short: false,
       ),
@@ -277,7 +277,7 @@ VideoDetails(
         ),
         publish_date: "[date]",
         publish_date_txt: Some("7 years ago"),
-        view_count: Some(11226061),
+        view_count: 11226061,
         is_live: false,
         is_short: false,
       ),
@@ -312,7 +312,7 @@ VideoDetails(
         ),
         publish_date: "[date]",
         publish_date_txt: None,
-        view_count: Some(108),
+        view_count: 108,
         is_live: true,
         is_short: false,
       ),
@@ -347,7 +347,7 @@ VideoDetails(
         ),
         publish_date: "[date]",
         publish_date_txt: Some("3 years ago"),
-        view_count: Some(85240979),
+        view_count: 85240979,
         is_live: false,
         is_short: false,
       ),
@@ -382,7 +382,7 @@ VideoDetails(
         ),
         publish_date: "[date]",
         publish_date_txt: Some("4 years ago"),
-        view_count: Some(5405668),
+        view_count: 5405668,
         is_live: false,
         is_short: false,
       ),
@@ -417,7 +417,7 @@ VideoDetails(
         ),
         publish_date: "[date]",
         publish_date_txt: None,
-        view_count: Some(10),
+        view_count: 10,
         is_live: true,
         is_short: false,
       ),
@@ -452,7 +452,7 @@ VideoDetails(
         ),
         publish_date: "[date]",
         publish_date_txt: Some("2 years ago"),
-        view_count: Some(61247221),
+        view_count: 61247221,
         is_live: false,
         is_short: false,
       ),
@@ -487,7 +487,7 @@ VideoDetails(
         ),
         publish_date: "[date]",
         publish_date_txt: Some("15 years ago"),
-        view_count: Some(36276575),
+        view_count: 36276575,
         is_live: false,
         is_short: false,
       ),
@@ -522,7 +522,7 @@ VideoDetails(
         ),
         publish_date: "[date]",
         publish_date_txt: Some("5 years ago"),
-        view_count: Some(12004917),
+        view_count: 12004917,
         is_live: false,
         is_short: false,
       ),
@@ -557,7 +557,7 @@ VideoDetails(
         ),
         publish_date: "[date]",
         publish_date_txt: Some("1 year ago"),
-        view_count: Some(22901662),
+        view_count: 22901662,
         is_live: false,
         is_short: false,
       ),
@@ -592,7 +592,7 @@ VideoDetails(
         ),
         publish_date: "[date]",
         publish_date_txt: Some("4 years ago"),
-        view_count: Some(42814880),
+        view_count: 42814880,
         is_live: false,
         is_short: false,
       ),
@@ -627,7 +627,7 @@ VideoDetails(
         ),
         publish_date: "[date]",
         publish_date_txt: Some("4 years ago"),
-        view_count: Some(9592134),
+        view_count: 9592134,
         is_live: false,
         is_short: false,
       ),
@@ -662,7 +662,7 @@ VideoDetails(
         ),
         publish_date: "[date]",
         publish_date_txt: Some("5 years ago"),
-        view_count: Some(4463605),
+        view_count: 4463605,
         is_live: false,
         is_short: false,
       ),
@@ -697,7 +697,7 @@ VideoDetails(
         ),
         publish_date: "[date]",
         publish_date_txt: Some("10 years ago"),
-        view_count: Some(14094460),
+        view_count: 14094460,
         is_live: false,
         is_short: false,
       ),
@@ -732,7 +732,7 @@ VideoDetails(
         ),
         publish_date: "[date]",
         publish_date_txt: Some("2 years ago"),
-        view_count: Some(9901163),
+        view_count: 9901163,
         is_live: false,
         is_short: false,
       ),
@@ -767,7 +767,7 @@ VideoDetails(
         ),
         publish_date: "[date]",
         publish_date_txt: None,
-        view_count: Some(15),
+        view_count: 15,
         is_live: true,
         is_short: false,
       ),
diff --git a/src/client/snapshots/rustypipe__client__video_details__tests__map_video_details_music.snap b/src/client/snapshots/rustypipe__client__video_details__tests__map_video_details_music.snap
index daad96e..002b6c6 100644
--- a/src/client/snapshots/rustypipe__client__video_details__tests__map_video_details_music.snap
+++ b/src/client/snapshots/rustypipe__client__video_details__tests__map_video_details_music.snap
@@ -72,7 +72,7 @@ VideoDetails(
         ),
         publish_date: "[date]",
         publish_date_txt: Some("2 years ago"),
-        view_count: Some(30966),
+        view_count: 30966,
         is_live: false,
         is_short: false,
       ),
@@ -107,7 +107,7 @@ VideoDetails(
         ),
         publish_date: "[date]",
         publish_date_txt: Some("2 years ago"),
-        view_count: Some(15269),
+        view_count: 15269,
         is_live: false,
         is_short: false,
       ),
@@ -142,7 +142,7 @@ VideoDetails(
         ),
         publish_date: "[date]",
         publish_date_txt: Some("2 years ago"),
-        view_count: Some(29035),
+        view_count: 29035,
         is_live: false,
         is_short: false,
       ),
@@ -177,7 +177,7 @@ VideoDetails(
         ),
         publish_date: "[date]",
         publish_date_txt: Some("2 years ago"),
-        view_count: Some(46009),
+        view_count: 46009,
         is_live: false,
         is_short: false,
       ),
@@ -212,7 +212,7 @@ VideoDetails(
         ),
         publish_date: "[date]",
         publish_date_txt: Some("2 years ago"),
-        view_count: Some(7405),
+        view_count: 7405,
         is_live: false,
         is_short: false,
       ),
@@ -247,7 +247,7 @@ VideoDetails(
         ),
         publish_date: "[date]",
         publish_date_txt: Some("2 years ago"),
-        view_count: Some(19383),
+        view_count: 19383,
         is_live: false,
         is_short: false,
       ),
@@ -282,7 +282,7 @@ VideoDetails(
         ),
         publish_date: "[date]",
         publish_date_txt: Some("4 years ago"),
-        view_count: Some(132472),
+        view_count: 132472,
         is_live: false,
         is_short: false,
       ),
@@ -317,7 +317,7 @@ VideoDetails(
         ),
         publish_date: "[date]",
         publish_date_txt: Some("4 years ago"),
-        view_count: Some(367684),
+        view_count: 367684,
         is_live: false,
         is_short: false,
       ),
@@ -352,7 +352,7 @@ VideoDetails(
         ),
         publish_date: "[date]",
         publish_date_txt: Some("4 years ago"),
-        view_count: Some(195958),
+        view_count: 195958,
         is_live: false,
         is_short: false,
       ),
@@ -387,7 +387,7 @@ VideoDetails(
         ),
         publish_date: "[date]",
         publish_date_txt: Some("2 years ago"),
-        view_count: Some(37702),
+        view_count: 37702,
         is_live: false,
         is_short: false,
       ),
@@ -422,7 +422,7 @@ VideoDetails(
         ),
         publish_date: "[date]",
         publish_date_txt: Some("8 years ago"),
-        view_count: Some(103494),
+        view_count: 103494,
         is_live: false,
         is_short: false,
       ),
@@ -457,7 +457,7 @@ VideoDetails(
         ),
         publish_date: "[date]",
         publish_date_txt: Some("2 years ago"),
-        view_count: Some(19342),
+        view_count: 19342,
         is_live: false,
         is_short: false,
       ),
@@ -492,7 +492,7 @@ VideoDetails(
         ),
         publish_date: "[date]",
         publish_date_txt: Some("2 years ago"),
-        view_count: Some(9392),
+        view_count: 9392,
         is_live: false,
         is_short: false,
       ),
@@ -527,7 +527,7 @@ VideoDetails(
         ),
         publish_date: "[date]",
         publish_date_txt: Some("2 years ago"),
-        view_count: Some(22994),
+        view_count: 22994,
         is_live: false,
         is_short: false,
       ),
diff --git a/src/client/snapshots/rustypipe__client__video_details__tests__map_video_details_mv.snap b/src/client/snapshots/rustypipe__client__video_details__tests__map_video_details_mv.snap
index 7ee5107..7c77d89 100644
--- a/src/client/snapshots/rustypipe__client__video_details__tests__map_video_details_mv.snap
+++ b/src/client/snapshots/rustypipe__client__video_details__tests__map_video_details_mv.snap
@@ -133,7 +133,7 @@ VideoDetails(
         ),
         publish_date: "[date]",
         publish_date_txt: Some("1 year ago"),
-        view_count: Some(245412217),
+        view_count: 245412217,
         is_live: false,
         is_short: false,
       ),
@@ -168,7 +168,7 @@ VideoDetails(
         ),
         publish_date: "[date]",
         publish_date_txt: Some("11 months ago"),
-        view_count: Some(215292736),
+        view_count: 215292736,
         is_live: false,
         is_short: false,
       ),
@@ -203,7 +203,7 @@ VideoDetails(
         ),
         publish_date: "[date]",
         publish_date_txt: Some("2 years ago"),
-        view_count: Some(264670229),
+        view_count: 264670229,
         is_live: false,
         is_short: false,
       ),
@@ -238,7 +238,7 @@ VideoDetails(
         ),
         publish_date: "[date]",
         publish_date_txt: Some("2 years ago"),
-        view_count: Some(354281319),
+        view_count: 354281319,
         is_live: false,
         is_short: false,
       ),
@@ -273,7 +273,7 @@ VideoDetails(
         ),
         publish_date: "[date]",
         publish_date_txt: Some("6 months ago"),
-        view_count: Some(167648677),
+        view_count: 167648677,
         is_live: false,
         is_short: false,
       ),
@@ -308,7 +308,7 @@ VideoDetails(
         ),
         publish_date: "[date]",
         publish_date_txt: Some("1 year ago"),
-        view_count: Some(455437333),
+        view_count: 455437333,
         is_live: false,
         is_short: false,
       ),
@@ -343,7 +343,7 @@ VideoDetails(
         ),
         publish_date: "[date]",
         publish_date_txt: Some("2 years ago"),
-        view_count: Some(344730852),
+        view_count: 344730852,
         is_live: false,
         is_short: false,
       ),
@@ -378,7 +378,7 @@ VideoDetails(
         ),
         publish_date: "[date]",
         publish_date_txt: Some("6 years ago"),
-        view_count: Some(238321583),
+        view_count: 238321583,
         is_live: false,
         is_short: false,
       ),
@@ -413,7 +413,7 @@ VideoDetails(
         ),
         publish_date: "[date]",
         publish_date_txt: Some("1 year ago"),
-        view_count: Some(240527435),
+        view_count: 240527435,
         is_live: false,
         is_short: false,
       ),
@@ -448,7 +448,7 @@ VideoDetails(
         ),
         publish_date: "[date]",
         publish_date_txt: Some("3 years ago"),
-        view_count: Some(306144594),
+        view_count: 306144594,
         is_live: false,
         is_short: false,
       ),
@@ -483,7 +483,7 @@ VideoDetails(
         ),
         publish_date: "[date]",
         publish_date_txt: Some("2 months ago"),
-        view_count: Some(100128895),
+        view_count: 100128895,
         is_live: false,
         is_short: false,
       ),
@@ -518,7 +518,7 @@ VideoDetails(
         ),
         publish_date: "[date]",
         publish_date_txt: Some("2 years ago"),
-        view_count: Some(1146631077),
+        view_count: 1146631077,
         is_live: false,
         is_short: false,
       ),
@@ -553,7 +553,7 @@ VideoDetails(
         ),
         publish_date: "[date]",
         publish_date_txt: Some("2 years ago"),
-        view_count: Some(126406160),
+        view_count: 126406160,
         is_live: false,
         is_short: false,
       ),
@@ -588,7 +588,7 @@ VideoDetails(
         ),
         publish_date: "[date]",
         publish_date_txt: Some("6 years ago"),
-        view_count: Some(1476093662),
+        view_count: 1476093662,
         is_live: false,
         is_short: false,
       ),
@@ -623,7 +623,7 @@ VideoDetails(
         ),
         publish_date: "[date]",
         publish_date_txt: Some("4 years ago"),
-        view_count: Some(228968545),
+        view_count: 228968545,
         is_live: false,
         is_short: false,
       ),
@@ -658,7 +658,7 @@ VideoDetails(
         ),
         publish_date: "[date]",
         publish_date_txt: Some("5 months ago"),
-        view_count: Some(152292435),
+        view_count: 152292435,
         is_live: false,
         is_short: false,
       ),
@@ -693,7 +693,7 @@ VideoDetails(
         ),
         publish_date: "[date]",
         publish_date_txt: Some("2 months ago"),
-        view_count: Some(504562),
+        view_count: 504562,
         is_live: false,
         is_short: false,
       ),
@@ -728,7 +728,7 @@ VideoDetails(
         ),
         publish_date: "[date]",
         publish_date_txt: Some("1 year ago"),
-        view_count: Some(34445393),
+        view_count: 34445393,
         is_live: false,
         is_short: false,
       ),
diff --git a/src/client/snapshots/rustypipe__client__video_details__tests__map_video_details_newdesc.snap b/src/client/snapshots/rustypipe__client__video_details__tests__map_video_details_newdesc.snap
index c24cc0a..dfe6581 100644
--- a/src/client/snapshots/rustypipe__client__video_details__tests__map_video_details_newdesc.snap
+++ b/src/client/snapshots/rustypipe__client__video_details__tests__map_video_details_newdesc.snap
@@ -133,7 +133,7 @@ VideoDetails(
         ),
         publish_date: "[date]",
         publish_date_txt: Some("5 days ago"),
-        view_count: Some(996),
+        view_count: 996,
         is_live: false,
         is_short: false,
       ),
@@ -168,7 +168,7 @@ VideoDetails(
         ),
         publish_date: "[date]",
         publish_date_txt: Some("7 months ago"),
-        view_count: Some(7684395),
+        view_count: 7684395,
         is_live: false,
         is_short: false,
       ),
@@ -203,7 +203,7 @@ VideoDetails(
         ),
         publish_date: "[date]",
         publish_date_txt: Some("2 years ago"),
-        view_count: Some(260984648),
+        view_count: 260984648,
         is_live: false,
         is_short: false,
       ),
@@ -238,7 +238,7 @@ VideoDetails(
         ),
         publish_date: "[date]",
         publish_date_txt: Some("7 years ago"),
-        view_count: Some(3035220118),
+        view_count: 3035220118,
         is_live: false,
         is_short: false,
       ),
@@ -273,7 +273,7 @@ VideoDetails(
         ),
         publish_date: "[date]",
         publish_date_txt: Some("1 year ago"),
-        view_count: Some(138451832),
+        view_count: 138451832,
         is_live: false,
         is_short: false,
       ),
@@ -308,7 +308,7 @@ VideoDetails(
         ),
         publish_date: "[date]",
         publish_date_txt: Some("1 year ago"),
-        view_count: Some(255458628),
+        view_count: 255458628,
         is_live: false,
         is_short: false,
       ),
@@ -343,7 +343,7 @@ VideoDetails(
         ),
         publish_date: "[date]",
         publish_date_txt: Some("2 years ago"),
-        view_count: Some(274719671),
+        view_count: 274719671,
         is_live: false,
         is_short: false,
       ),
@@ -378,7 +378,7 @@ VideoDetails(
         ),
         publish_date: "[date]",
         publish_date_txt: Some("1 year ago"),
-        view_count: Some(203129706),
+        view_count: 203129706,
         is_live: false,
         is_short: false,
       ),
@@ -413,7 +413,7 @@ VideoDetails(
         ),
         publish_date: "[date]",
         publish_date_txt: Some("2 months ago"),
-        view_count: Some(531757),
+        view_count: 531757,
         is_live: false,
         is_short: false,
       ),
@@ -448,7 +448,7 @@ VideoDetails(
         ),
         publish_date: "[date]",
         publish_date_txt: Some("9 years ago"),
-        view_count: Some(3656394146),
+        view_count: 3656394146,
         is_live: false,
         is_short: false,
       ),
@@ -483,7 +483,7 @@ VideoDetails(
         ),
         publish_date: "[date]",
         publish_date_txt: Some("6 years ago"),
-        view_count: Some(1479871637),
+        view_count: 1479871637,
         is_live: false,
         is_short: false,
       ),
@@ -518,7 +518,7 @@ VideoDetails(
         ),
         publish_date: "[date]",
         publish_date_txt: Some("1 year ago"),
-        view_count: Some(456763969),
+        view_count: 456763969,
         is_live: false,
         is_short: false,
       ),
@@ -553,7 +553,7 @@ VideoDetails(
         ),
         publish_date: "[date]",
         publish_date_txt: Some("2 years ago"),
-        view_count: Some(1149727787),
+        view_count: 1149727787,
         is_live: false,
         is_short: false,
       ),
@@ -588,7 +588,7 @@ VideoDetails(
         ),
         publish_date: "[date]",
         publish_date_txt: Some("1 year ago"),
-        view_count: Some(86080254),
+        view_count: 86080254,
         is_live: false,
         is_short: false,
       ),
@@ -623,7 +623,7 @@ VideoDetails(
         ),
         publish_date: "[date]",
         publish_date_txt: Some("6 months ago"),
-        view_count: Some(169858302),
+        view_count: 169858302,
         is_live: false,
         is_short: false,
       ),
@@ -658,7 +658,7 @@ VideoDetails(
         ),
         publish_date: "[date]",
         publish_date_txt: Some("11 months ago"),
-        view_count: Some(216164610),
+        view_count: 216164610,
         is_live: false,
         is_short: false,
       ),
@@ -693,7 +693,7 @@ VideoDetails(
         ),
         publish_date: "[date]",
         publish_date_txt: Some("2 years ago"),
-        view_count: Some(135093083),
+        view_count: 135093083,
         is_live: false,
         is_short: false,
       ),
diff --git a/src/client/video_details.rs b/src/client/video_details.rs
index 79b723d..49eb3dc 100644
--- a/src/client/video_details.rs
+++ b/src/client/video_details.rs
@@ -454,7 +454,8 @@ fn map_recommendations(
                             publish_date_txt: video.published_time_text,
                             view_count: video
                                 .view_count_text
-                                .map(|txt| util::parse_numeric(&txt).unwrap_or_default()),
+                                .and_then(|txt| util::parse_numeric(&txt).ok())
+                                .unwrap_or_default(),
                             is_live: video.badges.is_live(),
                             is_short: video.thumbnail_overlays.is_short(),
                         }),
diff --git a/src/model/mod.rs b/src/model/mod.rs
index 4d9a7be..79e426c 100644
--- a/src/model/mod.rs
+++ b/src/model/mod.rs
@@ -523,9 +523,7 @@ pub struct RecommendedVideo {
     /// Is [`None`] for livestreams.
     pub publish_date_txt: Option<String>,
     /// View count
-    ///
-    /// [`None`] if it could not be extracted.
-    pub view_count: Option<u64>,
+    pub view_count: u64,
     /// Is the video an active livestream?
     pub is_live: bool,
     /// Is the video a YouTube Short video (vertical and <60s)?
@@ -675,7 +673,7 @@ pub struct ChannelVideo {
     /// Number of views / current viewers in case of a livestream.
     ///
     /// [`None`] if it could not be extracted.
-    pub view_count: Option<u64>,
+    pub view_count: u64,
     /// Is the video an active livestream?
     pub is_live: bool,
     /// Is the video a YouTube Short video (vertical and <60s)?
@@ -788,7 +786,7 @@ pub struct SearchVideo {
     /// View count
     ///
     /// [`None`] if it could not be extracted.
-    pub view_count: Option<u64>,
+    pub view_count: u64,
     /// Is the video an active livestream?
     pub is_live: bool,
     /// Is the video a YouTube Short video (vertical and <60s)?