From 5752741972f7d3ce1dea7cba1129509f541d7f6d Mon Sep 17 00:00:00 2001 From: phoenix Date: Wed, 3 Jun 2026 16:52:46 -0400 Subject: [PATCH] cargo fmt --- src/twilio/api/mod.rs | 185 +++++++++++++++++++----------------- src/twilio/api/types/mod.rs | 5 +- src/twilio/types/mod.rs | 1 - 3 files changed, 98 insertions(+), 93 deletions(-) diff --git a/src/twilio/api/mod.rs b/src/twilio/api/mod.rs index 1cfde89..0f07fb7 100644 --- a/src/twilio/api/mod.rs +++ b/src/twilio/api/mod.rs @@ -2,72 +2,79 @@ pub mod types; -pub fn send_mssage(msg: &textsender_models::message::Message, contact: &textsender_models::contact::Contact, param: crate::twilio::types::Parameters, config: &textsender_models::config::auxiliary::TwilioConfig) -> Result { +pub fn send_mssage( + msg: &textsender_models::message::Message, + contact: &textsender_models::contact::Contact, + param: crate::twilio::types::Parameters, + config: &textsender_models::config::auxiliary::TwilioConfig, +) -> Result { if config.account_sid.is_nil() { 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")) } else { let now = time::OffsetDateTime::now_utc(); - match reqwest::Client::builder() .build() { + match reqwest::Client::builder().build() { Ok(client) => { - let mut headers = reqwest::header::HeaderMap::new(); - headers.insert("Content-Type", "application/x-www-form-urlencoded".parse().unwrap()); - headers.insert("Accept", "application/json".parse().unwrap()); - // headers.insert("Authorization", "Basic QUNlZmExZWY1MTYzMTRjOWQxYTY4Y2JkNjU3ZGU0OTI3NzpmNGExZjJiMGI3OWVhMzczNTA3OGMyZDhlZTk2ODRlMQ==".parse()?); + let mut headers = reqwest::header::HeaderMap::new(); + headers.insert( + "Content-Type", + "application/x-www-form-urlencoded".parse().unwrap(), + ); + headers.insert("Accept", "application/json".parse().unwrap()); + // headers.insert("Authorization", "Basic QUNlZmExZWY1MTYzMTRjOWQxYTY4Y2JkNjU3ZGU0OTI3NzpmNGExZjJiMGI3OWVhMzczNTA3OGMyZDhlZTk2ODRlMQ==".parse()?); - let mut params = std::collections::HashMap::new(); - params.insert("To", contact.phone_number.as_str()); - // params.insert("StatusCallback", "http://OjQozHznkhNTTR.vpnrM1zdXFuiQ"); - // params.insert("MaxPrice", "1"); - params.insert("ProvideFeedback", "true"); - // params.insert("Attempt", "5"); - // params.insert("ValidityPeriod", "1537"); - params.insert("ForceDelivery", "false"); - params.insert("ContentRetention", "retain"); - params.insert("AddressRetention", "obfuscate"); - params.insert("SmartEncoded", "true"); - // params.insert("PersistentAction", "string"); - // params.insert("PersistentAction", "string"); - params.insert("ShortenUrls", "true"); - // params.insert("ScheduleType", "fixed"); - // params.insert("SendAt", "2026-06-03T19:50:00.0Z"); - params.insert("SendAsMms", "true"); - params.insert("RiskCheck", "enable"); - params.insert("From", config.phone_number.as_str()); - params.insert("MessagingServiceSid", config.service_sid.as_str()); - params.insert("Body", msg.content.as_str()); + let mut params = std::collections::HashMap::new(); + params.insert("To", contact.phone_number.as_str()); + // params.insert("StatusCallback", "http://OjQozHznkhNTTR.vpnrM1zdXFuiQ"); + // params.insert("MaxPrice", "1"); + params.insert("ProvideFeedback", "true"); + // params.insert("Attempt", "5"); + // params.insert("ValidityPeriod", "1537"); + params.insert("ForceDelivery", "false"); + params.insert("ContentRetention", "retain"); + params.insert("AddressRetention", "obfuscate"); + params.insert("SmartEncoded", "true"); + // params.insert("PersistentAction", "string"); + // params.insert("PersistentAction", "string"); + params.insert("ShortenUrls", "true"); + // params.insert("ScheduleType", "fixed"); + // params.insert("SendAt", "2026-06-03T19:50:00.0Z"); + params.insert("SendAsMms", "true"); + params.insert("RiskCheck", "enable"); + params.insert("From", config.phone_number.as_str()); + params.insert("MessagingServiceSid", config.service_sid.as_str()); + params.insert("Body", msg.content.as_str()); - let url = format!("https://api.twilio.com/2010-04-01/Accounts/ACefa1ef516314c9d1a68cbd657de49277/Messages.json"); + let url = format!( + "https://api.twilio.com/2010-04-01/Accounts/ACefa1ef516314c9d1a68cbd657de49277/Messages.json" + ); - let client = reqwest::Client::new(); - /* - let request = client.request(reqwest::Method::POST, url) - .headers(headers) - .form(¶ms); - */ - let request = client.post(url).headers(headers); + let client = reqwest::Client::new(); + /* + let request = client.request(reqwest::Method::POST, url) + .headers(headers) + .form(¶ms); + */ + let request = client.post(url).headers(headers); - match request.send().await { - Ok(response) => { - let body = response.text(); + match request.send().await { + Ok(response) => { + let body = response.text(); - let mut obj = crate::twilio::api::types::TwilioAPIMessage{..Default::default()}; - Ok(obj) - } - Err(err) => { - Err(std::io::Error::other(err.to_string())) - } - } - } - Err(err) => { - Err(std::io::Error::other(err.to_string())) + let mut obj = crate::twilio::api::types::TwilioAPIMessage { + ..Default::default() + }; + Ok(obj) + } + Err(err) => Err(std::io::Error::other(err.to_string())), + } } + Err(err) => Err(std::io::Error::other(err.to_string())), } } } - /* #[tokio::main] async fn main() -> Result<(), Box> { @@ -114,55 +121,57 @@ async fn main() -> Result<(), Box> { } */ - /** 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, - }) + 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) - } + 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 - } - } - } + 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) + early := now.Add(Schedulable_Limit_In_Seconds * time.Second) - if scheduled.After(early) { - return true - } else { - return false - } + if scheduled.After(early) { + return true + } else { + return false + } } */ -fn is_scheduleable(now: &Option, scheduled: &Option) -> bool { +fn is_scheduleable( + now: &Option, + scheduled: &Option, +) -> bool { true } diff --git a/src/twilio/api/types/mod.rs b/src/twilio/api/types/mod.rs index 598c283..3a3e78e 100644 --- a/src/twilio/api/types/mod.rs +++ b/src/twilio/api/types/mod.rs @@ -1,4 +1,3 @@ - #[derive(Clone, Debug, Default, serde::Deserialize, serde::Serialize)] pub struct TwilioAPIMessage { pub account_sid: String, @@ -22,7 +21,7 @@ pub struct TwilioAPIMessage { pub status: String, pub subresource_uris: SubresourceURI, pub to: String, - pub uri: String + pub uri: String, } #[derive(Clone, Debug, Default, serde::Deserialize, serde::Serialize)] @@ -30,8 +29,6 @@ pub struct SubresourceURI { pub media: String, } - - /* { "account_sid": "ACefa1ef516314c9d1a68cbd657de49277", diff --git a/src/twilio/types/mod.rs b/src/twilio/types/mod.rs index e124435..e65fba3 100644 --- a/src/twilio/types/mod.rs +++ b/src/twilio/types/mod.rs @@ -1,4 +1,3 @@ - // Things needed to send a message // Contact - Receipient to send to (textsender-models) // Message - The content to sent (textsender-models)