Compare commits
24
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a9f27a3f29
|
||
|
|
fcc8c3966c
|
||
|
|
4d3bb7778a
|
||
|
|
b5fd3dbfff
|
||
|
|
bb58dafed3
|
||
|
|
c71f5bed7a
|
||
|
|
6d5e10857d
|
||
|
|
70f5261b49
|
||
|
|
0fde9c2edd
|
||
|
|
a9fde833aa
|
||
|
|
0e68debd42
|
||
|
|
d21d72f596
|
||
|
|
29fcf41a9c
|
||
|
|
f0ffc580e6
|
||
|
|
57d16c6996
|
||
|
|
a065388805
|
||
|
|
3c45061026
|
||
|
|
5752741972
|
||
|
|
2971363d2f
|
||
|
|
0cbf63c78d
|
||
|
|
e487a2c275
|
||
|
|
97dcb360ab
|
||
|
|
7c3b51d6a0
|
||
|
|
c6103ebba4
|
@@ -3,10 +3,10 @@ name: Release Tagging
|
||||
on:
|
||||
push:
|
||||
branches:
|
||||
- main
|
||||
- v0.3.x
|
||||
pull_request:
|
||||
branches:
|
||||
- main
|
||||
- v0.3.x
|
||||
|
||||
jobs:
|
||||
release:
|
||||
|
||||
@@ -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
+1
-1
@@ -1573,7 +1573,7 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
|
||||
|
||||
[[package]]
|
||||
name = "swoosh"
|
||||
version = "0.3.1"
|
||||
version = "0.2.2"
|
||||
dependencies = [
|
||||
"base64-ng",
|
||||
"const_format",
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "swoosh"
|
||||
version = "0.3.1"
|
||||
version = "0.2.2"
|
||||
edition = "2024"
|
||||
rust-version = "1.95"
|
||||
description = "Library to send text messages"
|
||||
|
||||
+15
-11
@@ -1,12 +1,5 @@
|
||||
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,
|
||||
@@ -32,11 +25,17 @@ 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(),
|
||||
@@ -60,7 +59,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::CREATED => Ok(response),
|
||||
reqwest::StatusCode::OK => Ok(response),
|
||||
status => Err(std::io::Error::other(format!(
|
||||
"Unaccounted status: {status:?}"
|
||||
))),
|
||||
@@ -98,9 +97,14 @@ fn generate_auth(
|
||||
params.insert("ShortenUrls", "true");
|
||||
params.insert("SendAsMms", "true");
|
||||
params.insert("RiskCheck", "enable");
|
||||
*/
|
||||
|
||||
const DEFAULT_SCHEDULING_SECONDS: i64 = 300;
|
||||
let response = request.send().await?;
|
||||
let body = response.text().await?;
|
||||
println!("{}", body);
|
||||
|
||||
Ok(())
|
||||
}
|
||||
*/
|
||||
|
||||
fn is_scheduleable(
|
||||
now: &Option<time::OffsetDateTime>,
|
||||
@@ -110,7 +114,7 @@ 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
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user