Merge branch 'main' of https://github.com/SamTV12345/podgrabv2

# Conflicts:
#	src/controllers/websocket_controller.rs

src/controllers/websocket_controller.rs

@@ -81,6 +81,10 @@ pub async fn get_rss_feed(
         None => PodcastEpisodeService::find_all_downloaded_podcast_episodes()?,
     };
 
+    let downloaded_episodes: Vec<PodcastEpisodeDto> = downloaded_episodes.into_iter().map(|c|c
+        .into())
+        .collect();
+
     let server_url = ENVIRONMENT_SERVICE.get_server_url();
     let feed_url = add_api_key_to_url(format!("{}{}", &server_url, &"rss"), &api_key);
 
@@ -172,8 +176,9 @@ pub async fn get_rss_feed_for_podcast(
 
     let podcast = Podcast::get_podcast(*id)?;
 
-    let downloaded_episodes =
-        PodcastEpisodeService::find_all_downloaded_podcast_episodes_by_podcast_id(*id)?;
+    let downloaded_episodes: Vec<PodcastEpisodeDto> =
+        PodcastEpisodeService::find_all_downloaded_podcast_episodes_by_podcast_id(*id)?.into_iter
+        ().map(|c|c.into()).collect();
 
     let mut itunes_owner = get_itunes_owner("", "");
 
@@ -212,7 +217,7 @@ pub async fn get_rss_feed_for_podcast(
         .summary(podcast.summary.clone())
         .build();
 
-    let items = get_podcast_items_rss(downloaded_episodes.clone(), &api_key);
+    let items = get_podcast_items_rss(&downloaded_episodes, &api_key);
     let channel_builder = ChannelBuilder::default()
         .language(podcast.clone().language)
         .categories(categories)