renames and refactoring fetch_player

Author: Kevin Souza

src-tauri/src/feed.rs

@@ -7,14 +7,14 @@ use tauri::{async_runtime::Mutex, AppHandle, Emitter, State};
 use crate::{
     twitch::{self, stream::LiveNow},
     user::Platform,
-    youtube::{self, video::YouTubeVideo},
+    youtube::{self, video::FeedPageVideo},
     AppState,
 };
 
 #[derive(Serialize)]
 pub struct Feed {
     twitch: Option<Vec<LiveNow>>,
-    youtube: Option<Vec<YouTubeVideo>>,
+    youtube: Option<Vec<FeedPageVideo>>,
 }
 
 #[tauri::command]
@@ -60,7 +60,7 @@ pub async fn get_feed(
             "SELECT id, username, title, published_at, view_count FROM youtube ORDER BY published_at DESC LIMIT 50"
         };
 
-        let mut query_builder = sqlx::query_as::<_, YouTubeVideo>(query);
+        let mut query_builder = sqlx::query_as::<_, FeedPageVideo>(query);
 
         if let Some(last) = last_published_at {
             query_builder = query_builder.bind(last);
@@ -154,7 +154,7 @@ pub async fn refresh_feed(
             channel_ids.push(channel_id);
         }
 
-        let videos = match youtube::video::fetch_videos(channel_ids).await {
+        let videos = match youtube::video::fetch_feed_videos(channel_ids).await {
             Ok(videos) => videos,
             Err(err) => {
                 return Err(format!("Requesting videos: {err}"));

src-tauri/src/lib.rs

@@ -134,7 +134,7 @@ pub fn run() {
             twitch::proxy::proxy_stream,
             twitch::chat::join_chat,
             youtube::main::import_subscriptions,
-            youtube::video::fetch_player,
+            youtube::video::fetch_video,
         ])
         .run(tauri::generate_context!())
         .expect("while running tauri application");

src-tauri/src/twitch/stream.rs

@@ -15,6 +15,7 @@ const USHER_API: &str = "https://usher.ttvnw.net/api/channel/hls";
 #[derive(Serialize, Debug)]
 pub struct LiveNow {
     pub username: String,
+    #[serde(rename = "startedAt")]
     pub started_at: String,
 }
 

src-tauri/src/youtube/main.rs

@@ -24,6 +24,7 @@ lazy_static! {
             .build()
             .unwrap()
     );
+    pub static ref USING_BOTGUARD: Mutex<bool> = Mutex::new(false);
 }
 
 pub async fn build_client(storage_dir: &Path) -> Result<()> {
@@ -41,6 +42,9 @@ pub async fn build_client(storage_dir: &Path) -> Result<()> {
         .storage_dir(storage_dir)
         .build_with_client(http_client)?;
 
+    let version = client.version_botguard().await;
+    *USING_BOTGUARD.lock().await = version.is_some();
+
     Ok(())
 }