Adds .env to gitignore & clippy fixes

.devcontainer/devcontainer.json

@@ -32,4 +32,4 @@
 	// "customizations": {},
 	// Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
 	// "remoteUser": "root"
-}
+}

.dockerignore

@@ -1 +1,3 @@
 .venv
+.env
+**/env_vars.sh

.pre-commit-config.yaml

@@ -3,7 +3,6 @@ repos:
     rev: v4.3.0
     hooks:
       - id: check-added-large-files
-      - id: check-json
       - id: check-toml
       - id: check-yaml
       - id: check-shebang-scripts-are-executable
@@ -12,6 +11,11 @@ repos:
       - id: mixed-line-ending
       - id: trailing-whitespace
 
+  - repo: https://gitlab.com/bmares/check-json5
+    rev: v1.0.0
+    hooks:
+    - id: check-json5
+
   - repo: https://github.com/doublify/pre-commit-rust
     rev: master
     hooks:

src/chat.rs

@@ -4,9 +4,7 @@ use teloxide::prelude::*;
 pub async fn send_message(msg: &str) -> Message {
     log::info!("Sending message: '{}'", msg);
     let bot = Bot::from_env();
-    let res = bot
-        .send_message(JMARCELOMB_RECIPIENT.clone(), msg)
+    bot.send_message(JMARCELOMB_RECIPIENT.clone(), msg)
         .await
-        .unwrap();
-    res
+        .unwrap()
 }

src/main.rs

@@ -177,8 +177,8 @@ async fn milk_price_command(bot: Bot, msg: Message) -> HandlerResult {
         Some(price) => {
             bot.send_message(msg.chat.id, format!("Current milk price is '{}' €", price))
                 .await?;
-            return Ok(());
+            Ok(())
         }
-        None => return Ok(()),
+        None => Ok(()),
     }
 }

src/milk_price.rs

@@ -1,4 +1,3 @@
-use reqwest;
 use scraper::{Html, Selector};
 use thiserror::Error;
 use tokio::time::{sleep, Duration};
@@ -28,12 +27,12 @@ pub async fn get_price(url: &str) -> Result<Option<f32>, PriceError> {
     let selector =
         Selector::parse("span.ct-price-formatted").map_err(|_| PriceError::HtmlParseError)?;
 
-    for element in document.select(&selector) {
+    if let Some(element) = document.select(&selector).next() {
         let text = element.text().collect::<Vec<_>>().join("");
         let text = text.trim();
         let price_as_float = text
             .trim_start_matches('€')
-            .replace(",", ".")
+            .replace(',', ".")
             .parse::<f32>()?;
         return Ok(Some(price_as_float));
     }
@@ -63,17 +62,16 @@ pub async fn price_periodically_checker_thread(url: &str, interval: u64) {
         sleep(Duration::from_secs(interval)).await;
         log::info!("Checking milk price again..");
         let current_price_res = get_price(url).await;
-        let current_price: f32;
 
-        match current_price_res {
+        let current_price: f32 = match current_price_res {
             Ok(price_option) => {
                 if price_option.is_none() {
                     continue;
                 }
-                current_price = price_option.unwrap();
+                price_option.unwrap()
             }
             Err(_) => continue,
-        }
+        };
 
         if current_price != last_price {
             let value_increased = current_price > last_price;