From afbd23bed9b3acf75c3d6d75642eae006fbead00 Mon Sep 17 00:00:00 2001 From: phoenix Date: Thu, 25 Jun 2026 21:59:47 -0400 Subject: [PATCH] Got it working --- src/main.rs | 4 ---- src/service/core.rs | 4 ++-- src/service/message.rs | 1 - src/service/mod.rs | 2 +- 4 files changed, 3 insertions(+), 8 deletions(-) diff --git a/src/main.rs b/src/main.rs index 911720c..8b1e200 100644 --- a/src/main.rs +++ b/src/main.rs @@ -26,16 +26,12 @@ async fn main() -> Result<(), Box> { } }; - println!("Access token: {}", token.access_token); - let mut svc = catapult::service::core::Service { app: app.clone(), token, }; loop { - // TODO: Need to update textsender_models. The token module needs updating. - // The LoginResult needs expires_in populated if catapult::service::auth::has_token_expired(&svc.token).await { match auth.get_refresh_token(&svc.token).await { Ok(refresh) => { diff --git a/src/service/core.rs b/src/service/core.rs index b384668..5f31188 100644 --- a/src/service/core.rs +++ b/src/service/core.rs @@ -57,7 +57,7 @@ impl Service { }; let messages = super::message::Message { app: self.app.clone(), - token: self.token.clone() + token: self.token.clone(), }; let events = events.unwrap_or_default(); for event in events { @@ -94,7 +94,7 @@ impl Service { 2. If there is an item, get the data - Done 3. Evaluate if it is schedulable - Done 4. Get the events and iterate each one - Done - 5. Starting with the message + 5. Starting with the message - Done 6. Get the contact - Done 7. Send the message 8. Record the message event response diff --git a/src/service/message.rs b/src/service/message.rs index 67c7150..e10d4ae 100644 --- a/src/service/message.rs +++ b/src/service/message.rs @@ -62,4 +62,3 @@ async fn parse_response( Err(err) => Err(std::io::Error::other(err.to_string())), } } - diff --git a/src/service/mod.rs b/src/service/mod.rs index 91d76d9..5779824 100644 --- a/src/service/mod.rs +++ b/src/service/mod.rs @@ -1,8 +1,8 @@ pub mod auth; pub mod contact; pub mod core; -pub mod message; pub mod event; +pub mod message; pub mod queue; pub fn auth_header(