Compare commits

..

No commits in common. "85f6db499fd01d38c7b4374fec53ae13508f78c1" and "b66c8f0613c75120fe6e7c07a079bc9e76afe0f4" have entirely different histories.

3 changed files with 5 additions and 5 deletions

View file

@ -1,4 +1,4 @@
use actix_web::{get, patch, web, Error, HttpRequest, HttpResponse}; use actix_web::{get, post, web, Error, HttpRequest, HttpResponse};
use serde::Deserialize; use serde::Deserialize;
use crate::{api::v1::auth::check_access_token, structs::Me, utils::get_auth_header, Data}; use crate::{api::v1::auth::check_access_token, structs::Me, utils::get_auth_header, Data};
@ -38,7 +38,7 @@ struct NewInfo {
email: Option<String>, email: Option<String>,
} }
#[patch("/me")] #[post("/me")]
pub async fn update(req: HttpRequest, new_info: web::Json<NewInfo>, data: web::Data<Data>) -> Result<HttpResponse, Error> { pub async fn update(req: HttpRequest, new_info: web::Json<NewInfo>, data: web::Data<Data>) -> Result<HttpResponse, Error> {
let headers = req.headers(); let headers = req.headers();
@ -62,7 +62,7 @@ pub async fn update(req: HttpRequest, new_info: web::Json<NewInfo>, data: web::D
return Ok(error); return Ok(error);
} }
let me = me_result.unwrap(); let me = me_result;
if let Some(username) = &new_info.username { if let Some(username) = &new_info.username {
todo!(); todo!();

View file

@ -42,7 +42,7 @@ pub async fn res(
return Ok(error); return Ok(error);
} }
let accounts = User::fetch_amount(&data.pool, start, amount).await; let accounts = User::fetch_all(&data.pool, start, amount).await;
if let Err(error) = accounts { if let Err(error) = accounts {
return Ok(error); return Ok(error);

View file

@ -837,7 +837,7 @@ impl User {
Ok(user.build()) Ok(user.build())
} }
pub async fn fetch_amount(pool: &Pool<Postgres>, start: i32, amount: i32) -> Result<Vec<Self>, HttpResponse> { pub async fn fetch_all(pool: &Pool<Postgres>, start: i32, amount: i32) -> Result<Vec<Self>, HttpResponse> {
let row = sqlx::query_as("SELECT CAST(uuid AS VARCHAR), username, display_name, avatar, email FROM users ORDER BY username LIMIT $1 OFFSET $2") let row = sqlx::query_as("SELECT CAST(uuid AS VARCHAR), username, display_name, avatar, email FROM users ORDER BY username LIMIT $1 OFFSET $2")
.bind(amount) .bind(amount)
.bind(start) .bind(start)