Adding type needed to send message

.gitea/workflows/pr.yml

@@ -1,73 +0,0 @@
-name: swoosh pr
-
-on:
-  pull_request:
-    branches:
-      - main
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
-jobs:
-  check:
-    name: Check
-    runs-on: ubuntu-24.04
-    steps:
-      - uses: actions/checkout@v5
-      - uses: actions-rust-lang/setup-rust-toolchain@v1
-        with:
-          toolchain: 1.96
-      - uses: Swatinem/rust-cache@v2
-      - run: |
-          mkdir -p ~/.ssh
-          echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/textsender-models_deploy_key
-          chmod 600 ~/.ssh/textsender-models_deploy_key
-          ssh-keyscan ${{ secrets.MY_HOST }} >> ~/.ssh/known_hosts
-
-          eval $(ssh-agent -s)
-          ssh-add -v ~/.ssh/textsender-models_deploy_key
-
-          cargo check
-
-  fmt:
-    name: Rustfmt
-    runs-on: ubuntu-24.04
-    steps:
-      - uses: actions/checkout@v5
-      - uses: actions-rust-lang/setup-rust-toolchain@v1
-        with:
-          toolchain: 1.96
-      - uses: Swatinem/rust-cache@v2
-      - run: rustup component add rustfmt
-      - run: |
-          mkdir -p ~/.ssh
-          echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/textsender-models_deploy_key
-          chmod 600 ~/.ssh/textsender-models_deploy_key
-          ssh-keyscan ${{ secrets.MY_HOST }} >> ~/.ssh/known_hosts
-
-          eval $(ssh-agent -s)
-          ssh-add -v ~/.ssh/textsender-models_deploy_key
-
-          cargo fmt --all -- --check
-
-  clippy:
-    name: Clippy
-    runs-on: ubuntu-24.04
-    steps:
-      - uses: actions/checkout@v5
-      - uses: actions-rust-lang/setup-rust-toolchain@v1
-        with:
-          toolchain: 1.96
-      - uses: Swatinem/rust-cache@v2
-      - run: rustup component add clippy
-      - run: |
-          mkdir -p ~/.ssh
-          echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/textsender-models_deploy_key
-          chmod 600 ~/.ssh/textsender-models_deploy_key
-          ssh-keyscan ${{ secrets.MY_HOST }} >> ~/.ssh/known_hosts
-
-          eval $(ssh-agent -s)
-          ssh-add -v ~/.ssh/textsender-models_deploy_key
-
-          cargo clippy -- -D warnings

.gitea/workflows/release.yml

@@ -3,10 +3,10 @@ name: Release Tagging
 on:
   push:
     branches:
-      - main
+      - v0.3.x
   pull_request:
     branches:
-      - main
+      - v0.3.x
 
 jobs:
   release:
@@ -20,7 +20,7 @@ jobs:
       - name: Install Rust
         uses: actions-rs/toolchain@v1
         with:
-          toolchain: 1.96
+          toolchain: 1.95
           components: cargo
 
       - name: Extract Version from Cargo.toml

.gitea/workflows/workflow.yml

@@ -3,11 +3,10 @@ name: swoosh Build
 on:
   push:
     branches:
-      - main
+      - v0.3.x
-
+  pull_request:
-concurrency:
+    branches:
-  group: ${{ github.workflow }}-${{ github.ref }}
+      - v0.3.x
-  cancel-in-progress: true
 
 jobs:
   check:
@@ -17,13 +16,12 @@ jobs:
       - uses: actions/checkout@v5
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: 1.96
+          toolchain: 1.95
-      - uses: Swatinem/rust-cache@v2
       - run: |
           mkdir -p ~/.ssh
           echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/textsender-models_deploy_key
           chmod 600 ~/.ssh/textsender-models_deploy_key
-          ssh-keyscan ${{ secrets.MY_HOST }} >> ~/.ssh/known_hosts
+          ssh-keyscan ${{ secret.MYHOST }} >> ~/.ssh/known_hosts
 
           eval $(ssh-agent -s)
           ssh-add -v ~/.ssh/textsender-models_deploy_key
@@ -37,13 +35,12 @@ jobs:
       - uses: actions/checkout@v5
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: 1.96
+          toolchain: 1.95
-      - uses: Swatinem/rust-cache@v2
       - run: |
           mkdir -p ~/.ssh
           echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/textsender-models_deploy_key
           chmod 600 ~/.ssh/textsender-models_deploy_key
-          ssh-keyscan ${{ secrets.MY_HOST }} >> ~/.ssh/known_hosts
+          ssh-keyscan ${{ secret.MYHOST }} >> ~/.ssh/known_hosts
 
           eval $(ssh-agent -s)
           ssh-add -v ~/.ssh/textsender-models_deploy_key
@@ -57,14 +54,13 @@ jobs:
       - uses: actions/checkout@v5
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: 1.96
+          toolchain: 1.95
-      - uses: Swatinem/rust-cache@v2
       - run: rustup component add rustfmt
       - run: |
           mkdir -p ~/.ssh
           echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/textsender-models_deploy_key
           chmod 600 ~/.ssh/textsender-models_deploy_key
-          ssh-keyscan ${{ secrets.MY_HOST }} >> ~/.ssh/known_hosts
+          ssh-keyscan ${{ secret.MYHOST }} >> ~/.ssh/known_hosts
 
           eval $(ssh-agent -s)
           ssh-add -v ~/.ssh/textsender-models_deploy_key
@@ -78,14 +74,13 @@ jobs:
       - uses: actions/checkout@v5
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: 1.96
+          toolchain: 1.95
-      - uses: Swatinem/rust-cache@v2
       - run: rustup component add clippy
       - run: |
           mkdir -p ~/.ssh
           echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/textsender-models_deploy_key
           chmod 600 ~/.ssh/textsender-models_deploy_key
-          ssh-keyscan ${{ secrets.MY_HOST }} >> ~/.ssh/known_hosts
+          ssh-keyscan ${{ secret.MYHOST }} >> ~/.ssh/known_hosts
 
           eval $(ssh-agent -s)
           ssh-add -v ~/.ssh/textsender-models_deploy_key
@@ -99,15 +94,15 @@ jobs:
       - uses: actions/checkout@v5
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: 1.96
+          toolchain: 1.95
-      - uses: Swatinem/rust-cache@v2
       - run: |
           mkdir -p ~/.ssh
           echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/textsender-models_deploy_key
           chmod 600 ~/.ssh/textsender-models_deploy_key
-          ssh-keyscan ${{ secrets.MY_HOST }} >> ~/.ssh/known_hosts
+          ssh-keyscan ${{ secret.MYHOST }} >> ~/.ssh/known_hosts
 
           eval $(ssh-agent -s)
           ssh-add -v ~/.ssh/textsender-models_deploy_key
 
           cargo build
+

Cargo.toml

@@ -1,24 +1,19 @@
 [package]
 name = "swoosh"
-version = "0.4.2"
+version = "0.2.1"
 edition = "2024"
-rust-version = "1.96"
+rust-version = "1.95"
 description = "Library to send text messages"
 
 [dependencies]
 serde = { version = "1.0.228", features = ["derive"] }
-serde_json = { version = "1.0.150" }
+serde_json = { version = "1.0.149" }
-tokio = { version = "1.52.3", features = ["full"] }
-futures = { version = "0.3.32" }
-http = { version = "1.4.2" }
-reqwest = { version = "0.13.4", features = ["form", "json", "blocking", "multipart", "stream"] }
 rand = { version = "0.10.1" }
-time = { version = "0.3.49", features = ["formatting", "macros", "parsing", "serde"] }
+time = { version = "0.3.47", features = ["formatting", "macros", "parsing", "serde"] }
-uuid = { version = "1.23.3", features = ["v4", "serde"] }
+uuid = { version = "1.23.1", features = ["v4", "serde"] }
-base64-ng = { version = "1.0.8" }
 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.4.10", features = ["config", "contact", "message"] }
+textsender_models = { git = "ssh://git@git.kundeng.us/phoenix/textsender-models.git", tag = "v0.3.0-20-15820d5505-111" }
 
 [dev-dependencies]
 tempfile = { version = "3.27.0" }

src/twilio/api/mod.rs

@@ -1,155 +1 @@
 pub mod types;
-
-/// Converts the response into a json value
-/// That way you do not need to share swoosh's dependency
-pub async fn response_to_json(response: reqwest::Response) -> serde_json::Value {
-    match response.json().await {
-        Ok(json_body) => json_body,
-        Err(_err) => serde_json::Value::Null,
-    }
-}
-
-/// Backwards compatible
-pub use send_message as send_mssage;
-
-/// Send a message
-pub async fn send_message(
-    msg: &textsender_models::message::Message,
-    contact: &textsender_models::contact::Contact,
-    param: &crate::twilio::types::Parameters,
-    config: &textsender_models::config::auxiliary::TwilioConfig,
-) -> 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() {
-        Err(std::io::Error::other(" Auth token is empty"))
-    } else {
-        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());
-                let auth = generate_auth(config).unwrap();
-                headers.insert("Authorization", auth.parse().unwrap());
-
-                let params = init_params(contact, msg, config, param);
-
-                let url = format!(
-                    "https://api.twilio.com/2010-04-01/Accounts/{}/Messages.json",
-                    config.account_sid
-                );
-
-                let request = client.post(url).headers(headers).form(&params);
-                match request.send().await {
-                    Ok(response) => match response.status() {
-                        reqwest::StatusCode::CREATED => Ok(response),
-                        status => Err(std::io::Error::other(format!(
-                            "Unaccounted status: {status:?}"
-                        ))),
-                    },
-                    Err(err) => Err(std::io::Error::other(err.to_string())),
-                }
-            }
-            Err(err) => Err(std::io::Error::other(err.to_string())),
-        }
-    }
-}
-
-fn init_params(
-    contact: &textsender_models::contact::Contact,
-    message: &textsender_models::message::Message,
-    config: &textsender_models::config::auxiliary::TwilioConfig,
-    param: &crate::twilio::types::Parameters,
-) -> std::collections::HashMap<String, String> {
-    let now = time::OffsetDateTime::now_utc();
-    let mut params = std::collections::HashMap::new();
-    params.insert(String::from("To"), contact.phone_number.clone());
-    params.insert(String::from("ProvideFeedback"), String::from("true"));
-    params.insert(String::from("ForceDelivery"), String::from("false"));
-    params.insert(String::from("ContentRetention"), String::from("retain"));
-    params.insert(String::from("AddressRetention"), String::from("obfuscate"));
-    params.insert(String::from("SmartEncoded"), String::from("true"));
-    params.insert(String::from("ShortenUrls"), String::from("true"));
-    let date = match param.schedule_at {
-        Some(date_value) => match convert_time_to_iso(date_value) {
-            Ok(converted) => converted,
-            Err(err) => {
-                eprintln!("Error: {err:?}");
-                String::new()
-            }
-        },
-        None => String::new(),
-    };
-    let scheduled_at = match param.schedule_at {
-        Some(s) => s,
-        None => time::OffsetDateTime::now_utc(),
-    };
-    if param.schedule && is_scheduleable(Some(&now), Some(&scheduled_at)) {
-        params.insert(String::from("ScheduleType"), String::from("fixed"));
-        params.insert(String::from("SendAt"), date.clone());
-    }
-    params.insert(String::from("SendAsMms"), String::from("true"));
-    params.insert(String::from("RiskCheck"), String::from("enable"));
-    params.insert(String::from("From"), config.phone_number.clone());
-    params.insert(
-        String::from("MessagingServiceSid"),
-        config.service_sid.clone(),
-    );
-    params.insert(String::from("Body"), message.content.clone());
-
-    /*
-        let mut params = std::collections::HashMap::new();
-        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("SendAsMms", "true");
-        params.insert("RiskCheck", "enable");
-    */
-
-    params
-}
-
-fn convert_time_to_iso(time: time::OffsetDateTime) -> Result<String, time::error::Format> {
-    use time::format_description::well_known::Iso8601;
-    time.format(&Iso8601::DEFAULT)
-}
-
-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),
-    }
-}
-
-const DEFAULT_SCHEDULING_SECONDS: i64 = 300;
-
-fn is_scheduleable(
-    now: Option<&time::OffsetDateTime>,
-    scheduled: Option<&time::OffsetDateTime>,
-) -> bool {
-    match scheduled {
-        Some(schedule_at) => {
-            let early = now
-                .unwrap()
-                .checked_add(time::Duration::seconds(DEFAULT_SCHEDULING_SECONDS))
-                .unwrap();
-            *schedule_at > early
-        }
-        None => false,
-    }
-}

src/twilio/api/types/mod.rs

@@ -1,38 +1,60 @@
+
 #[derive(Clone, Debug, Default, serde::Deserialize, serde::Serialize)]
 pub struct TwilioAPIMessage {
     pub account_sid: String,
     pub api_version: String,
     pub body: String,
-    #[serde(with = "time::serde::rfc3339::option")]
+    // pub date_created: time::OffsetDateTime,
-    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
-    #[serde(skip_serializing_if = "String::is_empty")]
+    pub error_code: Option<String>,
-    pub error_code: String,
     // Not definite of what type this is
-    #[serde(skip_serializing_if = "String::is_empty")]
+    pub error_message: Option<String>,
-    pub error_message: String,
     pub from: String,
     pub messaging_service_sid: String,
     pub num_media: String,
     pub num_segments: String,
-    #[serde(skip_serializing_if = "String::is_empty")]
+    pub price: Option<String>,
-    pub price: String,
+    pub price_unit: Option<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,
     pub to: String,
-    pub uri: 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

@@ -1,4 +1,9 @@
-/// Parameters - Controls flow of sending message
+
+// 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>,