diff --git a/Cargo.lock b/Cargo.lock index 49d5582..a17524c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -132,9 +132,9 @@ checksum = "fc652a48c352aef3ea3aed32080501cf3ef6ed5da78602a020c991775b0aff04" [[package]] name = "cc" -version = "1.2.66" +version = "1.2.67" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5d6cac793997bd970000024b2934968efe83b382de4fdcf4fcb46b6ee4ad996" +checksum = "e17dd265a7d0f31ef544e1b20e03add05d3b45b491b633b10d67145d2acc1a38" dependencies = [ "find-msvc-tools", "jobserver", @@ -721,9 +721,9 @@ dependencies = [ [[package]] name = "http-body" -version = "1.0.1" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" +checksum = "ca2a8f2913ee65f60facd6a5905613afaa448497a0230cc41ce022d93290bc2c" dependencies = [ "bytes", "http", @@ -731,9 +731,9 @@ dependencies = [ [[package]] name = "http-body-util" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b021d93e26becf5dc7e1b75b1bed1fd93124b374ceb73f43d4d4eafec896a64a" +checksum = "e9f41fd6a08e4d4ec69df65976da761afd5ad5e58a9d4acb46bd1c953a9e3ff2" dependencies = [ "bytes", "futures-core", @@ -1140,9 +1140,9 @@ dependencies = [ [[package]] name = "mio" -version = "1.2.1" +version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02bd0af71c67b473010cbbc60715ee815645a4dc942899111f494b4b737d6fda" +checksum = "30d65c71f1ce40ab09135ce117d742b9f8a19ff91a41a8b57ed50bc2de59c427" dependencies = [ "libc", "wasi", @@ -1527,9 +1527,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.41" +version = "0.23.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b92b125634d9b795e7beca796cc790df15a7fb38323bf3196fda83292d06b1f" +checksum = "3c54fcab019b409d04215d3a17cb438fd7fbf192ee61461f20f4fe18704bc138" dependencies = [ "aws-lc-rs", "once_cell", @@ -1630,6 +1630,22 @@ dependencies = [ "windows-sys 0.61.2", ] +[[package]] +name = "schedtxt_models" +version = "0.5.3" +source = "git+ssh://git@git.kundeng.us/phoenix/schedtxt_models.git?tag=v0.5.3#597af4e84c082bb437cc94817bb19592614681a5" +dependencies = [ + "const_format", + "dotenvy", + "josekit", + "serde", + "serde_json", + "sqlx", + "time", + "utoipa", + "uuid", +] + [[package]] name = "scopeguard" version = "1.2.0" @@ -1667,11 +1683,11 @@ checksum = "8a7852d02fc848982e0c167ef163aaff9cd91dc640ba85e263cb1ce46fae51cd" [[package]] name = "sender" -version = "0.1.5" +version = "0.1.6" dependencies = [ + "schedtxt_models", "serde_json", "swoosh", - "textsender_models", "tokio", ] @@ -2448,9 +2464,9 @@ dependencies = [ [[package]] name = "uuid" -version = "1.23.4" +version = "1.23.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf80a72845275afea99e7f2b434723d3bc7e38470fcd1c7ed39a599c73319a53" +checksum = "ea5fab0d6c3c01ae70085a09cb03d4c7a1d6314e2b3e075392783396d724ca0a" dependencies = [ "getrandom 0.4.3", "js-sys", @@ -2815,6 +2831,6 @@ dependencies = [ [[package]] name = "zmij" -version = "1.0.21" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8848ee67ecc8aedbaf3e4122217aff892639231befc6a1b58d29fff4c2cabaa" +checksum = "29666d0abbfad1e3dc4dcf6144730dd3a3ab225bbbdac83319345b1b44ccfc1b" diff --git a/Cargo.toml b/Cargo.toml index a220a58..2b55df7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,13 +1,13 @@ [package] name = "sender" -version = "0.1.5" +version = "0.1.6" edition = "2024" rust-version = "1.97" [dependencies] serde_json = { version = "1.0.150" } tokio = { version = "1.52.3", features = ["full"] } -textsender_models = { git = "ssh://git@git.kundeng.us/phoenix/textsender_models.git", tag = "v0.5.2", features = ["config", "contact", "envy", "message"] } +schedtxt_models = { git = "ssh://git@git.kundeng.us/phoenix/schedtxt_models.git", tag = "v0.5.3", features = ["config", "contact", "envy", "message"] } swoosh = { git = "ssh://git@git.kundeng.us/phoenix/swoosh.git", tag = "v0.5.3" } [dev-dependencies] diff --git a/src/config/mod.rs b/src/config/mod.rs index 5d1a5d2..d62b444 100644 --- a/src/config/mod.rs +++ b/src/config/mod.rs @@ -20,14 +20,14 @@ fn path_exists(path: &str) -> bool { file.exists() } -pub fn parse_config() -> (textsender_models::config::auxiliary::TwilioConfig, bool) { - let mut config = textsender_models::config::auxiliary::TwilioConfig { +pub fn parse_config() -> (schedtxt_models::config::auxiliary::TwilioConfig, bool) { + let mut config = schedtxt_models::config::auxiliary::TwilioConfig { ..Default::default() }; - let auth_sid_var = textsender_models::envy::environment::get_env("AUTH_SID"); - let auth_token_var = textsender_models::envy::environment::get_env("AUTH_TOKEN"); - let phone_number_var = textsender_models::envy::environment::get_env("PHONE_NUMBER"); - let service_sid_var = textsender_models::envy::environment::get_env("SERVICE_SID"); + let auth_sid_var = schedtxt_models::envy::environment::get_env("AUTH_SID"); + let auth_token_var = schedtxt_models::envy::environment::get_env("AUTH_TOKEN"); + let phone_number_var = schedtxt_models::envy::environment::get_env("PHONE_NUMBER"); + let service_sid_var = schedtxt_models::envy::environment::get_env("SERVICE_SID"); config.account_sid = auth_sid_var.value; config.auth_token = auth_token_var.value; config.phone_number = phone_number_var.value; diff --git a/src/messaging/mod.rs b/src/messaging/mod.rs index fb4c3e7..e1457cf 100644 --- a/src/messaging/mod.rs +++ b/src/messaging/mod.rs @@ -1,6 +1,6 @@ -use textsender_models::config::auxiliary::TwilioConfig; -use textsender_models::contact::Contact; -use textsender_models::message::Message; +use schedtxt_models::config::auxiliary::TwilioConfig; +use schedtxt_models::contact::Contact; +use schedtxt_models::message::Message; pub async fn send_messages( config: &TwilioConfig,