readme, changing some if else to match

Author: Kevin Souza

README.md

@@ -27,8 +27,8 @@ A Twitch and YouTube frontend written in Rust using Tauri and SvelteKit.
 
 ## Features
 
-- Import YouTube subscriptions.
-- Add users to your stream and video feeds.
+- Import YouTube subscriptions. (Accepts a `csv` file separated by Channel ID, URL, Title)
+- Add users to your stream and videos feeds.
 - Watch content in any of the available resolutions.
 - View Twitch chat with 7tv and BetterTTV emotes.
 - Block ads.
@@ -38,7 +38,7 @@ A Twitch and YouTube frontend written in Rust using Tauri and SvelteKit.
 
 > All installers (`exe`, `deb`, `rpm`) are provided in a small zip file.
 
-[Quick download.](https://nightly.link/Kyagara/rt/workflows/build.yaml/main/bundles.zip)
+[Quick download.](https://nightly.link/Kyagara/rt/workflows/build.yaml/main/bundles.zip) (does not require GitHub account).
 
 Github Actions builds are available [here](https://github.com/Kyagara/rt/actions).
 
@@ -65,7 +65,7 @@ If the app is not running, it will be started with the URL as an argument, if it
 - `rt://twitch/zfg1`
 - `rt://www.twitch.tv/zfg1`
 
-If using extensions like [LibRedirect](https://github.com/libredirect/browser_extension), you can set a frontend for YouTube like Invidious and set the instance URL to `rt://yt`. The same can be done for Twitch, you can set the frontend to SafeTwitch and set the instance URL to `rt://tw`.
+If you are using extensions like [LibRedirect](https://github.com/libredirect/browser_extension), you can set a frontend for YouTube like Invidious and set the instance URL to `rt://`. The same can be done for Twitch, you can set the frontend to SafeTwitch and set the instance URL to `rt://`.
 
 ### Paths
 
@@ -85,21 +85,23 @@ Logs:
 
 `YouTube`:  
 
+The feed uses YouTube's rss feed to retrieve videos to avoid rate limits, this sadly does not contain video duration.
+
 Using the excellent [RustyPipe](https://crates.io/crates/rustypipe) library to interact with YouTube, its recommended to install [rustypipe-botguard](https://crates.io/crates/rustypipe-botguard) to use a YouTube player instead of the embedded one.
 
 ```bash
 cargo install rustypipe-botguard
 ```
 
-The feed uses YouTube's rss feed to retrieve videos to avoid rate limits, this sadly does not contain video duration.
+The watch page will try to use RustyPipe to retrieve a YouTube player, if it fails, it will use Vidstack's YouTube [provider](https://vidstack.io/docs/player/api/providers/youtube/) to play videos via embeds, this fallback has the drawbacks of not being able to play videos that disallows embedding and not being able to select a video quality. You have the option to switch between them in the Watch page.
 
-The watch page will try to use RustyPipe to retrieve a YouTube player, if it fails, it will use Vidstack's YouTube [provider](https://vidstack.io/docs/player/api/providers/youtube/) to play videos via embeds, this fallback has the drawbacks of not being able to play videos that disallows embedding and not being able to select a video quality. You can also switch between them.
+The player currently doesn't show the quality selection correctly, as there are multiple codecs for the same quality, which will show duplicates.
 
 `Twitch`:
 
-The player uses a custom [hls.js](https://github.com/video-dev/hls.js/) loader that communicates with the backend to modify the streams m3u8 manifests, this is what allows for ad blocking as the backend can detect ads and switch to a backup stream until ads are over, this was inspired on [TwitchAdSolutions](https://github.com/pixeltris/TwitchAdSolutions) method of switching streams.
+The player uses a custom [hls.js](https://github.com/video-dev/hls.js/) loader that communicates with the backend to retrieve and modify the m3u8 manifests, this is what allows for ad blocking as the backend can detect ads and switch to a backup stream until ads are over, this was inspired by [TwitchAdSolutions](https://github.com/pixeltris/TwitchAdSolutions) method of switching streams.
 
-The backend uses queries from the Twitch API to retrieve user data and stream playback.
+The backend uses GQL queries from the internal Twitch API to retrieve user data and stream playback.
 
 ## TODO
 

src-tauri/src/twitch/chat.rs

@@ -154,28 +154,24 @@ pub async fn join_chat(
                 continue;
             }
 
-            let color = if let Some(color) = caps.name("color") {
-                color.as_str().to_string()
-            } else {
-                String::new()
+            let color = match caps.name("color") {
+                Some(color) => color.as_str().to_string(),
+                _ => String::new(),
             };
 
-            let display_name = if let Some(display_name) = caps.name("display_name") {
-                display_name.as_str().to_string()
-            } else {
-                continue;
+            let display_name = match caps.name("display_name") {
+                Some(display_name) => display_name.as_str().to_string(),
+                _ => continue,
             };
 
-            let first_msg = if let Some(first_msg) = caps.name("first_msg") {
-                first_msg.as_str() != "0"
-            } else {
-                false
+            let first_msg = match caps.name("first_msg") {
+                Some(first_msg) => first_msg.as_str() != "0",
+                _ => false,
             };
 
-            let content = if let Some(content) = caps.name("message") {
-                content.as_str().trim_end()
-            } else {
-                continue;
+            let content = match caps.name("message") {
+                Some(content) => content.as_str().trim_end(),
+                _ => continue,
             };
 
             let fragments = parse_chat_fragments(content, &user_emotes);

src-tauri/src/twitch/proxy.rs

@@ -53,11 +53,13 @@ pub async fn proxy_stream(
 
     let mut stream_state = {
         let lock = STREAM_STATE.lock().await;
+
         let state = lock.get(&window_label).unwrap_or(&StreamState {
             using_backup: false,
             main_stream_url: None,
             backup_stream_url: None,
         });
+
         state.clone()
     };
 
@@ -169,7 +171,9 @@ async fn fetch_playlist_text(url: &str) -> Result<String> {
 async fn fetch_main_stream(username: &str, stream_state: &mut StreamState) -> Result<String> {
     let Some(main_url) = stream_state.main_stream_url.clone() else {
         error!("Main stream URL not found. Falling back to backup stream.");
+
         let backup_url = fetch_backup_stream_url(username).await?;
+
         return fetch_playlist_text(&backup_url).await;
     };
 
@@ -186,12 +190,9 @@ async fn fetch_main_stream(username: &str, stream_state: &mut StreamState) -> Re
 }
 
 async fn fetch_backup_stream_url(username: &str) -> Result<String> {
-    let url = match stream::fetch_stream_playback(username, true).await {
-        Ok(url) => url,
-        Err(err) => {
-            return Err(anyhow!("Fetching backup stream: {err}"));
-        }
-    };
+    let url = stream::fetch_stream_playback(username, true)
+        .await
+        .map_err(|err| anyhow!("Fetching backup stream: {err}"))?;
 
     let body = fetch_playlist_text(&url).await?;
 

src-tauri/src/youtube/video.rs

@@ -165,7 +165,9 @@ pub async fn fetch_video(video_id: &str) -> Result<WatchPageVideo, String> {
     let channel = get_channel(&details.channel);
     let chapters = get_chapters(&details.chapters);
 
-    let (video, audio, subtitles) = if !using_embed {
+    let (video, audio, subtitles) = if using_embed {
+        (Vec::new(), Vec::new(), Vec::new())
+    } else {
         let player = results
             .1
             .unwrap()
@@ -176,12 +178,10 @@ pub async fn fetch_video(video_id: &str) -> Result<WatchPageVideo, String> {
         let (video, audio) = get_player_formats(&player.video_only_streams, &player.audio_streams);
 
         (video, audio, subtitles)
-    } else {
-        (Vec::new(), Vec::new(), Vec::new())
     };
 
     let watch_page_video = WatchPageVideo {
-        id: details.id.clone(),
+        id: details.id,
         metadata,
         channel,
         chapters,