This commit is contained in:
Greg Burri 2022-12-15 01:16:18 +01:00
parent cc2e5b6893
commit 3f8d940c14
2 changed files with 14 additions and 11 deletions

View file

@ -13,9 +13,9 @@ use rand::distributions::{Alphanumeric, DistString};
use rusqlite::{named_params, params, OptionalExtension, Params}; use rusqlite::{named_params, params, OptionalExtension, Params};
use crate::{ use crate::{
consts,
hash::{hash, verify_password}, hash::{hash, verify_password},
model, model,
consts,
}; };
const CURRENT_DB_VERSION: u32 = 1; const CURRENT_DB_VERSION: u32 = 1;

View file

@ -15,9 +15,7 @@ use crate::{
config::Config, config::Config,
consts, consts,
data::{asynchronous, db}, data::{asynchronous, db},
email, email, model, utils,
model,
utils,
}; };
mod api; mod api;
@ -224,11 +222,13 @@ pub async fn edit_recipe(
let (id,) = path.into_inner(); let (id,) = path.into_inner();
let user = match get_current_user(&req, connection.clone()).await { let user = match get_current_user(&req, connection.clone()).await {
Some(u) => u, Some(u) => u,
None => None => {
return Ok(MessageTemplate { return Ok(MessageTemplate {
user: None, user: None,
message: "Cannot edit a recipe without being logged in", message: "Cannot edit a recipe without being logged in",
}.to_response()) }
.to_response())
}
}; };
let recipe = connection.get_recipe_async(id).await?; let recipe = connection.get_recipe_async(id).await?;
@ -236,8 +236,9 @@ pub async fn edit_recipe(
if recipe.user_id != user.id { if recipe.user_id != user.id {
return Ok(MessageTemplate { return Ok(MessageTemplate {
message: "Cannot edit a recipe you don't own", message: "Cannot edit a recipe you don't own",
user: Some(user) user: Some(user),
}.to_response()) }
.to_response());
} }
let recipes = connection.get_all_recipe_titles_async().await?; let recipes = connection.get_all_recipe_titles_async().await?;
@ -259,11 +260,13 @@ pub async fn new_recipe(
) -> Result<HttpResponse> { ) -> Result<HttpResponse> {
let user = match get_current_user(&req, connection.clone()).await { let user = match get_current_user(&req, connection.clone()).await {
Some(u) => u, Some(u) => u,
None => None => {
return Ok(MessageTemplate { return Ok(MessageTemplate {
message: "Cannot create a recipe without being logged in", message: "Cannot create a recipe without being logged in",
user: None user: None,
}.to_response()) }
.to_response())
}
}; };
let recipe_id = connection.create_recipe_async(user.id).await?; let recipe_id = connection.create_recipe_async(user.id).await?;