bump: swoosh

Reviewed-on: #7

.gitea/workflows/release.yml

@@ -1,4 +1,4 @@
-name: Go Release
+name: Release Tagging
 
 on:
   push:
@@ -9,27 +9,28 @@ on:
       - main
 
 jobs:
-  build-and-release:
+  release:
     runs-on: ubuntu-24.04
     steps:
       - name: Checkout code
         uses: actions/checkout@v5
-
-      - name: Set up Go
-        uses: actions/setup-go@v6
         with:
-          go-version: '1.25.4'
+          fetch-depth: 0 # Important for git describe --tags
 
-      - name: Create version
+      - name: Install Rust
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: 1.95
+          components: cargo
+
+      - name: Extract Version from Cargo.toml
         id: version
         run: |
-          echo "Creating version"
-
-          VERSION="0.0.4"
+          VERSION=$(grep '^version = "' Cargo.toml | sed -E 's/version = "([^"]+)"/\1/')
           PROJECT_COMMIT_HASH=$(git rev-parse HEAD | cut -c 1-10)
           BRANCH_REF="${{ gitea.ref }}"
           BRANCH_NAME=$(echo "$BRANCH_REF" | cut -d '/' -f 3)
-          PROJECT_TAG_RELEASE="v$VERSION-$BRANCH_NAME-$PROJECT_COMMIT_HASH-556"
+          PROJECT_TAG_RELEASE="v$VERSION-$BRANCH_NAME-$PROJECT_COMMIT_HASH-871"
 
           echo "::set-output name=project_tag_release::$PROJECT_TAG_RELEASE"
 

.gitea/workflows/workflow.yaml

@@ -1,36 +0,0 @@
-name: Go CI
-
-on: [push, pull_request] # Triggers on push or pull request events
-
-jobs:
-  test:
-    name: Test
-    runs-on: ubuntu-24.04
-    steps:
-      - name: Check out repository code
-        uses: actions/checkout@v5
-
-      - name: Set up Go
-        uses: actions/setup-go@v6
-        with:
-          go-version: '1.25.4'
-      - name: Configure Git for SSH
-        run: |
-          git config --global url."git@${{ secrets.GIT_HOST_ROOT }}:".insteadOf "https://${{ secrets.GIT_HOST_ROOT }}/"
-          go env -w GOPRIVATE=${{ secrets.GIT_HOST_ROOT }}/phoenix/*
-
-      - name: Download dependencies
-        run: |
-          echo "Initializing config"
-          mkdir -p ~/.ssh
-          echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/swoosh_deploy_key
-          chmod 600 ~/.ssh/swoosh_deploy_key
-          ssh-keyscan ${{ secrets.MY_HOST }} >> ~/.ssh/known_hosts
-
-          eval $(ssh-agent -s)
-          ssh-add -v ~/.ssh/swoosh_deploy_key
-
-          go mod download
-
-      - name: Run tests
-        run: go test -v ./... # Runs all tests in the project

.gitea/workflows/workflow.yml

@@ -0,0 +1,112 @@
+name: swoosh Build
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+    branches:
+      - main
+
+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.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
+
+          eval $(ssh-agent -s)
+          ssh-add -v ~/.ssh/textsender-models_deploy_key
+
+          cargo check
+
+  test:
+    name: Test Suite
+    runs-on: ubuntu-24.04
+    steps:
+      - uses: actions/checkout@v5
+      - uses: actions-rust-lang/setup-rust-toolchain@v1
+        with:
+          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
+
+          eval $(ssh-agent -s)
+          ssh-add -v ~/.ssh/textsender-models_deploy_key
+
+          cargo test
+
+  fmt:
+    name: Rustfmt
+    runs-on: ubuntu-24.04
+    steps:
+      - uses: actions/checkout@v5
+      - uses: actions-rust-lang/setup-rust-toolchain@v1
+        with:
+          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
+
+          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.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
+
+          eval $(ssh-agent -s)
+          ssh-add -v ~/.ssh/textsender-models_deploy_key
+
+          cargo clippy -- -D warnings
+
+  build:
+    name: build
+    runs-on: ubuntu-24.04
+    steps:
+      - uses: actions/checkout@v5
+      - uses: actions-rust-lang/setup-rust-toolchain@v1
+        with:
+          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
+
+          eval $(ssh-agent -s)
+          ssh-add -v ~/.ssh/textsender-models_deploy_key
+
+          cargo build

.gitignore

@@ -1 +1 @@
-/vendor
+target/

Cargo.toml

@@ -0,0 +1,24 @@
+[package]
+name = "swoosh"
+version = "0.3.4"
+edition = "2024"
+rust-version = "1.95"
+description = "Library to send text messages"
+
+[dependencies]
+serde = { version = "1.0.228", features = ["derive"] }
+serde_json = { version = "1.0.149" }
+tokio = { version = "1.52.2", features = ["full"] }
+futures = { version = "0.3.32" }
+http = { version = "1.4.0" }
+reqwest = { version = "0.13.3", features = ["form", "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"] }
+base64-ng = { version = "1.0.6" }
+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.3.1" }
+
+[dev-dependencies]
+tempfile = { version = "3.27.0" }

README.md

@@ -1,2 +0,0 @@
-# Swoosh
-`swoosh` is a library used to send text messages

go.mod

@@ -1,15 +0,0 @@
-module git.kundeng.us/phoenix/swoosh
-
-go 1.25.4
-
-require (
-	git.kundeng.us/phoenix/textsender-models v0.0.10
-	github.com/twilio/twilio-go v1.28.6
-)
-
-require (
-	github.com/golang-jwt/jwt/v5 v5.3.0 // indirect
-	github.com/golang/mock v1.6.0 // indirect
-	github.com/google/uuid v1.6.0 // indirect
-	github.com/pkg/errors v0.9.1 // indirect
-)

go.sum

@@ -1,56 +0,0 @@
-git.kundeng.us/phoenix/textsender-models v0.0.10 h1:0AMe/zm4Xte2BcuqqhRP7+42m+4To+rUnHkR2a9eXlI=
-git.kundeng.us/phoenix/textsender-models v0.0.10/go.mod h1:9iPDQJg1Tc6WMNoW5+f8YKmnosMwlWHJ++hmxNLDEe0=
-github.com/beevik/etree v1.1.0/go.mod h1:r8Aw8JqVegEf0w2fDnATrX9VpkMcyFeM0FhwO62wh+A=
-github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
-github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/golang-jwt/jwt/v5 v5.2.2/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
-github.com/golang-jwt/jwt/v5 v5.3.0 h1:pv4AsKCKKZuqlgs5sUmn4x8UlGa0kEVt/puTpKx9vvo=
-github.com/golang-jwt/jwt/v5 v5.3.0/go.mod h1:fxCRLWMO43lRc8nhHWY6LGqRcf+1gQWArsqaEUEa5bE=
-github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc=
-github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs=
-github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
-github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
-github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
-github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
-github.com/localtunnel/go-localtunnel v0.0.0-20170326223115-8a804488f275 h1:IZycmTpoUtQK3PD60UYBwjaCUHUP7cML494ao9/O8+Q=
-github.com/localtunnel/go-localtunnel v0.0.0-20170326223115-8a804488f275/go.mod h1:zt6UU74K6Z6oMOYJbJzYpYucqdcQwSMPBEdSvGiaUMw=
-github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
-github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
-github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
-github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/twilio/twilio-go v1.28.6 h1:L/pikXkARmPOzF/gUMeZPP/Lu5mY/wA4XC7sRzS86W4=
-github.com/twilio/twilio-go v1.28.6/go.mod h1:FpgNWMoD8CFnmukpKq9RNpUSGXC0BwnbeKZj2YHlIkw=
-github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
-golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
-golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
-golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
-golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
-gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

src/lib.rs

@@ -0,0 +1 @@
+pub mod twilio;

src/twilio/api/mod.rs

@@ -0,0 +1,119 @@
+pub mod types;
+
+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,
+    }
+}
+
+pub async 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<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 {
+        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());
+                let auth = generate_auth(config).unwrap();
+                headers.insert("Authorization", auth.parse().unwrap());
+
+                let mut params = std::collections::HashMap::new();
+                params.insert("To", contact.phone_number.as_str());
+                params.insert("ProvideFeedback", "true");
+                params.insert("ForceDelivery", "false");
+                params.insert("ContentRetention", "retain");
+                params.insert("AddressRetention", "obfuscate");
+                params.insert("SmartEncoded", "true");
+                params.insert("ShortenUrls", "true");
+                let date = match param.schedule_at {
+                    Some(date_value) => date_value.to_string(),
+                    None => String::new(),
+                };
+                if param.schedule && is_scheduleable(&Some(now), &param.schedule_at) {
+                    params.insert("ScheduleType", "fixed");
+                    params.insert("SendAt", date.as_str());
+                }
+                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/{}/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 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),
+    }
+}
+/*
+    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");
+*/
+
+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

@@ -0,0 +1,38 @@
+#[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: 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: String,
+    // Not definite of what type this is
+    #[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,
+    #[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,
+    pub to: String,
+    pub uri: String,
+}
+
+#[derive(Clone, Debug, Default, serde::Deserialize, serde::Serialize)]
+pub struct SubresourceURI {
+    pub media: String,
+}

src/twilio/mod.rs

@@ -0,0 +1,2 @@
+pub mod api;
+pub mod types;

src/twilio/types/mod.rs

@@ -0,0 +1,5 @@
+/// Parameters - Controls flow of sending message
+pub struct Parameters {
+    pub schedule: bool,
+    pub schedule_at: Option<time::OffsetDateTime>,
+}

swoop/send/sender.go

@@ -1,60 +0,0 @@
-package send
-
-import (
-	"encoding/json"
-	"fmt"
-	"time"
-
-	"git.kundeng.us/phoenix/textsender-models/tx0/config"
-	"git.kundeng.us/phoenix/textsender-models/tx0/contact"
-	"git.kundeng.us/phoenix/textsender-models/tx0/message"
-	"github.com/twilio/twilio-go"
-	twilioApi "github.com/twilio/twilio-go/rest/api/v2010"
-
-	"git.kundeng.us/phoenix/swoosh/swoop/types"
-)
-
-
-type MessageSender struct {
-	Config *config.TwiloConfig
-}
-
-func (m *MessageSender) Send(msg message.Message, number contact.Contact, sendTime *time.Time) (*types.TwilioResult, error) {
-	if m.Config == nil {
-		return 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)
-	}
-
-	if resp, err := client.Api.CreateMessage(params); err != nil {
-		return nil, fmt.Errorf("Error sending message: %v", err)
-	} else {
-		if _, err := json.Marshal(*resp); err != nil {
-			return nil, fmt.Errorf("Error parsing result: %v", err)
-		} else {
-			return resp, nil
-		}
-	}
-}
-
-func isSchedulable(now *time.Time, scheduled *time.Time) (bool) {
-	early := now.Add(300 * time.Second)
-
-	if scheduled.Before(early) && scheduled.After(now) {
-		return true
-	} else {
-		return false
-	}
-}

swoop/types/types.go

@@ -1,7 +0,0 @@
-package types
-
-import (
-	twilioApi "github.com/twilio/twilio-go/rest/api/v2010"
-)
-
-type TwilioResult = twilioApi.ApiV2010Message