Saving changes

Cargo.toml

@@ -8,6 +8,8 @@ description = "Library to send text messages"
 [dependencies]
 serde = { version = "1.0.228", features = ["derive"] }
 serde_json = { version = "1.0.149" }
+http = { version = "1.4.0" }
+reqwest = { version = "0.13.3", features = ["json", "blocking", "multipart", "stream"] }
 rand = { version = "0.10.1" }
 time = { version = "0.3.47", features = ["formatting", "macros", "parsing", "serde"] }
 uuid = { version = "1.23.1", features = ["v4", "serde"] }

src/twilio/api/mod.rs

@@ -1 +1,168 @@
+// use josekit::jwk::alg::ec::EcCurve::P256;
+
 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> {
+    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() {
+            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 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 client = reqwest::Client::new();
+        /*
+        let request = client.request(reqwest::Method::POST, url)
+            .headers(headers)
+            .form(&params);
+                */
+        let request = client.post(url).headers(headers);
+
+        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()))
+            }
+        }
+    }
+}
+
+
+/*
+#[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");
+    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", "12243026041");
+    params.insert("MessagingServiceSid", "MG803f3676706b92eb02e18dd820c447f2");
+    params.insert("Body", "This is a test");
+
+    let request = client.request(reqwest::Method::POST, "https://api.twilio.com/2010-04-01/Accounts/ACefa1ef516314c9d1a68cbd657de49277/Messages.json")
+        .headers(headers)
+        .form(&params);
+
+    let response = request.send().await?;
+    let body = response.text().await?;
+
+    println!("{}", body);
+
+    Ok(())
+}
+*/
+
+
+/**
+ 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>) -> bool {
+    true
+}

src/twilio/api/types/mod.rs

@@ -0,0 +1,60 @@
+
+#[derive(Clone, Debug, Default, serde::Deserialize, serde::Serialize)]
+pub struct TwilioAPIMessage {
+    pub account_sid: String,
+    pub api_version: String,
+    pub body: String,
+    // pub date_created: time::OffsetDateTime,
+    pub date_sent: Option<time::OffsetDateTime>,
+    pub date_updated: Option<time::OffsetDateTime>,
+    pub direction: String,
+    // Not definite of what type this is
+    pub error_code: Option<String>,
+    // Not definite of what type this is
+    pub error_message: Option<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>,
+    pub sid: String,
+    pub status: String,
+    pub subresource_uris: SubresourceURI,
+    pub to: String,
+    pub uri: String
+}
+
+#[derive(Clone, Debug, Default, serde::Deserialize, serde::Serialize)]
+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

@@ -0,0 +1,10 @@
+
+// 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)
+pub struct Parameters {
+    pub schedule: bool,
+    pub schedule_at: Option<time::OffsetDateTime>,
+}