Update rust (#8)

Reviewed-on: #8

Cargo.toml

@@ -1,15 +1,13 @@
 [package]
 name = "sender"
-version = "0.1.3"
+version = "0.1.4"
 edition = "2024"
-rust-version = "1.96"
+rust-version = "1.96.1"
 
 [dependencies]
 serde_json = { version = "1.0.150" }
 tokio = { version = "1.52.3", features = ["full"] }
-futures = { version = "0.3.32" }
+textsender_models = { git = "ssh://git@git.kundeng.us/phoenix/textsender_models.git", tag = "v0.5.1", features = ["config", "contact", "envy", "message"] }
-textsender_models = { git = "ssh://git@git.kundeng.us/phoenix/textsender_models.git", tag = "v0.4.0", features = ["config", "contact", "envy", "message"] }
+swoosh = { git = "ssh://git@git.kundeng.us/phoenix/swoosh.git", tag = "v0.5.2" }
-swoosh = { git = "ssh://git@git.kundeng.us/phoenix/swoosh.git", tag = "v0.4.0" }
 
 [dev-dependencies]
-async-std = { version = "1.13.2" }

src/config/mod.rs

@@ -20,14 +20,14 @@ fn path_exists(path: &str) -> bool {
     file.exists()
 }
 
-pub async fn parse_config() -> (textsender_models::config::auxiliary::TwilioConfig, bool) {
+pub fn parse_config() -> (textsender_models::config::auxiliary::TwilioConfig, bool) {
     let mut config = textsender_models::config::auxiliary::TwilioConfig {
         ..Default::default()
     };
-    let auth_sid_var = textsender_models::envy::environment::get_env("AUTH_SID").await;
+    let auth_sid_var = textsender_models::envy::environment::get_env("AUTH_SID");
-    let auth_token_var = textsender_models::envy::environment::get_env("AUTH_TOKEN").await;
+    let auth_token_var = textsender_models::envy::environment::get_env("AUTH_TOKEN");
-    let phone_number_var = textsender_models::envy::environment::get_env("PHONE_NUMBER").await;
+    let phone_number_var = textsender_models::envy::environment::get_env("PHONE_NUMBER");
-    let service_sid_var = textsender_models::envy::environment::get_env("SERVICE_SID").await;
+    let service_sid_var = textsender_models::envy::environment::get_env("SERVICE_SID");
     config.account_sid = auth_sid_var.value;
     config.auth_token = auth_token_var.value;
     config.phone_number = phone_number_var.value;
@@ -46,7 +46,7 @@ pub async fn parse_config() -> (textsender_models::config::auxiliary::TwilioConf
 mod tests {
     #[test]
     fn test_parse_config() {
-        let (config, success) = async_std::task::block_on(super::parse_config());
+        let (config, success) = super::parse_config();
         assert!(success, "Config was not parsed");
         assert_eq!(
             false,

src/main.rs

@@ -17,7 +17,7 @@ async fn main() {
             println!("Message path: {m_path:?}");
             println!("Phone Number path: {n_path:?}");
 
-            let (config, success) = config::parse_config().await;
+            let (config, success) = config::parse_config();
             if !success {
                 eprintln!("Error parsing config");
             } else {

src/messaging/mod.rs

@@ -16,7 +16,16 @@ pub async fn send_messages(
             schedule: false,
             schedule_at: None,
         };
-        match swoosh::twilio::api::send_mssage(message, contact, param, config).await {
+        let mut sendmsg = swoosh::SendMsg::default();
+        sendmsg.load_config(
+            &config.auth_token,
+            &config.phone_number,
+            &config.service_sid,
+            &config.account_sid,
+        );
+        sendmsg.load_recipient(&contact.phone_number);
+        sendmsg.load_message(&message.content);
+        match sendmsg.send_message(&param).await {
             Ok(response) => {
                 println!("Raw response: {response:?}");
                 let val = swoosh::twilio::api::response_to_json(response).await;