Changed types

.gitea/workflows/workflow.yml

@@ -21,7 +21,7 @@ jobs:
           mkdir -p ~/.ssh
           echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/textsender-models_deploy_key
           chmod 600 ~/.ssh/textsender-models_deploy_key
-          ssh-keyscan ${{ secret.MYHOST }} >> ~/.ssh/known_hosts
+          ssh-keyscan ${{ secrets.MY_HOST }} >> ~/.ssh/known_hosts
 
           eval $(ssh-agent -s)
           ssh-add -v ~/.ssh/textsender-models_deploy_key
@@ -40,7 +40,7 @@ jobs:
           mkdir -p ~/.ssh
           echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/textsender-models_deploy_key
           chmod 600 ~/.ssh/textsender-models_deploy_key
-          ssh-keyscan ${{ secret.MYHOST }} >> ~/.ssh/known_hosts
+          ssh-keyscan ${{ secrets.MY_HOST }} >> ~/.ssh/known_hosts
 
           eval $(ssh-agent -s)
           ssh-add -v ~/.ssh/textsender-models_deploy_key
@@ -60,7 +60,7 @@ jobs:
           mkdir -p ~/.ssh
           echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/textsender-models_deploy_key
           chmod 600 ~/.ssh/textsender-models_deploy_key
-          ssh-keyscan ${{ secret.MYHOST }} >> ~/.ssh/known_hosts
+          ssh-keyscan ${{ secrets.MY_HOST }} >> ~/.ssh/known_hosts
 
           eval $(ssh-agent -s)
           ssh-add -v ~/.ssh/textsender-models_deploy_key
@@ -80,7 +80,7 @@ jobs:
           mkdir -p ~/.ssh
           echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/textsender-models_deploy_key
           chmod 600 ~/.ssh/textsender-models_deploy_key
-          ssh-keyscan ${{ secret.MYHOST }} >> ~/.ssh/known_hosts
+          ssh-keyscan ${{ secrets.MY_HOST }} >> ~/.ssh/known_hosts
 
           eval $(ssh-agent -s)
           ssh-add -v ~/.ssh/textsender-models_deploy_key
@@ -99,7 +99,7 @@ jobs:
           mkdir -p ~/.ssh
           echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/textsender-models_deploy_key
           chmod 600 ~/.ssh/textsender-models_deploy_key
-          ssh-keyscan ${{ secret.MYHOST }} >> ~/.ssh/known_hosts
+          ssh-keyscan ${{ secrets.MY_HOST }} >> ~/.ssh/known_hosts
 
           eval $(ssh-agent -s)
           ssh-add -v ~/.ssh/textsender-models_deploy_key

Cargo.lock

@@ -57,6 +57,12 @@ version = "0.22.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
 
+[[package]]
+name = "base64-ng"
+version = "1.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8452b0c98385f31f08318109d6e06a859f89e0c5e38aad6103f095443b063052"
+
 [[package]]
 name = "bitflags"
 version = "2.12.1"
@@ -1569,6 +1575,7 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
 name = "swoosh"
 version = "0.2.1"
 dependencies = [
+ "base64-ng",
  "const_format",
  "futures",
  "http",
@@ -1651,8 +1658,8 @@ dependencies = [
 
 [[package]]
 name = "textsender_models"
-version = "0.3.0"
+version = "0.2.5"
-source = "git+ssh://git@git.kundeng.us/phoenix/textsender-models.git?tag=v0.3.0-20-15820d5505-111#15820d550526aea3016821c01f508d8d590292cc"
+source = "git+ssh://git@git.kundeng.us/phoenix/textsender-models.git?tag=v0.2.5-v0.3.0-migrate-38dbcb09f7-111#38dbcb09f7c2c572f429ec382c01e14b72b1d615"
 dependencies = [
  "const_format",
  "dotenvy",

Cargo.toml

@@ -15,9 +15,10 @@ reqwest = { version = "0.13.3", features = ["form", "json", "blocking", "multipa
 rand = { version = "0.10.1" }
 time = { version = "0.3.47", features = ["formatting", "macros", "parsing", "serde"] }
 uuid = { version = "1.23.1", features = ["v4", "serde"] }
+base64-ng = { version = "1.0.6" }
 const_format = { version = "0.2.36" }
 josekit = { version = "0.10.3" }
-textsender_models = { git = "ssh://git@git.kundeng.us/phoenix/textsender-models.git", tag = "v0.3.0-20-15820d5505-111" }
+textsender_models = { git = "ssh://git@git.kundeng.us/phoenix/textsender-models.git", tag = "v0.2.5-v0.3.0-migrate-38dbcb09f7-111" }
 
 [dev-dependencies]
 tempfile = { version = "3.27.0" }

src/twilio/api/mod.rs

@@ -8,7 +8,7 @@ pub async fn send_mssage(
     param: crate::twilio::types::Parameters,
     config: &textsender_models::config::auxiliary::TwilioConfig,
 ) -> Result<crate::twilio::api::types::TwilioAPIMessage, std::io::Error> {
-    if config.account_sid.is_nil() {
+    if config.account_sid.is_empty() {
         Err(std::io::Error::other("Account SID is empty"))
     } else if config.auth_token.is_empty() {
         Err(std::io::Error::other(" Auth token is empty"))
@@ -22,8 +22,9 @@ pub async fn send_mssage(
                     "application/x-www-form-urlencoded".parse().unwrap(),
                 );
                 headers.insert("Accept", "application/json".parse().unwrap());
-                let auth = generate_auth(&config);
+                let auth = generate_auth(config).unwrap();
                 // headers.insert("Authorization", "Basic QUNlZmExZWY1MTYzMTRjOWQxYTY4Y2JkNjU3ZGU0OTI3NzpmNGExZjJiMGI3OWVhMzczNTA3OGMyZDhlZTk2ODRlMQ==".parse()?);
+                headers.insert("Authorization", auth.parse().unwrap());
 
                 let mut params = std::collections::HashMap::new();
                 params.insert("To", contact.phone_number.as_str());
@@ -44,9 +45,7 @@ pub async fn send_mssage(
                         let converted = date_value.to_string();
                         converted
                     }
-                    None => {
+                    None => String::new(),
-                       String::new()
-                    }
                 };
                 if param.schedule && is_scheduleable(&Some(now), &param.schedule_at) {
                     params.insert("ScheduleType", "fixed");
@@ -59,7 +58,8 @@ pub async fn send_mssage(
                 params.insert("Body", msg.content.as_str());
 
                 let url = format!(
-                    "https://api.twilio.com/2010-04-01/Accounts/ACefa1ef516314c9d1a68cbd657de49277/Messages.json"
+                    "https://api.twilio.com/2010-04-01/Accounts/{}/Messages.json",
+                    config.account_sid
                 );
 
                 // let client = reqwest::Client::new();
@@ -72,6 +72,14 @@ pub async fn send_mssage(
 
                 match request.send().await {
                     Ok(response) => {
+                        match response
+                            .json::<crate::twilio::api::types::TwilioAPIMessage>()
+                            .await
+                        {
+                            Ok(resp) => Ok(resp),
+                            Err(err) => Err(std::io::Error::other(err)),
+                        }
+                        /*
                         match response.text().await {
                             Ok(body) => {
                                 let mut obj = crate::twilio::api::types::TwilioAPIMessage {
@@ -84,6 +92,7 @@ pub async fn send_mssage(
                                 Err(std::io::Error::other(err))
                             }
                         }
+                        */
                     }
                     Err(err) => Err(std::io::Error::other(err.to_string())),
                 }
@@ -93,6 +102,15 @@ pub async fn send_mssage(
     }
 }
 
+fn generate_auth(
+    config: &textsender_models::config::auxiliary::TwilioConfig,
+) -> Result<String, base64_ng::EncodeError> {
+    let input = format!("{}:{}", config.account_sid, config.auth_token);
+    match base64_ng::encode(input.as_bytes()) {
+        Ok(encoded) => Ok(format!("Basic {encoded}")),
+        Err(err) => Err(err),
+    }
+}
 /*
 #[tokio::main]
 async fn main() -> Result<(), Box<dyn std::error::Error>> {
@@ -191,5 +209,14 @@ fn is_scheduleable(
     now: &Option<time::OffsetDateTime>,
     scheduled: &Option<time::OffsetDateTime>,
 ) -> bool {
-    true
+    match scheduled {
+        Some(schedule_at) => {
+            let early = now
+                .unwrap()
+                .checked_add(time::Duration::seconds(300))
+                .unwrap();
+            if *schedule_at > early { true } else { false }
+        }
+        None => false,
+    }
 }

src/twilio/api/types/mod.rs

@@ -3,20 +3,28 @@ pub struct TwilioAPIMessage {
     pub account_sid: String,
     pub api_version: String,
     pub body: String,
-    // pub date_created: time::OffsetDateTime,
+    #[serde(with = "time::serde::rfc3339::option")]
+    pub date_created: Option<time::OffsetDateTime>,
+    #[serde(with = "time::serde::rfc3339::option")]
     pub date_sent: Option<time::OffsetDateTime>,
+    #[serde(with = "time::serde::rfc3339::option")]
     pub date_updated: Option<time::OffsetDateTime>,
     pub direction: String,
     // Not definite of what type this is
-    pub error_code: Option<String>,
+    #[serde(skip_serializing_if = "String::is_empty")]
+    pub error_code: String,
     // Not definite of what type this is
-    pub error_message: Option<String>,
+    #[serde(skip_serializing_if = "String::is_empty")]
+    pub error_message: String,
     pub from: String,
     pub messaging_service_sid: String,
     pub num_media: String,
     pub num_segments: String,
-    pub price: Option<String>,
+    #[serde(skip_serializing_if = "String::is_empty")]
-    pub price_unit: Option<String>,
+    pub price: String,
+    #[serde(skip_serializing_if = "String::is_empty")]
+    pub price_unit: String,
+    #[serde(skip_serializing_if = "String::is_empty")]
     pub sid: String,
     pub status: String,
     pub subresource_uris: SubresourceURI,