Compare commits

...
Author SHA1 Message Date
phoenix 721f68db47 cargo update
swoosh Build / Test Suite (pull_request) Successful in 1m11s
swoosh Build / build (pull_request) Successful in 2m4s
Release Tagging / release (pull_request) Successful in 33s
swoosh Build / Rustfmt (pull_request) Successful in 30s
swoosh Build / Check (pull_request) Successful in 2m24s
swoosh Build / Clippy (pull_request) Successful in 1m15s
2026-06-07 15:10:27 -04:00
phoenix 891c287a3a bump: textsender-models
Release Tagging / release (pull_request) Successful in 26s
swoosh Build / Check (pull_request) Successful in 38s
swoosh Build / Test Suite (pull_request) Successful in 37s
swoosh Build / Rustfmt (pull_request) Successful in 36s
swoosh Build / Clippy (pull_request) Successful in 40s
swoosh Build / build (pull_request) Successful in 49s
2026-06-07 15:09:37 -04:00
phoenix d959162b43 Fix bug
Release Tagging / release (pull_request) Successful in 36s
swoosh Build / Check (pull_request) Successful in 1m33s
swoosh Build / Test Suite (pull_request) Successful in 1m20s
swoosh Build / Rustfmt (pull_request) Successful in 26s
swoosh Build / Clippy (pull_request) Successful in 1m35s
swoosh Build / build (pull_request) Successful in 1m11s
2026-06-07 15:08:22 -04:00
phoenix 4adbfdf712 Using constant 2026-06-07 15:05:25 -04:00
phoenix 3d1720e020 Removing comments 2026-06-07 15:03:29 -04:00
phoenix e0490adb1a Adding rust caching in workflow
swoosh Build / Rustfmt (pull_request) Successful in 42s
swoosh Build / build (pull_request) Successful in 1m11s
Release Tagging / release (pull_request) Successful in 29s
swoosh Build / Check (pull_request) Successful in 1m56s
swoosh Build / Test Suite (pull_request) Successful in 1m41s
swoosh Build / Clippy (pull_request) Successful in 1m25s
2026-06-07 15:00:46 -04:00
4 changed files with 20 additions and 28 deletions
+5 -1
View File
@@ -17,6 +17,7 @@ jobs:
- uses: actions-rust-lang/setup-rust-toolchain@v1 - uses: actions-rust-lang/setup-rust-toolchain@v1
with: with:
toolchain: 1.95 toolchain: 1.95
- uses: Swatinem/rust-cache@v2
- run: | - run: |
mkdir -p ~/.ssh mkdir -p ~/.ssh
echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/textsender-models_deploy_key echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/textsender-models_deploy_key
@@ -36,6 +37,7 @@ jobs:
- uses: actions-rust-lang/setup-rust-toolchain@v1 - uses: actions-rust-lang/setup-rust-toolchain@v1
with: with:
toolchain: 1.95 toolchain: 1.95
- uses: Swatinem/rust-cache@v2
- run: | - run: |
mkdir -p ~/.ssh mkdir -p ~/.ssh
echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/textsender-models_deploy_key echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/textsender-models_deploy_key
@@ -55,6 +57,7 @@ jobs:
- uses: actions-rust-lang/setup-rust-toolchain@v1 - uses: actions-rust-lang/setup-rust-toolchain@v1
with: with:
toolchain: 1.95 toolchain: 1.95
- uses: Swatinem/rust-cache@v2
- run: rustup component add rustfmt - run: rustup component add rustfmt
- run: | - run: |
mkdir -p ~/.ssh mkdir -p ~/.ssh
@@ -75,6 +78,7 @@ jobs:
- uses: actions-rust-lang/setup-rust-toolchain@v1 - uses: actions-rust-lang/setup-rust-toolchain@v1
with: with:
toolchain: 1.95 toolchain: 1.95
- uses: Swatinem/rust-cache@v2
- run: rustup component add clippy - run: rustup component add clippy
- run: | - run: |
mkdir -p ~/.ssh mkdir -p ~/.ssh
@@ -95,6 +99,7 @@ jobs:
- uses: actions-rust-lang/setup-rust-toolchain@v1 - uses: actions-rust-lang/setup-rust-toolchain@v1
with: with:
toolchain: 1.95 toolchain: 1.95
- uses: Swatinem/rust-cache@v2
- run: | - run: |
mkdir -p ~/.ssh mkdir -p ~/.ssh
echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/textsender-models_deploy_key echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/textsender-models_deploy_key
@@ -105,4 +110,3 @@ jobs:
ssh-add -v ~/.ssh/textsender-models_deploy_key ssh-add -v ~/.ssh/textsender-models_deploy_key
cargo build cargo build
Generated
+10 -11
View File
@@ -59,15 +59,15 @@ checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
[[package]] [[package]]
name = "base64-ng" name = "base64-ng"
version = "1.0.6" version = "1.0.7"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8452b0c98385f31f08318109d6e06a859f89e0c5e38aad6103f095443b063052" checksum = "8992e20e420add1e6e31c6c548a4ba698ed9339bb0863b37478427179c56f05d"
[[package]] [[package]]
name = "bitflags" name = "bitflags"
version = "2.12.1" version = "2.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "84d7ced0ae9557296835c32bf1b1e02b44c746701f898460fb000d7eaa84f00a" checksum = "b4388bee8683e3d04af747c73422af53102d2bd24d9eadb6cbc100baef4b43f8"
[[package]] [[package]]
name = "bumpalo" name = "bumpalo"
@@ -862,9 +862,9 @@ dependencies = [
[[package]] [[package]]
name = "log" name = "log"
version = "0.4.31" version = "0.4.32"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "113b30b4cd05f7c06868fdb2854f66a7b9fece9a48425351cd532e810d74024f" checksum = "953f07c43838f8e6f9758cab68bf5bed85465e7587ebe0b823f1bcd81978ad3a"
[[package]] [[package]]
name = "lru-slab" name = "lru-slab"
@@ -1658,13 +1658,12 @@ dependencies = [
[[package]] [[package]]
name = "textsender_models" name = "textsender_models"
version = "0.2.5" version = "0.3.0"
source = "git+ssh://git@git.kundeng.us/phoenix/textsender-models.git?tag=v0.2.5-v0.3.0-migrate-38dbcb09f7-111#38dbcb09f7c2c572f429ec382c01e14b72b1d615" source = "git+ssh://git@git.kundeng.us/phoenix/textsender-models.git?tag=v0.3.0#d504108745b7b97a02eac24e16763cdb5e731f2b"
dependencies = [ dependencies = [
"const_format", "const_format",
"dotenvy", "dotenvy",
"josekit", "josekit",
"rand 0.10.1",
"serde", "serde",
"serde_json", "serde_json",
"time", "time",
@@ -2429,9 +2428,9 @@ checksum = "1ffae5123b2d3fc086436f8834ae3ab053a283cfac8fe0a0b8eaae044768a4c4"
[[package]] [[package]]
name = "yoke" name = "yoke"
version = "0.8.2" version = "0.8.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "abe8c5fda708d9ca3df187cae8bfb9ceda00dd96231bed36e445a1a48e66f9ca" checksum = "709fe23a0424b6a435d82152b1bd3fdfb0833487d5fa90d05d42762a9891fef5"
dependencies = [ dependencies = [
"stable_deref_trait", "stable_deref_trait",
"yoke-derive", "yoke-derive",
+1 -1
View File
@@ -18,7 +18,7 @@ uuid = { version = "1.23.1", features = ["v4", "serde"] }
base64-ng = { version = "1.0.6" } base64-ng = { version = "1.0.6" }
const_format = { version = "0.2.36" } const_format = { version = "0.2.36" }
josekit = { version = "0.10.3" } josekit = { version = "0.10.3" }
textsender_models = { git = "ssh://git@git.kundeng.us/phoenix/textsender-models.git", tag = "v0.2.5-v0.3.0-migrate-38dbcb09f7-111" } textsender_models = { git = "ssh://git@git.kundeng.us/phoenix/textsender-models.git", tag = "v0.3.0" }
[dev-dependencies] [dev-dependencies]
tempfile = { version = "3.27.0" } tempfile = { version = "3.27.0" }
+4 -15
View File
@@ -32,17 +32,11 @@ pub async fn send_mssage(
let mut params = std::collections::HashMap::new(); let mut params = std::collections::HashMap::new();
params.insert("To", contact.phone_number.as_str()); params.insert("To", contact.phone_number.as_str());
// params.insert("StatusCallback", "http://OjQozHznkhNTTR.vpnrM1zdXFuiQ");
// params.insert("MaxPrice", "1");
params.insert("ProvideFeedback", "true"); params.insert("ProvideFeedback", "true");
// params.insert("Attempt", "5");
// params.insert("ValidityPeriod", "1537");
params.insert("ForceDelivery", "false"); params.insert("ForceDelivery", "false");
params.insert("ContentRetention", "retain"); params.insert("ContentRetention", "retain");
params.insert("AddressRetention", "obfuscate"); params.insert("AddressRetention", "obfuscate");
params.insert("SmartEncoded", "true"); params.insert("SmartEncoded", "true");
// params.insert("PersistentAction", "string");
// params.insert("PersistentAction", "string");
params.insert("ShortenUrls", "true"); params.insert("ShortenUrls", "true");
let date = match param.schedule_at { let date = match param.schedule_at {
Some(date_value) => date_value.to_string(), Some(date_value) => date_value.to_string(),
@@ -66,7 +60,7 @@ pub async fn send_mssage(
let request = client.post(url).headers(headers).form(&params); let request = client.post(url).headers(headers).form(&params);
match request.send().await { match request.send().await {
Ok(response) => match response.status() { Ok(response) => match response.status() {
reqwest::StatusCode::OK => Ok(response), reqwest::StatusCode::CREATED => Ok(response),
status => Err(std::io::Error::other(format!( status => Err(std::io::Error::other(format!(
"Unaccounted status: {status:?}" "Unaccounted status: {status:?}"
))), ))),
@@ -104,15 +98,10 @@ fn generate_auth(
params.insert("ShortenUrls", "true"); params.insert("ShortenUrls", "true");
params.insert("SendAsMms", "true"); params.insert("SendAsMms", "true");
params.insert("RiskCheck", "enable"); params.insert("RiskCheck", "enable");
let response = request.send().await?;
let body = response.text().await?;
println!("{}", body);
Ok(())
}
*/ */
const DEFAULT_SCHEDULING_SECONDS: i64 = 300;
fn is_scheduleable( fn is_scheduleable(
now: &Option<time::OffsetDateTime>, now: &Option<time::OffsetDateTime>,
scheduled: &Option<time::OffsetDateTime>, scheduled: &Option<time::OffsetDateTime>,
@@ -121,7 +110,7 @@ fn is_scheduleable(
Some(schedule_at) => { Some(schedule_at) => {
let early = now let early = now
.unwrap() .unwrap()
.checked_add(time::Duration::seconds(300)) .checked_add(time::Duration::seconds(DEFAULT_SCHEDULING_SECONDS))
.unwrap(); .unwrap();
*schedule_at > early *schedule_at > early
} }