refactor

x13a · Nov 22, 2024 · 44cf835 · 44cf835
1 parent 9308d73
commit 44cf835
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/src/bot.rs b/src/bot.rs
@@ -305,7 +305,8 @@ async fn start_repl(
     cfg: Arc<Config>,
 ) -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
     if value.is_empty() {
-        bot.send_message(msg.chat.id, &cfg.bot.welcome_msg).await?;
+        bot.send_message(msg.chat.id, html::escape(&cfg.bot.welcome_msg))
+            .await?;
         return Ok(());
     }
     let mut value = value.clone();

diff --git a/src/config.rs b/src/config.rs
@@ -28,7 +28,7 @@ pub struct Webhook {
 
 impl Config {
     pub fn load() -> anyhow::Result<Arc<Self>> {
-        let cfg = toml::from_str(fs::read_to_string(env::var(ENV_CONFIG)?)?.as_str())?;
+        let cfg = toml::from_str(&fs::read_to_string(env::var(ENV_CONFIG)?)?)?;
         Ok(Arc::new(cfg))
     }
 }
diff --git a/src/source/mod.rs b/src/source/mod.rs
@@ -78,7 +78,7 @@ where
         .get(
             config
                 .rates_url()
-                .replace("%d", (rate_type as u8).to_string().as_str()),
+                .replace("%d", &(rate_type as u8).to_string()),
         )
         .header(reqwest::header::USER_AGENT, USER_AGENT)
         .send()

diff --git a/src/source/unionpay.rs b/src/source/unionpay.rs
@@ -33,7 +33,7 @@ pub async fn collect(client: &reqwest::Client, config: &Config) -> anyhow::Resul
     let mut config = config.clone();
     config.rates_url = config
         .rates_url
-        .replace("%s", date.format("%Y%m%d").to_string().as_str());
+        .replace("%s", &date.format("%Y%m%d").to_string());
     let resp: Response = get_json(client, &config).await?;
     let from = Currency::usd();
     let to = Currency::rub();