This commit is contained in:
2025-10-11 02:03:24 +01:00
parent 6092d1d7b4
commit d31d2079f2
5 changed files with 10 additions and 9 deletions
+1
View File
@@ -2,3 +2,4 @@
.env .env
.log* .log*
Cargo.lock Cargo.lock
.cargo/
+6 -6
View File
@@ -2,7 +2,7 @@ use rocket::{
http::{CookieJar, Status}, http::{CookieJar, Status},
response::{Redirect, status::BadRequest}, response::{Redirect, status::BadRequest},
serde::json::Json, serde::json::Json,
time::{OffsetDateTime, PrimitiveDateTime}, time::OffsetDateTime,
}; };
use rocket_db_pools::Connection; use rocket_db_pools::Connection;
use rocket_dyn_templates::{Template, context}; use rocket_dyn_templates::{Template, context};
@@ -48,7 +48,7 @@ pub async fn signup(
) )
.fetch_one(&mut **db) .fetch_one(&mut **db)
.await .await
.map_err(|e| BadRequest(String::from("Failed to create user")))?; .map_err(|_| BadRequest(String::from("Failed to create user")))?;
println!("phase 3"); println!("phase 3");
let session = Session::new(result.id as usize); let session = Session::new(result.id as usize);
@@ -108,7 +108,7 @@ pub struct AccessTokenForm {
} }
#[get("/invite")] #[get("/invite")]
pub async fn invite_page(s: Session) -> Template { pub async fn invite_page(_s: Session) -> Template {
Template::render("invite", context! {}) Template::render("invite", context! {})
} }
@@ -123,7 +123,7 @@ pub async fn generate_invite(
} }
let code = Uuid::new_v4().to_string(); let code = Uuid::new_v4().to_string();
let row = sqlx::query!( sqlx::query!(
"INSERT INTO access_codes (name, code, creator_id, max_uses, created_at, expires_at) "INSERT INTO access_codes (name, code, creator_id, max_uses, created_at, expires_at)
VALUES ($1, $2, $3, $4, $5, $6) RETURNING id", VALUES ($1, $2, $3, $4, $5, $6) RETURNING id",
form.name, form.name,
@@ -142,7 +142,7 @@ pub async fn generate_invite(
pub struct AccessToken { pub struct AccessToken {
id: i32, id: i32,
code: String, _code: String,
} }
impl AccessToken { impl AccessToken {
@@ -163,7 +163,7 @@ impl AccessToken {
{ {
Ok(row) => Ok(AccessToken { Ok(row) => Ok(AccessToken {
id: row.id, id: row.id,
code: token.to_string(), _code: token.to_string(),
}), }),
Err(_) => Err(BadRequest(String::from("Invalid or Expired token!"))), Err(_) => Err(BadRequest(String::from("Invalid or Expired token!"))),
} }
+1 -1
View File
@@ -1,5 +1,5 @@
use rocket::{Request, http::Status}; use rocket::{Request, http::Status};
use rocket_dyn_templates::{Template, context}; use rocket_dyn_templates::Template;
use serde::Serialize; use serde::Serialize;
#[derive(Serialize)] #[derive(Serialize)]
+1 -1
View File
@@ -12,7 +12,7 @@ use serde::{Deserialize, Serialize};
use sqlx::prelude::FromRow; use sqlx::prelude::FromRow;
use tokio::{select, sync::broadcast}; use tokio::{select, sync::broadcast};
use crate::{auth::Session, db::DbConn, display_name, llm::LlmWorker}; use crate::{auth::Session, db::DbConn, llm::LlmWorker};
/// ---------- shared broadcaster ---------- /// ---------- shared broadcaster ----------
pub struct ChatBroadcaster { pub struct ChatBroadcaster {
+1 -1
View File
@@ -2,7 +2,7 @@ services:
backend: backend:
image: git.zxq5.dev/zxq5/chatapp-backend:latest image: git.zxq5.dev/zxq5/chatapp-backend:latest
ports: ports:
- "8000:8000" - "8080:8000"
depends_on: depends_on:
- redis - redis
environment: environment: