diff --git a/src/game.rs b/src/game.rs index d91e18d..af0c0ea 100644 --- a/src/game.rs +++ b/src/game.rs @@ -1,14 +1,14 @@ -use crate::{language::language, page::Page, Backend, NameUpdateError}; +use crate::{Backend, NameUpdateError, language::language, page::Page}; use axum::{ + Form, Router, extract::{Path, State}, http::HeaderMap, response::{IntoResponse, Redirect, Response}, routing::{get, post}, - Form, Router, }; use axum_extra::extract::CookieJar; use axum_messages::Messages; -use maud::{html, Markup, PreEscaped}; +use maud::{Markup, PreEscaped, html}; use serde::Deserialize; use std::sync::Arc; use uuid::Uuid; @@ -110,7 +110,12 @@ async fn game( if let Ok(number) = backend.client_found_camera(&client, &camera).await { messages.info(format!("found-cam|{}|{number}", camera.name)); } else { - messages.info(&format!("err|{}|{}|{}", t!("error_already_found_title"), t!("error_already_found_body"), t!("error_already_found_footer"))); + messages.info(&format!( + "err|{}|{}|{}", + t!("error_already_found_title"), + t!("error_already_found_body"), + t!("error_already_found_footer") + )); } Ok(Redirect::to("/game")) @@ -138,9 +143,26 @@ async fn set_name( match backend.set_client_name(&client, &form.name).await { Ok(()) => messages.info("set-name-succ"), - Err(NameUpdateError::TooShort(expected, actual)) => messages.info(format!("err|{}|{}|{}: {}", t!("error_name_too_short_title"), t!("error_name_too_short_body", expected = expected), t!("received_characters"), actual)), - Err(NameUpdateError::TooLong(expected, actual)) => messages.info(format!("err|{}|{}|{}: {}", t!("error_name_too_long_title"), t!("error_name_too_long_body", expected = expected), t!("received_characters"), actual)), - Err(NameUpdateError::ContainsBadWord) => messages.info(format!("err|{}|{}|{}", t!("error_bad_word_title"), t!("error_bad_word_body"), t!("error_bad_word_footer"))), + Err(NameUpdateError::TooShort(expected, actual)) => messages.info(format!( + "err|{}|{}|{}: {}", + t!("error_name_too_short_title"), + t!("error_name_too_short_body", expected = expected), + t!("received_characters"), + actual + )), + Err(NameUpdateError::TooLong(expected, actual)) => messages.info(format!( + "err|{}|{}|{}: {}", + t!("error_name_too_long_title"), + t!("error_name_too_long_body", expected = expected), + t!("received_characters"), + actual + )), + Err(NameUpdateError::ContainsBadWord) => messages.info(format!( + "err|{}|{}|{}", + t!("error_bad_word_title"), + t!("error_bad_word_body"), + t!("error_bad_word_footer") + )), }; // Redirect back to the game page diff --git a/src/index.rs b/src/index.rs index 3cad9d3..d7bf56a 100644 --- a/src/index.rs +++ b/src/index.rs @@ -1,7 +1,7 @@ use crate::{language::language, page::Page}; use axum::http::HeaderMap; use axum_extra::extract::CookieJar; -use maud::{html, Markup, PreEscaped}; +use maud::{Markup, PreEscaped, html}; pub(super) async fn index(cookies: CookieJar, headers: HeaderMap) -> Markup { let lang = language(&cookies, &headers); diff --git a/src/main.rs b/src/main.rs index a6e4afa..22fdafb 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,8 +1,8 @@ use crate::model::client::Client; -use axum::{http::HeaderMap, routing::get, Router}; -use axum_extra::extract::{cookie::Cookie, CookieJar}; +use axum::{Router, http::HeaderMap, routing::get}; +use axum_extra::extract::{CookieJar, cookie::Cookie}; use axum_messages::MessagesManagerLayer; -use sqlx::{pool::PoolOptions, sqlite::SqliteConnectOptions, SqlitePool}; +use sqlx::{SqlitePool, pool::PoolOptions, sqlite::SqliteConnectOptions}; use std::{ collections::HashSet, fmt::Display, diff --git a/src/model/client.rs b/src/model/client.rs index f0c4ed2..8dbbcfc 100644 --- a/src/model/client.rs +++ b/src/model/client.rs @@ -1,4 +1,4 @@ -use crate::{random_names::get_name_by_uuid, Backend}; +use crate::{Backend, random_names::get_name_by_uuid}; use serde::{Deserialize, Serialize}; use sqlx::FromRow; use uuid::Uuid; diff --git a/src/model/highscore.rs b/src/model/highscore.rs index 30841f6..c3b7308 100644 --- a/src/model/highscore.rs +++ b/src/model/highscore.rs @@ -1,4 +1,4 @@ -use crate::{model::client::Client, Backend}; +use crate::{Backend, model::client::Client}; pub(crate) struct Rank { pub(crate) rank: i64, diff --git a/src/model/sighting.rs b/src/model/sighting.rs index 8fc9a59..63a5a90 100644 --- a/src/model/sighting.rs +++ b/src/model/sighting.rs @@ -1,9 +1,9 @@ use crate::{ - model::{camera::Camera, client::Client}, Backend, + model::{camera::Camera, client::Client}, }; use serde::{Deserialize, Serialize}; -use sqlx::{types::chrono::NaiveDateTime, FromRow}; +use sqlx::{FromRow, types::chrono::NaiveDateTime}; #[derive(FromRow, Debug, Serialize, Deserialize)] pub struct SightingDb { diff --git a/src/page.rs b/src/page.rs index 1b6258d..9f71d99 100644 --- a/src/page.rs +++ b/src/page.rs @@ -1,6 +1,6 @@ use crate::Language; use axum_messages::Messages; -use maud::{html, Markup, DOCTYPE}; +use maud::{DOCTYPE, Markup, html}; pub(crate) struct Page { lang: Language,