progress

backend/src/main.rs

@@ -2,25 +2,22 @@
 #[macro_use]
 extern crate rocket;
 
-use rocket::fairing::Fairing;
 use rocket::fs::FileServer;
 use rocket::http::Method;
-use rocket::response::stream::{Event, EventStream};
 use rocket::serde::json::Json;
 use rocket::{Build, Rocket};
 use rocket_cors::{AllowedOrigins, CorsOptions};
 use rocket_db_pools::{Connection, Database};
-use rocket_dyn_templates::{Template, context};
-use serde::{Deserialize, Serialize};
+use rocket_dyn_templates::Template;
 use std::sync::Arc;
-use tokio::sync::broadcast;
 
-use crate::auth::{AuthGuard, DbConn};
-use crate::llm::LlmWorker;
+use crate::auth::AuthGuard;
+use crate::db::DbConn;
 use crate::messages::ChatBroadcaster;
 
 pub mod auth;
 pub mod cdn;
+pub mod db;
 pub mod llm;
 pub mod messages;
 
@@ -29,8 +26,10 @@ async fn users(_ag: AuthGuard, mut db: Connection<DbConn>) -> Json<Vec<i32>> {
     sqlx::query!("SELECT id FROM users")
         .fetch_all(&mut **db)
         .await
-        .map(|rows| rows.into_iter().map(|row| row.id).collect())
         .unwrap_or_else(|_| Vec::new())
+        .into_iter()
+        .map(|row| row.id)
+        .collect::<Vec<i32>>()
         .into()
 }
 
@@ -43,7 +42,6 @@ async fn username_for_id(id: usize, _ag: AuthGuard, mut db: Connection<DbConn>)
         .unwrap_or_else(|_| "User not found".to_string())
 }
 
-/// ---------- launch ----------
 #[launch]
 fn rocket() -> Rocket<Build> {
     let chat = Arc::new(ChatBroadcaster::new(32));