Added config error check

.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@v6
-      - uses: actions-rust-lang/setup-rust-toolchain@v1
-        with:
-          toolchain: 1.97
-      - 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@v6
-      - uses: actions-rust-lang/setup-rust-toolchain@v1
-        with:
-          toolchain: 1.97
-      - 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@v6
-      - uses: actions-rust-lang/setup-rust-toolchain@v1
-        with:
-          toolchain: 1.97
-      - 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/tag_release.yaml

@@ -1,4 +1,4 @@
-name: Release Tagging
+name: Go Release
 
 on:
   push:
@@ -9,28 +9,27 @@ on:
       - main
 
 jobs:
-  release:
+  build-and-release:
     runs-on: ubuntu-24.04
     steps:
       - name: Checkout code
-        uses: actions/checkout@v6
+        uses: actions/checkout@v5
-        with:
-          fetch-depth: 0 # Important for git describe --tags
 
-      - name: Install Rust
+      - name: Set up Go
-        uses: actions-rs/toolchain@v1
+        uses: actions/setup-go@v6
         with:
-          toolchain: 1.97
+          go-version: '1.25.4'
-          components: cargo
 
-      - name: Extract Version from Cargo.toml
+      - name: Create version
         id: version
         run: |
-          VERSION=$(grep '^version = "' Cargo.toml | sed -E 's/version = "([^"]+)"/\1/')
+          echo "Creating version"
+
+          VERSION="0.0.2"
           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-871"
+          PROJECT_TAG_RELEASE="v$VERSION-$BRANCH_NAME-$PROJECT_COMMIT_HASH-556"
 
           echo "::set-output name=project_tag_release::$PROJECT_TAG_RELEASE"
 

.gitea/workflows/workflow.yaml

@@ -0,0 +1,36 @@
+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@git.kundeng.us:".insteadOf "https://git.kundeng.us/"
+          go env -w GOPRIVATE=git.kundeng.us/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 ${{ vars.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

@@ -1,113 +0,0 @@
-name: swoosh Build
-
-on:
-  push:
-    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@v6
-      - uses: actions-rust-lang/setup-rust-toolchain@v1
-        with:
-          toolchain: 1.97
-      - 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@v6
-      - uses: actions-rust-lang/setup-rust-toolchain@v1
-        with:
-          toolchain: 1.97
-      - 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@v6
-      - uses: actions-rust-lang/setup-rust-toolchain@v1
-        with:
-          toolchain: 1.97
-      - 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@v6
-      - uses: actions-rust-lang/setup-rust-toolchain@v1
-        with:
-          toolchain: 1.97
-      - 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@v6
-      - uses: actions-rust-lang/setup-rust-toolchain@v1
-        with:
-          toolchain: 1.97
-      - 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 @@
-target/
+/vendor

Cargo.toml

@@ -1,17 +0,0 @@
-[package]
-name = "swoosh"
-version = "0.5.4"
-edition = "2024"
-rust-version = "1.97"
-license = "MIT"
-description = "Library to send text messages"
-
-[dependencies]
-serde = { version = "1.0.228", features = ["derive"] }
-serde_json = { version = "1.0.150" }
-reqwest = { version = "0.13.4", features = ["form", "json", "blocking", "multipart", "stream"] }
-time = { version = "0.3.53", features = ["formatting", "macros", "parsing", "serde"] }
-base64-ng = { version = "1.3.7" }
-schedtxt_models = { git = "ssh://git@git.kundeng.us/phoenix/schedtxt_models.git", tag = "v0.5.3", features = ["config", "contact", "message"] }
-
-[dev-dependencies]

LICENSE.md

@@ -1,22 +0,0 @@
-Copyright (c) 2026 Kun Deng.
-
-Permission is hereby granted, free of charge, to any person
-obtaining a copy of this software and associated documentation
-files (the "Software"), to deal in the Software without
-restriction, including without limitation the rights to use,
-copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following
-conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.

README.md

@@ -1,3 +1,2 @@
-# swoosh
+# Swoosh
-A library used to send text messages and is used in conjunction of the `schedtxt`
+`swoosh` is a library used to send text messages
-project.

go.mod

@@ -0,0 +1,15 @@
+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

@@ -0,0 +1,56 @@
+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

@@ -1,107 +0,0 @@
-pub mod twilio;
-
-#[derive(Default, Debug)]
-pub struct SendMsg {
-    config: VendorConfig,
-    message: Message,
-    recipient: Recipient,
-}
-
-impl SendMsg {
-    pub fn load_config(
-        &mut self,
-        auth_token: &str,
-        phone_number: &str,
-        service_sid: &str,
-        account_sid: &str,
-    ) {
-        self.config = VendorConfig {
-            auth_token: auth_token.to_string(),
-            phone_number: phone_number.to_string(),
-            service_sid: service_sid.to_string(),
-            account_sid: account_sid.to_string(),
-        }
-    }
-
-    pub fn load_message(&mut self, content: &str) {
-        self.message = Message {
-            content: content.to_string(),
-        }
-    }
-
-    pub fn load_recipient(&mut self, recpient: &str) {
-        self.recipient = Recipient {
-            phone_number: recpient.to_string(),
-        }
-    }
-
-    pub async fn send_message(
-        &self,
-        param: &crate::twilio::types::Parameters,
-    ) -> Result<reqwest::Response, std::io::Error> {
-        if self.recipient.phone_number.is_empty() {
-            Err(std::io::Error::other("Recipient not provided"))
-        } else if self.message.content.is_empty() {
-            Err(std::io::Error::other("Message not provided"))
-        } else if self.config.phone_number.is_empty()
-            || self.config.service_sid.is_empty()
-            || self.config.auth_token.is_empty()
-            || self.config.account_sid.is_empty()
-        {
-            Err(std::io::Error::other("Config not populated"))
-        } else {
-            let client = match reqwest::Client::builder().build() {
-                Ok(client) => client,
-                Err(err) => {
-                    return Err(std::io::Error::other(err));
-                }
-            };
-
-            let url = twilio::api::twilio_url(&self.config.account_sid);
-            let headers = match twilio::api::init_headers(
-                &self.config.account_sid,
-                &self.config.auth_token,
-            ) {
-                Ok(headers) => headers,
-                Err(err) => {
-                    return Err(std::io::Error::other(err));
-                }
-            };
-            let params = twilio::api::initial_params(
-                &self.recipient.phone_number,
-                &self.message.content,
-                &self.config.phone_number,
-                &self.config.service_sid,
-                param,
-            );
-            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)),
-            }
-        }
-    }
-}
-
-#[derive(Default, Debug)]
-pub struct VendorConfig {
-    pub auth_token: String,
-    pub phone_number: String,
-    pub service_sid: String,
-    pub account_sid: String,
-}
-
-#[derive(Default, Debug)]
-pub struct Message {
-    pub content: String,
-}
-
-#[derive(Default, Debug)]
-pub struct Recipient {
-    pub phone_number: String,
-}

src/twilio/api/mod.rs

@@ -1,246 +0,0 @@
-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: &schedtxt_models::message::Message,
-    contact: &schedtxt_models::contact::Contact,
-    param: &crate::twilio::types::Parameters,
-    config: &schedtxt_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())),
-        }
-    }
-}
-
-pub fn twilio_url(account_sid: &str) -> String {
-    format!(
-        "https://api.twilio.com/2010-04-01/Accounts/{}/Messages.json",
-        account_sid
-    )
-}
-
-pub fn init_headers(
-    account_sid: &str,
-    auth_token: &str,
-) -> Result<reqwest::header::HeaderMap, std::io::Error> {
-    let mut headers = reqwest::header::HeaderMap::new();
-    headers.insert(
-        "Content-Type",
-        match "application/x-www-form-urlencoded".parse() {
-            Ok(value) => value,
-            Err(err) => {
-                return Err(std::io::Error::other(err));
-            }
-        },
-    );
-    let auth = match g_auth(account_sid, auth_token) {
-        Ok(auth) => auth,
-        Err(err) => {
-            return Err(std::io::Error::other(err));
-        }
-    };
-    headers.insert(
-        "Authorization",
-        match format!("Basic {auth}").parse() {
-            Ok(auth) => auth,
-            Err(err) => {
-                return Err(std::io::Error::other(err));
-            }
-        },
-    );
-
-    Ok(headers)
-}
-
-pub fn initial_params(
-    recpient: &str,
-    content: &str,
-    config_source_phone_number: &str,
-    config_service_sid: &str,
-    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"), recpient.to_string());
-    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_source_phone_number.to_string());
-    params.insert(
-        String::from("MessagingServiceSid"),
-        config_service_sid.to_string(),
-    );
-    params.insert(String::from("Body"), content.to_string());
-
-    params
-}
-
-fn init_params(
-    contact: &schedtxt_models::contact::Contact,
-    message: &schedtxt_models::message::Message,
-    config: &schedtxt_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: &schedtxt_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),
-    }
-}
-
-fn g_auth(account_sid: &str, auth_token: &str) -> Result<String, base64_ng::EncodeError> {
-    let input = format!("{}:{}", account_sid, auth_token);
-    base64_ng::encode(input.as_bytes())
-}
-
-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 +0,0 @@
-#[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

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

src/twilio/types/mod.rs

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

swoop/send/sender.go

@@ -0,0 +1,50 @@
+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 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.SetBody(msg.Content)
+	if sendTime != nil {
+		if sendTime.After(now) {
+			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
+		}
+	}
+}

swoop/types/types.go

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