Compare commits

..
Author SHA1 Message Date
phoenix 6d5e10857d Updating comments
Release Tagging / release (pull_request) Successful in 45s
swoosh Build / Check (pull_request) Successful in 59s
swoosh Build / Rustfmt (pull_request) Successful in 25s
swoosh Build / Clippy (pull_request) Failing after 27s
swoosh Build / build (pull_request) Successful in 46s
swoosh Build / Test Suite (pull_request) Failing after 2m6s
2026-06-04 20:15:15 -04:00
phoenix 70f5261b49 Changing return type
Release Tagging / release (pull_request) Successful in 33s
swoosh Build / Check (pull_request) Successful in 1m18s
swoosh Build / Rustfmt (pull_request) Successful in 26s
swoosh Build / Test Suite (pull_request) Failing after 1m19s
swoosh Build / build (pull_request) Successful in 31s
swoosh Build / Clippy (pull_request) Failing after 42s
2026-06-03 21:59:16 -04:00
phoenix 0fde9c2edd Changed types
Release Tagging / release (pull_request) Successful in 42s
swoosh Build / Check (pull_request) Successful in 41s
swoosh Build / Test Suite (pull_request) Failing after 42s
swoosh Build / Rustfmt (pull_request) Successful in 42s
swoosh Build / Clippy (pull_request) Failing after 1m21s
swoosh Build / build (pull_request) Successful in 1m25s
2026-06-03 21:55:23 -04:00
phoenix a9fde833aa Changed type check
Release Tagging / release (pull_request) Successful in 38s
swoosh Build / Test Suite (pull_request) Failing after 35s
swoosh Build / Check (pull_request) Successful in 1m22s
swoosh Build / Rustfmt (pull_request) Successful in 30s
swoosh Build / Clippy (pull_request) Failing after 1m18s
swoosh Build / build (pull_request) Successful in 1m12s
2026-06-03 21:37:23 -04:00
phoenix 0e68debd42 Fixing syntax issue
Release Tagging / release (pull_request) Successful in 28s
swoosh Build / Check (pull_request) Successful in 1m20s
swoosh Build / Test Suite (pull_request) Failing after 1m12s
swoosh Build / Rustfmt (pull_request) Failing after 48s
swoosh Build / build (pull_request) Successful in 1m4s
swoosh Build / Clippy (pull_request) Failing after 1m1s
2026-06-03 20:46:20 -04:00
phoenix d21d72f596 Fixed variable in workflow
swoosh Build / Check (pull_request) Successful in 34s
Release Tagging / release (pull_request) Successful in 39s
swoosh Build / Test Suite (pull_request) Successful in 34s
swoosh Build / Rustfmt (pull_request) Successful in 34s
swoosh Build / Clippy (pull_request) Successful in 33s
swoosh Build / build (pull_request) Successful in 33s
2026-06-03 20:43:32 -04:00
phoenix 29fcf41a9c Need to try this out
swoosh Build / Check (pull_request) Successful in 36s
Release Tagging / release (pull_request) Successful in 39s
swoosh Build / Rustfmt (pull_request) Successful in 30s
swoosh Build / Test Suite (pull_request) Successful in 35s
swoosh Build / build (pull_request) Successful in 32s
swoosh Build / Clippy (pull_request) Successful in 37s
2026-06-03 20:40:25 -04:00
phoenix f0ffc580e6 Adding crate
Release Tagging / release (pull_request) Successful in 32s
swoosh Build / Test Suite (pull_request) Successful in 25s
swoosh Build / Check (pull_request) Successful in 1m22s
swoosh Build / Rustfmt (pull_request) Successful in 43s
swoosh Build / build (pull_request) Successful in 26s
swoosh Build / Clippy (pull_request) Successful in 1m0s
2026-06-03 20:29:02 -04:00
phoenix 57d16c6996 Fixed some things 2026-06-03 20:28:36 -04:00
phoenix a065388805 Added crates
Release Tagging / release (pull_request) Successful in 33s
swoosh Build / Check (pull_request) Successful in 37s
swoosh Build / Test Suite (pull_request) Successful in 24s
swoosh Build / Rustfmt (pull_request) Successful in 33s
swoosh Build / Clippy (pull_request) Successful in 31s
swoosh Build / build (pull_request) Successful in 27s
2026-06-03 20:08:01 -04:00
phoenix 3c45061026 Next step 2026-06-03 20:07:30 -04:00
phoenix 5752741972 cargo fmt
Release Tagging / release (pull_request) Successful in 27s
swoosh Build / Check (pull_request) Successful in 39s
swoosh Build / Test Suite (pull_request) Successful in 25s
swoosh Build / Rustfmt (pull_request) Successful in 30s
swoosh Build / Clippy (pull_request) Successful in 27s
swoosh Build / build (pull_request) Successful in 24s
2026-06-03 16:52:46 -04:00
phoenix 2971363d2f Saving changes
swoosh Build / Rustfmt (pull_request) Successful in 56s
Release Tagging / release (pull_request) Successful in 37s
swoosh Build / Check (pull_request) Successful in 37s
swoosh Build / Test Suite (pull_request) Successful in 30s
swoosh Build / build (pull_request) Successful in 24s
swoosh Build / Clippy (pull_request) Successful in 55s
2026-06-03 16:52:19 -04:00
phoenix 0cbf63c78d Adding networking dependencies
Release Tagging / release (pull_request) Successful in 30s
swoosh Build / Check (pull_request) Successful in 36s
swoosh Build / Test Suite (pull_request) Successful in 24s
swoosh Build / Clippy (pull_request) Successful in 28s
swoosh Build / build (pull_request) Successful in 24s
swoosh Build / Rustfmt (pull_request) Successful in 1m24s
2026-06-03 16:15:33 -04:00
phoenix e487a2c275 Adding type needed to send message
Release Tagging / release (pull_request) Successful in 30s
swoosh Build / Check (pull_request) Successful in 34s
swoosh Build / Rustfmt (pull_request) Successful in 27s
swoosh Build / Test Suite (pull_request) Successful in 40s
swoosh Build / Clippy (pull_request) Successful in 33s
swoosh Build / build (pull_request) Successful in 33s
2026-06-03 16:09:30 -04:00
phoenix 97dcb360ab Fixed type
Release Tagging / release (pull_request) Successful in 36s
swoosh Build / Check (pull_request) Successful in 36s
swoosh Build / Test Suite (pull_request) Successful in 31s
swoosh Build / Rustfmt (pull_request) Successful in 33s
swoosh Build / Clippy (pull_request) Successful in 32s
swoosh Build / build (pull_request) Successful in 37s
2026-06-03 15:55:09 -04:00
phoenix 7c3b51d6a0 Renaming struct 2026-06-03 15:52:43 -04:00
phoenix c6103ebba4 Adding type that maps to the response when a message is sent 2026-06-03 15:51:57 -04:00
6 changed files with 208 additions and 79 deletions
+2 -2
View File
@@ -3,10 +3,10 @@ name: Release Tagging
on:
push:
branches:
- main
- v0.3.x
pull_request:
branches:
- main
- v0.3.x
jobs:
release:
+3 -7
View File
@@ -3,10 +3,10 @@ name: swoosh Build
on:
push:
branches:
- main
- v0.3.x
pull_request:
branches:
- main
- v0.3.x
jobs:
check:
@@ -17,7 +17,6 @@ jobs:
- 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
@@ -37,7 +36,6 @@ jobs:
- 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
@@ -57,7 +55,6 @@ jobs:
- 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
@@ -78,7 +75,6 @@ jobs:
- 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
@@ -99,7 +95,6 @@ jobs:
- 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
@@ -110,3 +105,4 @@ jobs:
ssh-add -v ~/.ssh/textsender-models_deploy_key
cargo build
Generated
+53 -51
View File
@@ -59,15 +59,15 @@ checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
[[package]]
name = "base64-ng"
version = "1.0.8"
version = "1.0.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f6e82a23a3dc4d31148b7f0ea64039a0e59bba046e2879fe763f512bc1f26597"
checksum = "8452b0c98385f31f08318109d6e06a859f89e0c5e38aad6103f095443b063052"
[[package]]
name = "bitflags"
version = "2.13.0"
version = "2.12.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b4388bee8683e3d04af747c73422af53102d2bd24d9eadb6cbc100baef4b43f8"
checksum = "84d7ced0ae9557296835c32bf1b1e02b44c746701f898460fb000d7eaa84f00a"
[[package]]
name = "bumpalo"
@@ -83,9 +83,9 @@ checksum = "1e748733b7cbc798e1434b6ac524f0c1ff2ab456fe201501e6497c8417a4fc33"
[[package]]
name = "cc"
version = "1.2.64"
version = "1.2.63"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dad887fd958be91b5098c0248def011f4523ab786cd411be668777e55063501f"
checksum = "556e016178bb5662a08681bbe0f00f8e17631781a4dfc8c45e466e4b185ec27f"
dependencies = [
"find-msvc-tools",
"jobserver",
@@ -493,9 +493,9 @@ checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
[[package]]
name = "http"
version = "1.4.2"
version = "1.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6970f50e31d6fc17d3fa27329444bfa74e196cf62e95052a3f6fee181dba6425"
checksum = "8be7462df143984c4598a256ef469b251d7d7f9e271135073e78fc535414f3d0"
dependencies = [
"bytes",
"itoa",
@@ -802,12 +802,13 @@ dependencies = [
[[package]]
name = "js-sys"
version = "0.3.102"
version = "0.3.99"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "03d04c30968dffe80775bd4d7fb676131cd04a1fb46d2686dbffbaec2d9dfd31"
checksum = "142bc4740e452c1e57ade0cbc129f139c9093e354346f0872ef985f4f5cf5f11"
dependencies = [
"cfg-if",
"futures-util",
"once_cell",
"wasm-bindgen",
]
@@ -861,9 +862,9 @@ dependencies = [
[[package]]
name = "log"
version = "0.4.32"
version = "0.4.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "953f07c43838f8e6f9758cab68bf5bed85465e7587ebe0b823f1bcd81978ad3a"
checksum = "113b30b4cd05f7c06868fdb2854f66a7b9fece9a48425351cd532e810d74024f"
[[package]]
name = "lru-slab"
@@ -873,9 +874,9 @@ checksum = "112b39cec0b298b6c1999fee3e31427f74f676e4cb9879ed1a121b43661a4154"
[[package]]
name = "memchr"
version = "2.8.2"
version = "2.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "88904434abc2901f197fe8cc55f0445e7ded921dba5911dad2e2b39b48e663c4"
checksum = "6b947ae49db0d222b1dbc6b113ce7248a3fc3a6ca21b696717bfc000ba4484d8"
[[package]]
name = "mime"
@@ -928,9 +929,9 @@ checksum = "9f7c3e4beb33f85d45ae3e3a1792185706c8e16d043238c593331cc7cd313b50"
[[package]]
name = "openssl"
version = "0.10.81"
version = "0.10.80"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "77823a27f0babb03091cb9ed9ef80af3b39dbc82f97e8fa530374b7dafd87a45"
checksum = "a45fa2aa886c42762255da344f0a0d313e254066c46aad76f300c3d3da62d967"
dependencies = [
"bitflags",
"cfg-if",
@@ -959,9 +960,9 @@ checksum = "7c87def4c32ab89d880effc9e097653c8da5d6ef28e6b539d313baaacfbafcbe"
[[package]]
name = "openssl-sys"
version = "0.9.117"
version = "0.9.116"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b47e7e6bb2c38cd930d25a23b40fa52e068c10e85f3e03a7f5ba5aaca5713695"
checksum = "f28a22dc7140cda5f096e5e7724a6962ca81a7f8bfd2979f9b18c11af56318c4"
dependencies = [
"cc",
"libc",
@@ -1187,9 +1188,9 @@ dependencies = [
[[package]]
name = "regex"
version = "1.12.4"
version = "1.12.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f1292b7759ae1cb9ec195452d1390a074f0cd8541ab7a5a8c31cd6db45d4a6ba"
checksum = "e10754a14b9137dd7b1e3e5b0493cc9171fdd105e0ab477f51b72e7f3ac0e276"
dependencies = [
"aho-corasick",
"memchr",
@@ -1210,9 +1211,9 @@ dependencies = [
[[package]]
name = "regex-syntax"
version = "0.8.11"
version = "0.8.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d6f6ff9a378485b298a5286656da665ba74413d36db0979633275d2e708145d4"
checksum = "dc897dd8d9e8bd1ed8cdad82b5966c3e0ecae09fb1907d58efaa013543185d0a"
[[package]]
name = "reqwest"
@@ -1544,9 +1545,9 @@ checksum = "0c790de23124f9ab44544d7ac05d60440adc586479ce501c1d6d7da3cd8c9cf5"
[[package]]
name = "smallvec"
version = "1.15.2"
version = "1.15.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8ed6a63f02c8539c91a8685a86f4099661ba3da017932f6ebbea6de3f0fa7c90"
checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03"
[[package]]
name = "socket2"
@@ -1572,7 +1573,7 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
[[package]]
name = "swoosh"
version = "0.3.4"
version = "0.2.1"
dependencies = [
"base64-ng",
"const_format",
@@ -1657,12 +1658,13 @@ dependencies = [
[[package]]
name = "textsender_models"
version = "0.3.1"
source = "git+ssh://git@git.kundeng.us/phoenix/textsender_models.git?tag=v0.3.1#ba998096cb5d35dae8e627136a795c4d9af5c8f5"
version = "0.2.5"
source = "git+ssh://git@git.kundeng.us/phoenix/textsender-models.git?tag=v0.2.5-v0.3.0-migrate-38dbcb09f7-111#38dbcb09f7c2c572f429ec382c01e14b72b1d615"
dependencies = [
"const_format",
"dotenvy",
"josekit",
"rand 0.10.1",
"serde",
"serde_json",
"time",
@@ -1935,9 +1937,9 @@ dependencies = [
[[package]]
name = "uuid"
version = "1.23.3"
version = "1.23.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "144d6b123cef80b301b8f72a9e2ca4370ddec21950d0a103dd22c437006d2db7"
checksum = "d258b83ceec21034727ecee8c382cfa6c3e133699b0742c64571814fb420c9f7"
dependencies = [
"getrandom 0.4.2",
"js-sys",
@@ -1978,9 +1980,9 @@ checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
[[package]]
name = "wasip2"
version = "1.0.4+wasi-0.2.12"
version = "1.0.3+wasi-0.2.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b67efb37e106e55ce722a510d6b5f9c17f083e5fc79afc2badeb12cc313d9487"
checksum = "20064672db26d7cdc89c7798c48a0fdfac8213434a1186e5ef29fd560ae223d6"
dependencies = [
"wit-bindgen 0.57.1",
]
@@ -1996,9 +1998,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen"
version = "0.2.125"
version = "0.2.122"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8ddb3f79143bced6de84270411622a2699cee572fc0875aeaf1e7867cf9fca1a"
checksum = "3ed04576f974d2b2fba0f38c51dbc5518011e38c36bf1143164be765528fd409"
dependencies = [
"cfg-if",
"once_cell",
@@ -2009,9 +2011,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen-futures"
version = "0.4.75"
version = "0.4.72"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "503b14d284f2c8dac03b819967e155ea753f573586193b2b2c95990cb5d69280"
checksum = "9473dbd2991ae90b6291c3c32c30c6187ac49aa32f9905d1cce280ec1e110b0f"
dependencies = [
"js-sys",
"wasm-bindgen",
@@ -2019,9 +2021,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen-macro"
version = "0.2.125"
version = "0.2.122"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4e21a184b13fb19e157296e2c46056aec9092264fab83e4ba59e68c61b323c3d"
checksum = "916151b09da36bd82f6615cbf3a419e2f0ba23a03c6160e8e92eb6bd4aa1dec6"
dependencies = [
"quote",
"wasm-bindgen-macro-support",
@@ -2029,9 +2031,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen-macro-support"
version = "0.2.125"
version = "0.2.122"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fecefd9c35bd935a20fc3fc344b5f29138961e4f47fb03297d88f2587afb5ebd"
checksum = "299047362ccbfce148b67ab7e73349f77748e00c8296f9542adfad2ad82c5c5e"
dependencies = [
"bumpalo",
"proc-macro2",
@@ -2042,9 +2044,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen-shared"
version = "0.2.125"
version = "0.2.122"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "23939e44bb9a5d7576fa2b563dc2e136628f1224e88a8deed09e04858b77871f"
checksum = "9a929b2c61f11ba3e9bc35b50c1f25cb38e0e892c0c231ae2b8cf78d5dad4437"
dependencies = [
"unicode-ident",
]
@@ -2098,9 +2100,9 @@ dependencies = [
[[package]]
name = "web-sys"
version = "0.3.102"
version = "0.3.99"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a6430a72df5eb332242960fe84b3002a241163998241eb596d4f739b9757061d"
checksum = "6d621441cfc37b84979402712047321980c178f299193a3589d05b99e8763436"
dependencies = [
"js-sys",
"wasm-bindgen",
@@ -2427,9 +2429,9 @@ checksum = "1ffae5123b2d3fc086436f8834ae3ab053a283cfac8fe0a0b8eaae044768a4c4"
[[package]]
name = "yoke"
version = "0.8.3"
version = "0.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "709fe23a0424b6a435d82152b1bd3fdfb0833487d5fa90d05d42762a9891fef5"
checksum = "abe8c5fda708d9ca3df187cae8bfb9ceda00dd96231bed36e445a1a48e66f9ca"
dependencies = [
"stable_deref_trait",
"yoke-derive",
@@ -2450,18 +2452,18 @@ dependencies = [
[[package]]
name = "zerocopy"
version = "0.8.52"
version = "0.8.50"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ce1022995ff5ff5d841ad7d994facc23098cd40152f2c1d11cd607c6f530653f"
checksum = "3b065d4f0e55f82fae73202e189638116a87c55ab6b8e6c2721e13dd9d854ad1"
dependencies = [
"zerocopy-derive",
]
[[package]]
name = "zerocopy-derive"
version = "0.8.52"
version = "0.8.50"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1ae7f38b72ec2a254e2b87ef277cf2cd4fb97cbebf944faa6f33354da0867930"
checksum = "0b631b19d36a892ab55420c92dbc83ccd79274f25be714855d3074aa71cab639"
dependencies = [
"proc-macro2",
"quote",
@@ -2491,9 +2493,9 @@ dependencies = [
[[package]]
name = "zeroize"
version = "1.9.0"
version = "1.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e13c156562582aa81c60cb29407084cdb54c4164760106ab78e6c5b0858cf64e"
checksum = "b97154e67e32c85465826e8bcc1c59429aaaf107c1e4a9e53c8d8ccd5eff88d0"
[[package]]
name = "zerotrie"
+2 -2
View File
@@ -1,6 +1,6 @@
[package]
name = "swoosh"
version = "0.3.4"
version = "0.2.1"
edition = "2024"
rust-version = "1.95"
description = "Library to send text messages"
@@ -18,7 +18,7 @@ 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" }
textsender_models = { git = "ssh://git@git.kundeng.us/phoenix/textsender-models.git", tag = "v0.2.5-v0.3.0-migrate-38dbcb09f7-111" }
[dev-dependencies]
tempfile = { version = "3.27.0" }
+121 -17
View File
@@ -1,11 +1,6 @@
pub mod types;
// use josekit::jwk::alg::ec::EcCurve::P256;
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 mod types;
pub async fn send_mssage(
msg: &textsender_models::message::Message,
@@ -28,18 +23,28 @@ pub async fn send_mssage(
);
headers.insert("Accept", "application/json".parse().unwrap());
let auth = generate_auth(config).unwrap();
// headers.insert("Authorization", "Basic QUNlZmExZWY1MTYzMTRjOWQxYTY4Y2JkNjU3ZGU0OTI3NzpmNGExZjJiMGI3OWVhMzczNTA3OGMyZDhlZTk2ODRlMQ==".parse()?);
headers.insert("Authorization", auth.parse().unwrap());
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");
let date = match param.schedule_at {
Some(date_value) => date_value.to_string(),
Some(date_value) => {
let converted = date_value.to_string();
converted
}
None => String::new(),
};
if param.schedule && is_scheduleable(&Some(now), &param.schedule_at) {
@@ -57,14 +62,39 @@ pub async fn send_mssage(
config.account_sid
);
// let client = reqwest::Client::new();
/*
let request = client.request(reqwest::Method::POST, url)
.headers(headers)
.form(&params);
*/
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:?}"
))),
},
Ok(response) => {
Ok(response)
/*
match response
.json::<crate::twilio::api::types::TwilioAPIMessage>()
.await
{
Ok(resp) => Ok(resp),
Err(err) => Err(std::io::Error::other(err)),
}
match response.text().await {
Ok(body) => {
let mut obj = crate::twilio::api::types::TwilioAPIMessage {
..Default::default()
};
Ok(obj)
}
Err(err) => {
Err(std::io::Error::other(err))
}
}
*/
}
Err(err) => Err(std::io::Error::other(err.to_string())),
}
}
@@ -83,7 +113,18 @@ fn generate_auth(
}
}
/*
#[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");
@@ -96,11 +137,74 @@ fn generate_auth(
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(())
}
*/
const DEFAULT_SCHEDULING_SECONDS: i64 = 300;
/**
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>,
@@ -110,9 +214,9 @@ fn is_scheduleable(
Some(schedule_at) => {
let early = now
.unwrap()
.checked_add(time::Duration::seconds(DEFAULT_SCHEDULING_SECONDS))
.checked_add(time::Duration::seconds(300))
.unwrap();
*schedule_at > early
if *schedule_at > early { true } else { false }
}
None => false,
}
+27
View File
@@ -36,3 +36,30 @@ pub struct TwilioAPIMessage {
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"
}
*/