cargo fmt
This commit is contained in:
+1
-1
@@ -46,7 +46,7 @@ pub async fn load_app() -> Result<App, std::io::Error> {
|
||||
auth_url: envs[1].value.clone(),
|
||||
service_username: envs[2].value.clone(),
|
||||
service_passphrase: envs[3].value.clone(),
|
||||
twilio_config: twilio_config,
|
||||
twilio_config,
|
||||
}),
|
||||
Err(err) => Err(err),
|
||||
}
|
||||
|
||||
+1
-1
@@ -30,7 +30,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
|
||||
|
||||
let mut svc = catapult::service::core::Service {
|
||||
app: app.clone(),
|
||||
token: token,
|
||||
token,
|
||||
};
|
||||
|
||||
loop {
|
||||
|
||||
+3
-3
@@ -22,7 +22,7 @@ impl Service {
|
||||
}
|
||||
};
|
||||
|
||||
if !queue_item.is_some() {
|
||||
if queue_item.is_none() {
|
||||
println!("No queue item found");
|
||||
return;
|
||||
}
|
||||
@@ -39,8 +39,8 @@ impl Service {
|
||||
|
||||
Then do the real work.
|
||||
|
||||
1. Check the queue
|
||||
2. If there is an item, get the data,
|
||||
1. Check the queue - Done
|
||||
2. If there is an item, get the data - Done
|
||||
3. Evaluate if it is schedulable
|
||||
4. Get the events and iterate each one
|
||||
5. starting with the message
|
||||
|
||||
+1
-1
@@ -73,7 +73,7 @@ pub mod auth {
|
||||
}
|
||||
|
||||
async fn parse_token_response(
|
||||
response: &String,
|
||||
response: &str,
|
||||
) -> Result<textsender_models::token::LoginResult, std::io::Error> {
|
||||
match serde_json::from_str::<serde_json::Value>(response) {
|
||||
Ok(j) => {
|
||||
|
||||
@@ -1,10 +1,12 @@
|
||||
pub struct Queue {
|
||||
pub app: crate::app::App,
|
||||
pub token: textsender_models::token::LoginResult
|
||||
pub token: textsender_models::token::LoginResult,
|
||||
}
|
||||
|
||||
impl Queue {
|
||||
pub async fn get_queue(&self) -> Result<textsender_models::message::scheduling::ScheduledMessage, std::io::Error> {
|
||||
pub async fn get_queue(
|
||||
&self,
|
||||
) -> Result<textsender_models::message::scheduling::ScheduledMessage, std::io::Error> {
|
||||
let client = reqwest::Client::new();
|
||||
let endpoint = String::from("api/v1/schedule/message/fetch");
|
||||
let api_url = format!("{}/{endpoint}", self.app.api_url);
|
||||
@@ -33,7 +35,7 @@ impl Queue {
|
||||
}
|
||||
|
||||
async fn parse_queue_response(
|
||||
response: &String,
|
||||
response: &str,
|
||||
) -> Result<textsender_models::message::scheduling::ScheduledMessage, std::io::Error> {
|
||||
match serde_json::from_str::<serde_json::Value>(response) {
|
||||
Ok(j) => {
|
||||
|
||||
Reference in New Issue
Block a user