Code cleanup

src/twilio/api/mod.rs

@@ -1,5 +1,3 @@
-// use josekit::jwk::alg::ec::EcCurve::P256;
-
 pub mod types;
 
 pub async fn send_mssage(
@@ -7,7 +5,7 @@ pub async fn send_mssage(
     contact: &textsender_models::contact::Contact,
     param: crate::twilio::types::Parameters,
     config: &textsender_models::config::auxiliary::TwilioConfig,
-) -> Result<crate::twilio::api::types::TwilioAPIMessage, std::io::Error> {
+) -> Result<reqwest::Response, std::io::Error> {
     if config.account_sid.is_empty() {
         Err(std::io::Error::other("Account SID is empty"))
     } else if config.auth_token.is_empty() {
@@ -23,7 +21,6 @@ pub async fn send_mssage(
                 );
                 headers.insert("Accept", "application/json".parse().unwrap());
                 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();
@@ -41,10 +38,7 @@ pub async fn send_mssage(
                 // params.insert("PersistentAction", "string");
                 params.insert("ShortenUrls", "true");
                 let date = match param.schedule_at {
-                    Some(date_value) => {
-                        let converted = date_value.to_string();
-                        converted
-                    }
+                    Some(date_value) => date_value.to_string(),
                     None => String::new(),
                 };
                 if param.schedule && is_scheduleable(&Some(now), &param.schedule_at) {
@@ -62,38 +56,14 @@ pub async fn send_mssage(
                     config.account_sid
                 );
 
-                // let client = reqwest::Client::new();
-                /*
-                let request = client.request(reqwest::Method::POST, url)
-                    .headers(headers)
-                    .form(&params);
-                        */
                 let request = client.post(url).headers(headers).form(&params);
-
                 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 {
-                                    ..Default::default()
-                                };
-
-                                Ok(obj)
-                            }
-                            Err(err) => {
-                                Err(std::io::Error::other(err))
-                            }
-                        }
-                        */
-                    }
+                    Ok(response) => match response.status() {
+                        reqwest::StatusCode::OK => Ok(response),
+                        status => Err(std::io::Error::other(format!(
+                            "Unaccounted status: {status:?}"
+                        ))),
+                    },
                     Err(err) => Err(std::io::Error::other(err.to_string())),
                 }
             }
@@ -112,16 +82,6 @@ fn generate_auth(
     }
 }
 /*
-#[tokio::main]
-async fn main() -> Result<(), Box<dyn std::error::Error>> {
-    let client = reqwest::Client::builder()
-        .build()?;
-
-    let mut headers = reqwest::header::HeaderMap::new();
-    headers.insert("Content-Type", "application/x-www-form-urlencoded".parse()?);
-    headers.insert("Accept", "application/json".parse()?);
-    headers.insert("Authorization", "Basic QUNlZmExZWY1MTYzMTRjOWQxYTY4Y2JkNjU3ZGU0OTI3NzpmNGExZjJiMGI3OWVhMzczNTA3OGMyZDhlZTk2ODRlMQ==".parse()?);
-
     let mut params = std::collections::HashMap::new();
     params.insert("To", "16303831708");
     params.insert("StatusCallback", "http://OjQozHznkhNTTR.vpnrM1zdXFuiQ");
@@ -157,54 +117,6 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
 }
 */
 
-/**
- func (m *MessageSender) Send(msg message.Message, number contact.Contact, sendTime *time.Time) (*types.TwilioResult, map[string]any, error) {
-    if m.Config == nil {
-        return nil, nil, fmt.Errorf("Config has not been initialized")
-    }
-    now := time.Now()
-    client := twilio.NewRestClientWithParams(twilio.ClientParams{
-        Username: m.Config.AccountSID,
-        Password: m.Config.AuthToken,
-    })
-
-    params := &twilioApi.CreateMessageParams{}
-    params.SetTo(number.PhoneNumber)
-    params.SetFrom(m.Config.Number)
-    params.SetMessagingServiceSid(m.Config.ServiceSID)
-    params.SetBody(msg.Content)
-    if sendTime != nil && isSchedulable(&now, sendTime) {
-        params.SetSendAt(*sendTime)
-        params.SetScheduleType(Schedule_Type)
-    }
-
-    if resp, err := client.Api.CreateMessage(params); err != nil {
-        return nil, nil, fmt.Errorf("Error sending message: %v", err)
-    } else {
-        if twilioRespMarshaled, err := json.Marshal(*resp); err != nil {
-            return nil, nil, fmt.Errorf("Error parsing result: %v", err)
-        } else {
-            var rawObject map[string]any
-            if err := json.Unmarshal(twilioRespMarshaled, &rawObject); err != nil {
-                return resp, nil, err
-            } else {
-                return resp, rawObject, nil
-            }
-        }
-    }
-}
-
-func isSchedulable(now *time.Time, scheduled *time.Time) bool {
-    early := now.Add(Schedulable_Limit_In_Seconds * time.Second)
-
-    if scheduled.After(early) {
-        return true
-    } else {
-        return false
-    }
-}
-*/
-
 fn is_scheduleable(
     now: &Option<time::OffsetDateTime>,
     scheduled: &Option<time::OffsetDateTime>,
@@ -215,7 +127,7 @@ fn is_scheduleable(
                 .unwrap()
                 .checked_add(time::Duration::seconds(300))
                 .unwrap();
-            if *schedule_at > early { true } else { false }
+            *schedule_at > early
         }
         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>,
-    pub price_unit: Option<String>,
+    #[serde(skip_serializing_if = "String::is_empty")]
+    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,
@@ -28,30 +36,3 @@ pub struct TwilioAPIMessage {
 pub struct SubresourceURI {
     pub media: String,
 }
-
-/*
-{
-    "account_sid": "ACefa1ef516314c9d1a68cbd657de49277",
-    "api_version": "2010-04-01",
-    "body": "This is a test",
-    "date_created": "Wed, 03 Jun 2026 19:40:55 +0000",
-    "date_sent": null,
-    "date_updated": "Wed, 03 Jun 2026 19:40:55 +0000",
-    "direction": "outbound-api",
-    "error_code": null,
-    "error_message": null,
-    "from": "+12243026041",
-    "messaging_service_sid": "MG803f3676706b92eb02e18dd820c447f2",
-    "num_media": "0",
-    "num_segments": "0",
-    "price": null,
-    "price_unit": null,
-    "sid": "SMf5c09c776c931bdb00c6e274da2ce34d",
-    "status": "scheduled",
-    "subresource_uris": {
-        "media": "/2010-04-01/Accounts/ACefa1ef516314c9d1a68cbd657de49277/Messages/SMf5c09c776c931bdb00c6e274da2ce34d/Media.json"
-    },
-    "to": "+16303831708",
-    "uri": "/2010-04-01/Accounts/ACefa1ef516314c9d1a68cbd657de49277/Messages/SMf5c09c776c931bdb00c6e274da2ce34d.json"
-}
-*/

src/twilio/types/mod.rs

@@ -1,8 +1,4 @@
-// Things needed to send a message
-// Contact - Receipient to send to (textsender-models)
-// Message - The content to sent (textsender-models)
-// Parameters - Controls flow of sending message
-// Config - Contains info needed to send message (textsender-models)
+/// Parameters - Controls flow of sending message
 pub struct Parameters {
     pub schedule: bool,
     pub schedule_at: Option<time::OffsetDateTime>,