Revert "remove content_type from endpoint config"

This reverts commit e82888a.

src/client.rs

@@ -173,8 +173,7 @@ mod tests {
 
   #[tokio::test]
   async fn test_client_cache() {
-    let client =
-      Client::new(1, Duration::from_secs(1), reqwest::Client::new(), None);
+    let client = Client::new(1, Duration::from_secs(1), reqwest::Client::new());
     let url = Url::parse("http://example.com").unwrap();
     let body: Box<str> = "foo".into();
     let response = Response::new(
@@ -198,8 +197,7 @@ mod tests {
 
   #[tokio::test]
   async fn test_client() {
-    let client =
-      Client::new(0, Duration::from_secs(1), reqwest::Client::new(), None);
+    let client = Client::new(0, Duration::from_secs(1), reqwest::Client::new());
     let url = Url::parse(YT_SCISHOW_FEED_URL).unwrap();
     let resp = client.get(&url).await.unwrap();
     assert_eq!(resp.status(), reqwest::StatusCode::OK);

src/server/endpoint.rs

@@ -49,6 +49,7 @@ impl EndpointConfig {
 #[derive(Serialize, Deserialize, Clone, Debug)]
 pub struct EndpointServiceConfig {
   source: Option<String>,
+  content_type: Option<String>,
   filters: Vec<FilterConfig>,
   #[serde(default)]
   client: Option<ClientConfig>,
@@ -57,6 +58,7 @@ pub struct EndpointServiceConfig {
 #[derive(Clone)]
 pub struct EndpointService {
   source: Option<Url>,
+  content_type: Option<String>,
   filters: Arc<Vec<BoxedFilter>>,
   client: Arc<Client>,
 }
@@ -234,6 +236,7 @@ impl EndpointService {
 
     Ok(Self {
       source,
+      content_type: config.content_type,
       filters: Arc::new(filters),
       client: Arc::new(client),
     })
@@ -277,28 +280,25 @@ impl EndpointService {
     }
   }
 
-  const ACCEPTED_CONTENT_TYPES: [&'static str; 6] = [
-    "application/xml",
-    "text/xml",
-    "application/rss+xml",
-    "application/atom+xml",
-    "text/html",
-    "*/*",
-  ];
-
   async fn fetch_feed(&self, source: &Url) -> Result<Feed> {
     let resp = self
       .client
       .get_with(source, |builder| {
-        builder.header("Accept", Self::ACCEPTED_CONTENT_TYPES.join(", "))
+        builder.header("Accept", "text/html,application/xml,text/xml,application/rss+xml,application/atom+xml")
       })
       .await?
       .error_for_status()?;
 
-    let content_type = resp.content_type().map(|x| x.essence_str().to_owned());
+    let resp_content_type =
+      resp.content_type().map(|x| x.essence_str().to_owned());
+    let content_type = self
+      .content_type
+      .as_deref()
+      .or(resp_content_type.as_deref());
+
     let content = resp.text()?;
 
-    let feed = match content_type.as_deref() {
+    let feed = match content_type {
       Some("text/html") => Feed::from_html_content(&content, source)?,
       Some("application/rss+xml") => Feed::from_rss_content(&content)?,
       Some("application/atom+xml") => Feed::from_atom_content(&content)?,