Instant message #24

Merged
phoenix merged 14 commits from instant_message into alot_of_changes 2026-06-20 20:07:19 -04:00
Showing only changes of commit 844b5fc791 - Show all commits
+25 -9
View File
@@ -23,7 +23,7 @@ pub mod response {
#[derive(Debug, Default, Deserialize, Serialize, ToSchema)]
pub struct InstantMessageResponse {
pub message: String,
pub data: Vec<textsender_models::message::event::MessageEventResponse>
pub data: Vec<textsender_models::message::event::MessageEventResponse>,
}
}
@@ -86,10 +86,15 @@ pub mod endpoint {
Err(err) => {
eprintln!("Error: {err:?}");
response.message = String::from("Error getting config");
return (axum::http::StatusCode::INTERNAL_SERVER_ERROR, axum::Json(response));
return (
axum::http::StatusCode::INTERNAL_SERVER_ERROR,
axum::Json(response),
);
}
};
let mut results: Vec<textsender_models::message::event::MessageEventResponse> = Vec::new();
let mut results: Vec<
textsender_models::message::event::MessageEventResponse,
> = Vec::new();
// let mut results: Vec<serde_json::Value> = Vec::new();
for contact in &contacts {
@@ -138,7 +143,10 @@ pub mod endpoint {
}
Err(err) => {
eprintln!("Error: {err:?}");
return (axum::http::StatusCode::INTERNAL_SERVER_ERROR, axum::Json(response));
return (
axum::http::StatusCode::INTERNAL_SERVER_ERROR,
axum::Json(response),
);
}
}
}
@@ -163,21 +171,29 @@ pub mod endpoint {
}
}
async fn load_config() -> Result<textsender_models::config::auxiliary::TwilioConfig, std::io::Error> {
async fn load_config()
-> Result<textsender_models::config::auxiliary::TwilioConfig, std::io::Error> {
let mut config = textsender_models::config::auxiliary::TwilioConfig {
..Default::default()
};
let auth_sid_var = textsender_models::envy::environment::get_env("TWILIO_AUTH_SID").await;
println!("{auth_sid_var:?}");
let service_sid_var = textsender_models::envy::environment::get_env("TWILIO_SERVICE_SID").await;
let service_sid_var =
textsender_models::envy::environment::get_env("TWILIO_SERVICE_SID").await;
println!("{service_sid_var:?}");
let auth_token_var = textsender_models::envy::environment::get_env("TWILIO_AUTH_TOKEN").await;
let auth_token_var =
textsender_models::envy::environment::get_env("TWILIO_AUTH_TOKEN").await;
println!("{auth_token_var:?}");
let phone_number_var = textsender_models::envy::environment::get_env("TWILIO_PHONE_NUMBER").await;
let phone_number_var =
textsender_models::envy::environment::get_env("TWILIO_PHONE_NUMBER").await;
println!("{phone_number_var:?}");
if auth_sid_var.value.is_empty() || service_sid_var.value.is_empty() || auth_token_var.value.is_empty() || phone_number_var.value.is_empty() {
if auth_sid_var.value.is_empty()
|| service_sid_var.value.is_empty()
|| auth_token_var.value.is_empty()
|| phone_number_var.value.is_empty()
{
Err(std::io::Error::other("Config not set"))
} else {
config.account_sid = auth_sid_var.value;