phoenix/swoosh
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases 70 Wiki Activity

cargo fmt
Release Tagging / release (pull_request) Successful in 27s
Details
swoosh Build / Check (pull_request) Successful in 39s
Details
swoosh Build / Test Suite (pull_request) Successful in 25s
Details
swoosh Build / Rustfmt (pull_request) Successful in 30s
Details
swoosh Build / Clippy (pull_request) Successful in 27s
Details
swoosh Build / build (pull_request) Successful in 24s
Details

Browse Source
This commit is contained in:
phoenix
2026-06-03 16:52:46 -04:00
parent 2971363d2f
commit 5752741972
3 changed files with 98 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/twilio/api/mod.rs
+97 -88
View File
@@ -2,72 +2,79 @@
pub mod types; 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<crate::twilio::api::types::TwilioAPIMessage, std::io::Error> { 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<crate::twilio::api::types::TwilioAPIMessage, std::io::Error> {
if config.account_sid.is_nil() { if config.account_sid.is_nil() {
Err(std::io::Error::other("Account SID is empty")) Err(std::io::Error::other("Account SID is empty"))
} else if config.auth_token.is_empty() { } else if config.auth_token.is_empty() {
Err(std::io::Error::other(" Auth token is empty")) Err(std::io::Error::other(" Auth token is empty"))
} else { } else {
let now = time::OffsetDateTime::now_utc(); let now = time::OffsetDateTime::now_utc();
match reqwest::Client::builder() .build() { match reqwest::Client::builder().build() {
Ok(client) => { Ok(client) => {
let mut headers = reqwest::header::HeaderMap::new(); let mut headers = reqwest::header::HeaderMap::new();
headers.insert("Content-Type", "application/x-www-form-urlencoded".parse().unwrap()); headers.insert(
headers.insert("Accept", "application/json".parse().unwrap()); "Content-Type",
// headers.insert("Authorization", "Basic QUNlZmExZWY1MTYzMTRjOWQxYTY4Y2JkNjU3ZGU0OTI3NzpmNGExZjJiMGI3OWVhMzczNTA3OGMyZDhlZTk2ODRlMQ==".parse()?); "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(); let mut params = std::collections::HashMap::new();
params.insert("To", contact.phone_number.as_str()); params.insert("To", contact.phone_number.as_str());
// params.insert("StatusCallback", "http://OjQozHznkhNTTR.vpnrM1zdXFuiQ"); // params.insert("StatusCallback", "http://OjQozHznkhNTTR.vpnrM1zdXFuiQ");
// params.insert("MaxPrice", "1"); // params.insert("MaxPrice", "1");
params.insert("ProvideFeedback", "true"); params.insert("ProvideFeedback", "true");
// params.insert("Attempt", "5"); // params.insert("Attempt", "5");
// params.insert("ValidityPeriod", "1537"); // params.insert("ValidityPeriod", "1537");
params.insert("ForceDelivery", "false"); params.insert("ForceDelivery", "false");
params.insert("ContentRetention", "retain"); params.insert("ContentRetention", "retain");
params.insert("AddressRetention", "obfuscate"); params.insert("AddressRetention", "obfuscate");
params.insert("SmartEncoded", "true"); params.insert("SmartEncoded", "true");
// params.insert("PersistentAction", "string"); // params.insert("PersistentAction", "string");
// params.insert("PersistentAction", "string"); // params.insert("PersistentAction", "string");
params.insert("ShortenUrls", "true"); params.insert("ShortenUrls", "true");
// params.insert("ScheduleType", "fixed"); // params.insert("ScheduleType", "fixed");
// params.insert("SendAt", "2026-06-03T19:50:00.0Z"); // params.insert("SendAt", "2026-06-03T19:50:00.0Z");
params.insert("SendAsMms", "true"); params.insert("SendAsMms", "true");
params.insert("RiskCheck", "enable"); params.insert("RiskCheck", "enable");
params.insert("From", config.phone_number.as_str()); params.insert("From", config.phone_number.as_str());
params.insert("MessagingServiceSid", config.service_sid.as_str()); params.insert("MessagingServiceSid", config.service_sid.as_str());
params.insert("Body", msg.content.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 client = reqwest::Client::new();
/* /*
let request = client.request(reqwest::Method::POST, url) let request = client.request(reqwest::Method::POST, url)
.headers(headers) .headers(headers)
.form(&params); .form(&params);
*/ */
let request = client.post(url).headers(headers); let request = client.post(url).headers(headers);
match request.send().await { match request.send().await {
Ok(response) => { Ok(response) => {
let body = response.text(); let body = response.text();
let mut obj = crate::twilio::api::types::TwilioAPIMessage{..Default::default()}; let mut obj = crate::twilio::api::types::TwilioAPIMessage {
Ok(obj) ..Default::default()
} };
Err(err) => { Ok(obj)
Err(std::io::Error::other(err.to_string())) }
} Err(err) => Err(std::io::Error::other(err.to_string())),
} }
}
Err(err) => {
Err(std::io::Error::other(err.to_string()))
} }
Err(err) => Err(std::io::Error::other(err.to_string())),
} }
} }
} }
/* /*
#[tokio::main] #[tokio::main]
async fn main() -> Result<(), Box<dyn std::error::Error>> { async fn main() -> Result<(), Box<dyn std::error::Error>> {
@@ -114,55 +121,57 @@ 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) { func (m *MessageSender) Send(msg message.Message, number contact.Contact, sendTime *time.Time) (*types.TwilioResult, map[string]any, error) {
if m.Config == nil { if m.Config == nil {
return nil, nil, fmt.Errorf("Config has not been initialized") return nil, nil, fmt.Errorf("Config has not been initialized")
} }
now := time.Now() now := time.Now()
client := twilio.NewRestClientWithParams(twilio.ClientParams{ client := twilio.NewRestClientWithParams(twilio.ClientParams{
Username: m.Config.AccountSID, Username: m.Config.AccountSID,
Password: m.Config.AuthToken, Password: m.Config.AuthToken,
}) })
params := &twilioApi.CreateMessageParams{} params := &twilioApi.CreateMessageParams{}
params.SetTo(number.PhoneNumber) params.SetTo(number.PhoneNumber)
params.SetFrom(m.Config.Number) params.SetFrom(m.Config.Number)
params.SetMessagingServiceSid(m.Config.ServiceSID) params.SetMessagingServiceSid(m.Config.ServiceSID)
params.SetBody(msg.Content) params.SetBody(msg.Content)
if sendTime != nil && isSchedulable(&now, sendTime) { if sendTime != nil && isSchedulable(&now, sendTime) {
params.SetSendAt(*sendTime) params.SetSendAt(*sendTime)
params.SetScheduleType(Schedule_Type) params.SetScheduleType(Schedule_Type)
} }
if resp, err := client.Api.CreateMessage(params); err != nil { if resp, err := client.Api.CreateMessage(params); err != nil {
return nil, nil, fmt.Errorf("Error sending message: %v", err) return nil, nil, fmt.Errorf("Error sending message: %v", err)
} else { } else {
if twilioRespMarshaled, err := json.Marshal(*resp); err != nil { if twilioRespMarshaled, err := json.Marshal(*resp); err != nil {
return nil, nil, fmt.Errorf("Error parsing result: %v", err) return nil, nil, fmt.Errorf("Error parsing result: %v", err)
} else { } else {
var rawObject map[string]any var rawObject map[string]any
if err := json.Unmarshal(twilioRespMarshaled, &rawObject); err != nil { if err := json.Unmarshal(twilioRespMarshaled, &rawObject); err != nil {
return resp, nil, err return resp, nil, err
} else { } else {
return resp, rawObject, nil return resp, rawObject, nil
} }
} }
} }
} }
func isSchedulable(now *time.Time, scheduled *time.Time) bool { 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) { if scheduled.After(early) {
return true return true
} else { } else {
return false return false
} }
} }
*/ */
fn is_scheduleable(now: &Option<time::OffsetDateTime>, scheduled: &Option<time::OffsetDateTime>) -> bool { fn is_scheduleable(
now: &Option<time::OffsetDateTime>,
scheduled: &Option<time::OffsetDateTime>,
) -> bool {
true true
} }
src/twilio/api/types/mod.rs
+1 -4
View File
@@ -1,4 +1,3 @@
#[derive(Clone, Debug, Default, serde::Deserialize, serde::Serialize)] #[derive(Clone, Debug, Default, serde::Deserialize, serde::Serialize)]
pub struct TwilioAPIMessage { pub struct TwilioAPIMessage {
pub account_sid: String, pub account_sid: String,
@@ -22,7 +21,7 @@ pub struct TwilioAPIMessage {
pub status: String, pub status: String,
pub subresource_uris: SubresourceURI, pub subresource_uris: SubresourceURI,
pub to: String, pub to: String,
pub uri: String pub uri: String,
} }
#[derive(Clone, Debug, Default, serde::Deserialize, serde::Serialize)] #[derive(Clone, Debug, Default, serde::Deserialize, serde::Serialize)]
@@ -30,8 +29,6 @@ pub struct SubresourceURI {
pub media: String, pub media: String,
} }
/* /*
{ {
"account_sid": "ACefa1ef516314c9d1a68cbd657de49277", "account_sid": "ACefa1ef516314c9d1a68cbd657de49277",
src/twilio/types/mod.rs
-1
View File
@@ -1,4 +1,3 @@
// Things needed to send a message // Things needed to send a message
// Contact - Receipient to send to (textsender-models) // Contact - Receipient to send to (textsender-models)
// Message - The content to sent (textsender-models) // Message - The content to sent (textsender-models)