Compare commits
4
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
891c287a3a
|
||
|
|
d959162b43
|
||
|
|
4adbfdf712
|
||
|
|
3d1720e020
|
Generated
+2
-3
@@ -1658,13 +1658,12 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "textsender_models"
|
||||
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"
|
||||
version = "0.3.0"
|
||||
source = "git+ssh://git@git.kundeng.us/phoenix/textsender-models.git?tag=v0.3.0#d504108745b7b97a02eac24e16763cdb5e731f2b"
|
||||
dependencies = [
|
||||
"const_format",
|
||||
"dotenvy",
|
||||
"josekit",
|
||||
"rand 0.10.1",
|
||||
"serde",
|
||||
"serde_json",
|
||||
"time",
|
||||
|
||||
+1
-1
@@ -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.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]
|
||||
tempfile = { version = "3.27.0" }
|
||||
|
||||
+4
-15
@@ -32,17 +32,11 @@ pub async fn send_mssage(
|
||||
|
||||
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(),
|
||||
@@ -66,7 +60,7 @@ pub async fn send_mssage(
|
||||
let request = client.post(url).headers(headers).form(¶ms);
|
||||
match request.send().await {
|
||||
Ok(response) => match response.status() {
|
||||
reqwest::StatusCode::OK => Ok(response),
|
||||
reqwest::StatusCode::CREATED => Ok(response),
|
||||
status => Err(std::io::Error::other(format!(
|
||||
"Unaccounted status: {status:?}"
|
||||
))),
|
||||
@@ -104,15 +98,10 @@ fn generate_auth(
|
||||
params.insert("ShortenUrls", "true");
|
||||
params.insert("SendAsMms", "true");
|
||||
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(
|
||||
now: &Option<time::OffsetDateTime>,
|
||||
scheduled: &Option<time::OffsetDateTime>,
|
||||
@@ -121,7 +110,7 @@ fn is_scheduleable(
|
||||
Some(schedule_at) => {
|
||||
let early = now
|
||||
.unwrap()
|
||||
.checked_add(time::Duration::seconds(300))
|
||||
.checked_add(time::Duration::seconds(DEFAULT_SCHEDULING_SECONDS))
|
||||
.unwrap();
|
||||
*schedule_at > early
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user