From 41635ff4032e948b95cf90b02b2162c968c02463 Mon Sep 17 00:00:00 2001 From: ResuBaka Date: Sat, 22 Feb 2025 12:45:04 +0100 Subject: [PATCH] refactor: format code --- rust/api-server/api/src/buildings/mod.rs | 4 +- .../api/src/claim_tech_state/mod.rs | 2 +- rust/api-server/api/src/claims/mod.rs | 6 +-- .../api/src/collectible_desc/mod.rs | 2 +- .../api/src/deployable_state/mod.rs | 2 +- rust/api-server/api/src/inventory/mod.rs | 4 +- rust/api-server/api/src/items/mod.rs | 6 +-- rust/api-server/api/src/leaderboard/mod.rs | 4 +- rust/api-server/api/src/lib.rs | 8 +-- rust/api-server/api/src/locations/mod.rs | 4 +- rust/api-server/api/src/player_state/mod.rs | 4 +- rust/api-server/api/src/vault_state/mod.rs | 2 +- rust/api-server/api/src/websocket.rs | 52 ++++++++++++++----- rust/api-server/entity/src/building_desc.rs | 2 +- rust/api-server/entity/src/crafting_recipe.rs | 2 +- .../entity/src/inventory_changelog.rs | 2 +- .../entity/src/player_action_state.rs | 2 +- rust/api-server/entity/src/user_state.rs | 2 +- 18 files changed, 67 insertions(+), 43 deletions(-) diff --git a/rust/api-server/api/src/buildings/mod.rs b/rust/api-server/api/src/buildings/mod.rs index 59082ff..ab41a22 100644 --- a/rust/api-server/api/src/buildings/mod.rs +++ b/rust/api-server/api/src/buildings/mod.rs @@ -11,8 +11,8 @@ use log::{debug, error, info}; use migration::OnConflict; use reqwest::Client; use sea_orm::{ - sea_query, ColumnTrait, DatabaseConnection, EntityTrait, IntoActiveModel, QueryFilter, - QuerySelect, + ColumnTrait, DatabaseConnection, EntityTrait, IntoActiveModel, QueryFilter, QuerySelect, + sea_query, }; use serde::{Deserialize, Serialize}; use serde_json::Value; diff --git a/rust/api-server/api/src/claim_tech_state/mod.rs b/rust/api-server/api/src/claim_tech_state/mod.rs index ecbd489..689f571 100644 --- a/rust/api-server/api/src/claim_tech_state/mod.rs +++ b/rust/api-server/api/src/claim_tech_state/mod.rs @@ -2,7 +2,7 @@ use crate::websocket::{Table, TableWithOriginalEventTransactionUpdate}; use entity::claim_tech_state::Model; use entity::{claim_tech_desc, claim_tech_state}; use log::{debug, error, info}; -use migration::{sea_query, OnConflict}; +use migration::{OnConflict, sea_query}; use sea_orm::{ ColumnTrait, DatabaseConnection, EntityTrait, IntoActiveModel, QueryFilter, QuerySelect, }; diff --git a/rust/api-server/api/src/claims/mod.rs b/rust/api-server/api/src/claims/mod.rs index 91595d4..1b9e8b6 100644 --- a/rust/api-server/api/src/claims/mod.rs +++ b/rust/api-server/api/src/claims/mod.rs @@ -1,5 +1,5 @@ use crate::inventory::resolve_contents; -use crate::leaderboard::{experience_to_level, LeaderboardSkill, EXCLUDED_USERS_FROM_LEADERBOARD}; +use crate::leaderboard::{EXCLUDED_USERS_FROM_LEADERBOARD, LeaderboardSkill, experience_to_level}; use crate::websocket::{Table, TableWithOriginalEventTransactionUpdate, WebSocketMessages}; use crate::{AppRouter, AppState}; use axum::extract::{Path, Query, State}; @@ -14,10 +14,10 @@ use entity::{ }; use log::{debug, error, info}; use migration::OnConflict; -use sea_orm::{sea_query, ColumnTrait, EntityTrait, IntoActiveModel, QueryFilter, QuerySelect}; +use sea_orm::{ColumnTrait, EntityTrait, IntoActiveModel, QueryFilter, QuerySelect, sea_query}; use serde::{Deserialize, Serialize}; use serde_json::Value; -use service::{sea_orm::DatabaseConnection, Query as QueryCore}; +use service::{Query as QueryCore, sea_orm::DatabaseConnection}; use std::cmp::Ordering; use std::collections::{BTreeMap, HashMap, HashSet}; use std::fs::File; diff --git a/rust/api-server/api/src/collectible_desc/mod.rs b/rust/api-server/api/src/collectible_desc/mod.rs index 427b5c7..9f53ad0 100644 --- a/rust/api-server/api/src/collectible_desc/mod.rs +++ b/rust/api-server/api/src/collectible_desc/mod.rs @@ -3,7 +3,7 @@ use entity::collectible_desc; use log::{debug, error, info}; use migration::OnConflict; use sea_orm::IntoActiveModel; -use sea_orm::{sea_query, ColumnTrait, DatabaseConnection, EntityTrait, QueryFilter, QuerySelect}; +use sea_orm::{ColumnTrait, DatabaseConnection, EntityTrait, QueryFilter, QuerySelect, sea_query}; use std::collections::{HashMap, HashSet}; async fn get_known_collectible_desc_ids(conn: &DatabaseConnection) -> anyhow::Result> { diff --git a/rust/api-server/api/src/deployable_state/mod.rs b/rust/api-server/api/src/deployable_state/mod.rs index a283c86..06a37a3 100644 --- a/rust/api-server/api/src/deployable_state/mod.rs +++ b/rust/api-server/api/src/deployable_state/mod.rs @@ -2,7 +2,7 @@ use crate::websocket::{Table, TableWithOriginalEventTransactionUpdate}; use entity::deployable_state; use entity::deployable_state::Model; use log::{debug, error, info}; -use migration::{sea_query, OnConflict}; +use migration::{OnConflict, sea_query}; use sea_orm::{ ColumnTrait, DatabaseConnection, EntityTrait, IntoActiveModel, QueryFilter, QuerySelect, }; diff --git a/rust/api-server/api/src/inventory/mod.rs b/rust/api-server/api/src/inventory/mod.rs index c67629c..4f616b3 100644 --- a/rust/api-server/api/src/inventory/mod.rs +++ b/rust/api-server/api/src/inventory/mod.rs @@ -11,8 +11,8 @@ use entity::{cargo_desc, inventory, item_desc}; use log::{debug, error, info}; use migration::OnConflict; use sea_orm::{ - sea_query, ColumnTrait, DatabaseConnection, EntityTrait, IntoActiveModel, QueryFilter, - QuerySelect, + ColumnTrait, DatabaseConnection, EntityTrait, IntoActiveModel, QueryFilter, QuerySelect, + sea_query, }; use serde::{Deserialize, Serialize}; use serde_json::Value; diff --git a/rust/api-server/api/src/items/mod.rs b/rust/api-server/api/src/items/mod.rs index 5927b79..eff73e6 100644 --- a/rust/api-server/api/src/items/mod.rs +++ b/rust/api-server/api/src/items/mod.rs @@ -1,15 +1,15 @@ use crate::config::Config; use crate::{AppState, Params}; +use axum::Json; use axum::extract::{Query, State}; use axum::http::StatusCode; -use axum::Json; use entity::item_desc; use log::{debug, error, info}; use reqwest::Client; use sea_orm::{ - sea_query, ColumnTrait, DatabaseConnection, EntityTrait, IntoActiveModel, QueryFilter, + ColumnTrait, DatabaseConnection, EntityTrait, IntoActiveModel, QueryFilter, sea_query, }; -use serde_json::{json, Value}; +use serde_json::{Value, json}; use service::Query as QueryCore; use std::collections::HashMap; use std::fs::File; diff --git a/rust/api-server/api/src/leaderboard/mod.rs b/rust/api-server/api/src/leaderboard/mod.rs index d4590c8..5faa2de 100644 --- a/rust/api-server/api/src/leaderboard/mod.rs +++ b/rust/api-server/api/src/leaderboard/mod.rs @@ -1,6 +1,6 @@ use crate::claims::ClaimDescriptionState; use crate::websocket::{Table, TableWithOriginalEventTransactionUpdate, WebSocketMessages}; -use crate::{leaderboard, AppRouter, AppState}; +use crate::{AppRouter, AppState, leaderboard}; use axum::extract::{Path, State}; use axum::http::StatusCode; use axum::routing::get; @@ -9,7 +9,7 @@ use entity::experience_state; use log::{debug, error, info}; use migration::OnConflict; use sea_orm::IntoActiveModel; -use sea_orm::{sea_query, ColumnTrait, DatabaseConnection, EntityTrait, QueryFilter, QuerySelect}; +use sea_orm::{ColumnTrait, DatabaseConnection, EntityTrait, QueryFilter, QuerySelect, sea_query}; use serde::{Deserialize, Serialize}; use serde_json::Value; use service::Query; diff --git a/rust/api-server/api/src/lib.rs b/rust/api-server/api/src/lib.rs index 3153b2c..84772f8 100644 --- a/rust/api-server/api/src/lib.rs +++ b/rust/api-server/api/src/lib.rs @@ -20,10 +20,10 @@ mod vault_state; mod websocket; use axum::{ + Router, http::StatusCode, middleware, routing::{get, get_service}, - Router, }; use service::sea_orm::{Database, DatabaseConnection}; use std::collections::{HashMap, HashSet}; @@ -32,8 +32,8 @@ use tower_http::cors::{Any, CorsLayer}; use crate::config::Config; use crate::websocket::WebSocketMessages; use axum::extract::{ - ws::{Message, WebSocket, WebSocketUpgrade}, MatchedPath, Request, State, + ws::{Message, WebSocket, WebSocketUpgrade}, }; use axum::http::{HeaderValue, Version}; use axum::middleware::Next; @@ -44,8 +44,8 @@ use futures::{SinkExt, StreamExt}; use log::{error, info}; use metrics_exporter_prometheus::{Matcher, PrometheusBuilder, PrometheusHandle}; use migration::{Migrator, MigratorTrait}; -use reqwest::header::HeaderMap; use reqwest::Client; +use reqwest::header::HeaderMap; use sea_orm::ConnectOptions; use serde::Deserialize; use std::env; @@ -55,8 +55,8 @@ use std::ops::{AddAssign, SubAssign}; use std::path::PathBuf; use std::sync::Arc; use std::time::{Duration, Instant}; -use tokio::sync::mpsc::{UnboundedReceiver, UnboundedSender}; use tokio::sync::RwLock; +use tokio::sync::mpsc::{UnboundedReceiver, UnboundedSender}; use tower_cookies::CookieManagerLayer; use tower_http::compression::CompressionLayer; use tower_http::services::ServeDir; diff --git a/rust/api-server/api/src/locations/mod.rs b/rust/api-server/api/src/locations/mod.rs index cb590e1..6c4bb7c 100644 --- a/rust/api-server/api/src/locations/mod.rs +++ b/rust/api-server/api/src/locations/mod.rs @@ -1,8 +1,8 @@ use crate::{AppState, Params}; +use axum::Json; use axum::extract::{Query, State}; use axum::http::StatusCode; -use axum::Json; -use serde_json::{json, Value}; +use serde_json::{Value, json}; use service::Query as QueryCore; pub(crate) async fn list_locations( diff --git a/rust/api-server/api/src/player_state/mod.rs b/rust/api-server/api/src/player_state/mod.rs index 46d7846..3028f8f 100644 --- a/rust/api-server/api/src/player_state/mod.rs +++ b/rust/api-server/api/src/player_state/mod.rs @@ -9,9 +9,9 @@ use entity::{player_state, player_username_state}; use log::{debug, error, info}; use migration::OnConflict; use sea_orm::IntoActiveModel; -use sea_orm::{sea_query, ColumnTrait, DatabaseConnection, EntityTrait, QueryFilter, QuerySelect}; +use sea_orm::{ColumnTrait, DatabaseConnection, EntityTrait, QueryFilter, QuerySelect, sea_query}; use serde::Deserialize; -use serde_json::{json, Value}; +use serde_json::{Value, json}; use service::Query as QueryCore; use std::collections::{HashMap, HashSet}; use std::fs::File; diff --git a/rust/api-server/api/src/vault_state/mod.rs b/rust/api-server/api/src/vault_state/mod.rs index c6f4906..73f5f63 100644 --- a/rust/api-server/api/src/vault_state/mod.rs +++ b/rust/api-server/api/src/vault_state/mod.rs @@ -4,7 +4,7 @@ use entity::{vault_state, vault_state_collectibles}; use log::{debug, error, info}; use migration::OnConflict; use sea_orm::IntoActiveModel; -use sea_orm::{sea_query, ColumnTrait, DatabaseConnection, EntityTrait, QueryFilter, QuerySelect}; +use sea_orm::{ColumnTrait, DatabaseConnection, EntityTrait, QueryFilter, QuerySelect, sea_query}; use std::collections::{HashMap, HashSet}; async fn get_known_player_state_ids(conn: &DatabaseConnection) -> anyhow::Result> { diff --git a/rust/api-server/api/src/websocket.rs b/rust/api-server/api/src/websocket.rs index e2877b0..a7666a3 100644 --- a/rust/api-server/api/src/websocket.rs +++ b/rust/api-server/api/src/websocket.rs @@ -1,12 +1,12 @@ use crate::config::Config; use crate::{ - buildings, claim_tech_state, claims, collectible_desc, deployable_state, inventory, - leaderboard, player_state, vault_state, AppState, + AppState, buildings, claim_tech_state, claims, collectible_desc, deployable_state, inventory, + leaderboard, player_state, vault_state, }; use ::entity::raw_event_data::Model as RawEventData; use ::entity::user_state; -use axum::http::header::SEC_WEBSOCKET_PROTOCOL; use axum::http::HeaderMap; +use axum::http::header::SEC_WEBSOCKET_PROTOCOL; use base64::Engine; #[allow(unused_imports)] use entity::{raw_event_data, skill_desc}; @@ -306,7 +306,10 @@ pub fn start_websocket_bitcraft_logic( match serde_json::from_str(&row) { Ok(user_state) => user_state, Err(error) => { - error!("InitialSubscription Insert user_state Error: {:?} -> {:?}", error, row); + error!( + "InitialSubscription Insert user_state Error: {:?} -> {:?}", + error, row + ); continue; } }; @@ -398,9 +401,9 @@ pub fn start_websocket_bitcraft_logic( if result.is_err() { error!( - "claim_description_state initial subscription failed: {:?}", - result.err() - ); + "claim_description_state initial subscription failed: {:?}", + result.err() + ); } } @@ -475,7 +478,10 @@ pub fn start_websocket_bitcraft_logic( match serde_json::from_str(&row) { Ok(claim_tile_state) => claim_tile_state, Err(error) => { - error!("InitialSubscription Insert claim_tile_state Error: {:?} -> {:?}", error, row); + error!( + "InitialSubscription Insert claim_tile_state Error: {:?} -> {:?}", + error, row + ); continue; } }; @@ -535,7 +541,10 @@ pub fn start_websocket_bitcraft_logic( match serde_json::from_str(&row) { Ok(action_state) => action_state, Err(error) => { - error!("InitialSubscription Insert action_state Error: {:?} -> {:?}", error, row); + error!( + "InitialSubscription Insert action_state Error: {:?} -> {:?}", + error, row + ); continue; } }; @@ -728,7 +737,10 @@ pub fn start_websocket_bitcraft_logic( match serde_json::from_str(&row) { Ok(mobile_entity_state) => mobile_entity_state, Err(error) => { - error!("InitialSubscription Insert mobile_entity_state Error: {:?} -> {:?}", error, row); + error!( + "InitialSubscription Insert mobile_entity_state Error: {:?} -> {:?}", + error, row + ); continue; } }; @@ -744,7 +756,10 @@ pub fn start_websocket_bitcraft_logic( match serde_json::from_str(&row) { Ok(mobile_entity_state) => mobile_entity_state, Err(error) => { - error!("InitialSubscription Insert mobile_entity_state Error: {:?} -> {:?}", error, row); + error!( + "InitialSubscription Insert mobile_entity_state Error: {:?} -> {:?}", + error, row + ); continue; } }; @@ -907,7 +922,10 @@ pub fn start_websocket_bitcraft_logic( match serde_json::from_str(&row) { Ok(claim_tile_state) => claim_tile_state, Err(error) => { - error!("InitialSubscription Insert claim_tile_state Error: {:?} -> {:?}", error, row); + error!( + "InitialSubscription Insert claim_tile_state Error: {:?} -> {:?}", + error, row + ); continue; } }; @@ -926,7 +944,10 @@ pub fn start_websocket_bitcraft_logic( match serde_json::from_str(&row) { Ok(action_state) => action_state, Err(error) => { - error!("InitialSubscription Insert action_state Error: {:?} -> {:?}", error, row); + error!( + "InitialSubscription Insert action_state Error: {:?} -> {:?}", + error, row + ); continue; } }; @@ -959,7 +980,10 @@ pub fn start_websocket_bitcraft_logic( match serde_json::from_str(&row) { Ok(player_action_state) => player_action_state, Err(error) => { - error!("InitialSubscription Insert player_action_state Error: {:?} -> {:?}", error, row); + error!( + "InitialSubscription Insert player_action_state Error: {:?} -> {:?}", + error, row + ); continue; } }; diff --git a/rust/api-server/entity/src/building_desc.rs b/rust/api-server/entity/src/building_desc.rs index e65ad2e..3214193 100644 --- a/rust/api-server/entity/src/building_desc.rs +++ b/rust/api-server/entity/src/building_desc.rs @@ -1,7 +1,7 @@ //! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.15 -use sea_orm::entity::prelude::*; use sea_orm::FromJsonQueryResult; +use sea_orm::entity::prelude::*; use serde::{Deserialize, Serialize}; #[derive(Clone, Debug, PartialEq, DeriveEntityModel, Serialize, Deserialize)] diff --git a/rust/api-server/entity/src/crafting_recipe.rs b/rust/api-server/entity/src/crafting_recipe.rs index 16ecda5..8ceced0 100644 --- a/rust/api-server/entity/src/crafting_recipe.rs +++ b/rust/api-server/entity/src/crafting_recipe.rs @@ -1,7 +1,7 @@ //! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.15 -use sea_orm::entity::prelude::*; use sea_orm::FromJsonQueryResult; +use sea_orm::entity::prelude::*; use serde::{Deserialize, Serialize}; #[derive(Clone, Debug, PartialEq, Serialize, Deserialize, FromJsonQueryResult)] diff --git a/rust/api-server/entity/src/inventory_changelog.rs b/rust/api-server/entity/src/inventory_changelog.rs index 6fb46c7..16e8e3a 100644 --- a/rust/api-server/entity/src/inventory_changelog.rs +++ b/rust/api-server/entity/src/inventory_changelog.rs @@ -1,5 +1,5 @@ -use sea_orm::entity::prelude::*; use sea_orm::FromJsonQueryResult; +use sea_orm::entity::prelude::*; use serde::{Deserialize, Serialize}; #[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)] diff --git a/rust/api-server/entity/src/player_action_state.rs b/rust/api-server/entity/src/player_action_state.rs index 6ef331f..c104145 100644 --- a/rust/api-server/entity/src/player_action_state.rs +++ b/rust/api-server/entity/src/player_action_state.rs @@ -2,7 +2,7 @@ use sea_orm::entity::prelude::*; use serde::de::{MapAccess, SeqAccess, Visitor}; -use serde::{de, Deserialize, Deserializer, Serialize}; +use serde::{Deserialize, Deserializer, Serialize, de}; use std::fmt; #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] diff --git a/rust/api-server/entity/src/user_state.rs b/rust/api-server/entity/src/user_state.rs index 9df3ec6..d3a0034 100644 --- a/rust/api-server/entity/src/user_state.rs +++ b/rust/api-server/entity/src/user_state.rs @@ -1,7 +1,7 @@ //! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.15 -use sea_orm::entity::prelude::*; use sea_orm::FromJsonQueryResult; +use sea_orm::entity::prelude::*; use serde::{Deserialize, Serialize}; #[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]