[Twitter] Send requests with mocked user agent

Author: SpriteOvO

src/helper.rs

@@ -1,4 +1,4 @@
-use std::{convert::identity, path::Path, time::Duration};
+use std::{path::Path, time::Duration};
 
 use anyhow::{anyhow, ensure};
 use humantime_serde::re::humantime;
@@ -8,20 +8,21 @@ use tokio::process::Command;
 use crate::prop;
 
 pub fn reqwest_client() -> anyhow::Result<reqwest::Client> {
-    reqwest_client_with(identity)
+    reqwest_client_with(|b, _| b)
 }
 
 pub fn reqwest_client_with(
-    configure: impl FnOnce(reqwest::ClientBuilder) -> reqwest::ClientBuilder,
+    configure: impl FnOnce(reqwest::ClientBuilder, &mut HeaderMap) -> reqwest::ClientBuilder,
 ) -> anyhow::Result<reqwest::Client> {
+    let mut headers = HeaderMap::from_iter([(
+        header::USER_AGENT,
+        HeaderValue::from_str(&prop::UserAgent::Logo.as_str()).unwrap(),
+    )]);
     configure(
-        reqwest::ClientBuilder::new()
-            .timeout(Duration::from_secs(60) * 3)
-            .default_headers(HeaderMap::from_iter([(
-                header::USER_AGENT,
-                HeaderValue::from_str(&prop::UserAgent::Logo.as_str()).unwrap(),
-            )])),
+        reqwest::ClientBuilder::new().timeout(Duration::from_secs(60) * 3),
+        &mut headers,
     )
+    .default_headers(headers)
     .build()
     .map_err(|err| anyhow!("failed to build reqwest client: {err}"))
 }

src/platform/bilibili/mod.rs

@@ -1,6 +1,6 @@
 pub mod source;
 
-use reqwest::header::{self, HeaderMap, HeaderValue};
+use reqwest::header::{self, HeaderValue};
 use serde::Deserialize;
 
 use crate::{
@@ -37,11 +37,12 @@ fn upgrade_to_https(url: &str) -> String {
 }
 
 fn bilibili_request_builder() -> anyhow::Result<reqwest::Client> {
-    helper::reqwest_client_with(|builder| {
-        builder.default_headers(HeaderMap::from_iter([(
+    helper::reqwest_client_with(|builder, headers| {
+        headers.insert(
             header::USER_AGENT,
             HeaderValue::from_str(&prop::UserAgent::LogoDynamic.as_str()).unwrap(),
-        )]))
+        );
+        builder
     })
 }
 

src/platform/twitter/request.rs

@@ -1,10 +1,13 @@
 use std::str::FromStr;
 
 use anyhow::{anyhow, ensure};
-use reqwest::{header::COOKIE, Url};
+use reqwest::{
+    header::{HeaderValue, COOKIE, USER_AGENT},
+    Url,
+};
 use serde_json::{self as json, json};
 
-use crate::helper;
+use crate::{helper, prop};
 
 pub struct TwitterCookies {
     pub raw: String,
@@ -145,7 +148,7 @@ impl TwitterRequester {
     }
 
     async fn request(&self, url: impl AsRef<str>) -> anyhow::Result<reqwest::Response> {
-        let resp = helper::reqwest_client()?
+        let resp = twitter_request_builder()?
             .get(url.as_ref())
             .bearer_auth(BEARER_TOKEN)
             .header(COOKIE, &self.cookies.raw)
@@ -164,4 +167,14 @@ impl TwitterRequester {
     }
 }
 
+fn twitter_request_builder() -> anyhow::Result<reqwest::Client> {
+    helper::reqwest_client_with(|builder, headers| {
+        headers.insert(
+            USER_AGENT,
+            HeaderValue::from_str(&prop::UserAgent::Mocked.as_str()).unwrap(),
+        );
+        builder
+    })
+}
+
 const BEARER_TOKEN: &str = "AAAAAAAAAAAAAAAAAAAAANRILgAAAAAAnNwIzUejRCOuH5E6I8xnZz4puTs%3D1Zv7ttfk8LF81IUq16cHjhLTvJu4FA33AGWWjCpTnA";