Merge branch 'main' into 241-external-api-endpoints

Author: Akinator31

rustmail/src/db/operations/scheduled.rs

@@ -74,12 +74,12 @@ pub async fn get_scheduled_closure(
     pool: &SqlitePool,
 ) -> ModmailResult<Option<ScheduledClosure>> {
     let row_opt = sqlx::query(
-        "SELECT thread_id, close_at, silent FROM scheduled_closures WHERE thread_id = ?",
+        "SELECT thread_id, close_at, silent, closed_by, category_id, category_name, required_permissions FROM scheduled_closures WHERE thread_id = ?",
     )
     .bind(thread_id)
     .fetch_optional(pool)
     .await
-    .map_err(|_| common::validation_failed("Failed to fetch scheduled closure"))?;
+    .map_err(|_| validation_failed("Failed to fetch scheduled closure"))?;
 
     Ok(row_opt.map(|row| ScheduledClosure {
         thread_id: row.get::<String, _>(0),

rustmail/src/main.rs

@@ -87,7 +87,9 @@ async fn main() {
                     .route("/", axum::routing::get(static_handler))
                     .route("/{*path}", axum::routing::get(static_handler));
 
-                let listener = tokio::net::TcpListener::bind("0.0.0.0:3002").await.unwrap();
+                let api_address = config.bot.ip.unwrap_or_else(|| "0.0.0.0".to_string());
+
+                let listener = tokio::net::TcpListener::bind(format!("{}:{}", api_address, 3002)).await.unwrap();
                 println!("listening on {}", listener.local_addr().unwrap());
 
                 axum::serve(