cargo fmt

Author: Astralchroma

src/endpoints/account.rs

@@ -1,13 +1,13 @@
 use std::collections::HashMap;
 
-use crate::{errors::ApiError, extractors::Authentication, id::Id, ApiState};
-use axum::{extract::Path, extract::Query, extract::State, Json};
-use base64::{engine::general_purpose::STANDARD_NO_PAD, Engine};
+use crate::{ApiState, errors::ApiError, extractors::Authentication, id::Id};
+use axum::{Json, extract::Path, extract::Query, extract::State};
+use base64::{Engine, engine::general_purpose::STANDARD_NO_PAD};
 use chrono::{DateTime, TimeDelta, Utc};
 use reqwest::StatusCode;
 use serde::{Deserialize, Serialize};
 use serde_json::json;
-use sqlx::{query, query_as, PgPool};
+use sqlx::{PgPool, query, query_as};
 use uuid::Uuid;
 
 use super::{channel::Persistence, user::Activity};

src/endpoints/channel.rs

@@ -1,14 +1,14 @@
-use crate::{errors::ApiError, extractors::Authentication, id::Id, ApiState};
+use crate::{ApiState, errors::ApiError, extractors::Authentication, id::Id};
 use axum::{
-	extract::{Path, Query, State},
 	Json,
+	extract::{Path, Query, State},
 };
 use chrono::{DateTime, Duration, TimeDelta, Utc};
 use garde::Validate;
 use reqwest::StatusCode;
 use serde::{Deserialize, Serialize};
-use serde_json::{json, Value};
-use sqlx::{query, PgPool};
+use serde_json::{Value, json};
+use sqlx::{PgPool, query};
 use std::str::FromStr;
 use uuid::Uuid;
 
@@ -163,8 +163,13 @@ pub async fn delete(
 		.execute(&database)
 		.await?;
 	} else {
-		query!("UPDATE channel_memberships SET channels = array_remove(channels, $2) WHERE player = $1 AND $2 = ANY(channels)", &uuid, &channel.id as _)
-		.execute(&database).await?;
+		query!(
+			"UPDATE channel_memberships SET channels = array_remove(channels, $2) WHERE player = $1 AND $2 = ANY(channels)",
+			&uuid,
+			&channel.id as _
+		)
+		.execute(&database)
+		.await?;
 	}
 
 	Ok(StatusCode::OK)

src/endpoints/global_data.rs

@@ -1,16 +1,16 @@
-use crate::{errors::ApiError, ApiState};
+use crate::{ApiState, errors::ApiError};
 use axum::{
+	Json,
 	extract::{FromRequestParts, State},
 	http::{self, request::Parts},
-	Json,
 };
 use chrono::{DateTime, Utc};
 use dashmap::DashMap;
 use regex::Regex;
 use reqwest::{Client, StatusCode};
 use serde::Serialize;
 use serde_json::Value;
-use sqlx::{query, PgPool};
+use sqlx::{PgPool, query};
 use std::{fmt::Write, fs::read_to_string, sync::LazyLock};
 
 const PROJECT_ID: &str = "p2rxzX0q";

src/endpoints/hypixel.rs

@@ -1,11 +1,11 @@
-use crate::{errors::ApiError, extractors::Authentication, ApiState, ClArgs};
-use axum::{body::Body, extract::State, response::IntoResponse, response::Response, Json};
+use crate::{ApiState, ClArgs, errors::ApiError, extractors::Authentication};
+use axum::{Json, body::Body, extract::State, response::IntoResponse, response::Response};
 use chrono::Utc;
 use log::warn;
 use mini_moka::sync::{Cache, CacheBuilder};
 use reqwest::{Client, StatusCode};
 use serde::{Deserialize, Serialize};
-use serde_json::{json, Value};
+use serde_json::{Value, json};
 use std::{
 	collections::{HashMap, VecDeque},
 	fs::read_to_string,

src/endpoints/image.rs

@@ -1,10 +1,10 @@
 use axum::{
+	Json,
 	body::Bytes,
 	extract::{Path, Query, State},
 	response::Html,
-	Json,
 };
-use base64::{engine::general_purpose::STANDARD_NO_PAD, Engine};
+use base64::{Engine, engine::general_purpose::STANDARD_NO_PAD};
 use bytes::Buf;
 use chrono::{DateTime, Utc};
 use reqwest::StatusCode;
@@ -13,10 +13,10 @@ use sqlx::query;
 use uuid::Uuid;
 
 use crate::{
+	ApiState,
 	errors::{ApiError, TaskError},
 	extractors::Authentication,
 	id::Id,
-	ApiState,
 };
 
 #[derive(Serialize)]
@@ -102,11 +102,7 @@ pub async fn get_view(
 	let base_url = match &cl_args.domain_name {
 		Some(name) => {
 			let n = name.to_owned();
-			if !n.ends_with("/") {
-				n + "/"
-			} else {
-				n
-			}
+			if !n.ends_with("/") { n + "/" } else { n }
 		}
 		None => "https://api.axolotlclient.com/v1/".to_owned(),
 	};
@@ -191,11 +187,7 @@ pub async fn get_oembed(
 	let base_url = match &cl_args.domain_name {
 		Some(name) => {
 			let n = name.to_owned();
-			if !n.ends_with("/") {
-				n + "/"
-			} else {
-				n
-			}
+			if !n.ends_with("/") { n + "/" } else { n }
 		}
 		None => "https://api.axolotlclient.com/v1/".to_owned(),
 	};

src/endpoints/mod.rs

@@ -1,10 +1,10 @@
-use crate::{errors::ApiError, ApiState};
-use axum::{extract::Query, extract::State, http::StatusCode, response::IntoResponse, Json};
-use base64::{engine::general_purpose::STANDARD_NO_PAD, Engine};
+use crate::{ApiState, errors::ApiError};
+use axum::{Json, extract::Query, extract::State, http::StatusCode, response::IntoResponse};
+use base64::{Engine, engine::general_purpose::STANDARD_NO_PAD};
 use blake2::{Blake2b512, Digest};
 use garde::Validate;
 use serde::{Deserialize, Serialize};
-use sqlx::{error::ErrorKind::UniqueViolation, query, query_as, query_scalar, Type};
+use sqlx::{Type, error::ErrorKind::UniqueViolation, query, query_as, query_scalar};
 use std::ops::Deref;
 use uuid::Uuid;
 

src/endpoints/user.rs

@@ -1,14 +1,14 @@
-use crate::{errors::ApiError, extractors::Authentication, ApiState};
+use crate::{ApiState, errors::ApiError, extractors::Authentication};
 use axum::{
-	extract::{Path, Query, State},
 	Json,
+	extract::{Path, Query, State},
 };
 use chrono::{DateTime, Utc};
 use log::warn;
 use reqwest::StatusCode;
 use serde::{Deserialize, Serialize};
 use serde_json::Value;
-use sqlx::{query, query_scalar, Type};
+use sqlx::{Type, query, query_scalar};
 use uuid::Uuid;
 
 #[derive(Serialize)]

src/extractors.rs

@@ -1,9 +1,9 @@
-use crate::{errors::ApiError, ApiState};
+use crate::{ApiState, errors::ApiError};
 use axum::{
 	extract::{FromRequestParts, OptionalFromRequestParts},
-	http::{self, request::Parts, StatusCode},
+	http::{self, StatusCode, request::Parts},
 };
-use base64::{engine::general_purpose::STANDARD_NO_PAD, Engine};
+use base64::{Engine, engine::general_purpose::STANDARD_NO_PAD};
 use sqlx::query;
 use uuid::Uuid;
 

src/gateway.rs

@@ -1,14 +1,14 @@
 use crate::extractors::UserAgent;
-use crate::{errors::ApiError, extractors::Authentication, ApiState};
-use axum::extract::{ws::close_code, ws::CloseFrame, ws::Message, ws::WebSocket, State, WebSocketUpgrade};
+use crate::{ApiState, errors::ApiError, extractors::Authentication};
+use DisconnectReason::*;
+use axum::extract::{State, WebSocketUpgrade, ws::CloseFrame, ws::Message, ws::WebSocket, ws::close_code};
 use axum::{body::Body, response::Response};
 use log::warn;
 use sqlx::query;
 use std::{convert::Infallible, fmt::Display, fmt::Formatter, time::Duration};
-use tokio::sync::mpsc::{unbounded_channel, UnboundedReceiver};
-use tokio::{pin, select, time::sleep, time::Instant};
+use tokio::sync::mpsc::{UnboundedReceiver, unbounded_channel};
+use tokio::{pin, select, time::Instant, time::sleep};
 use uuid::Uuid;
-use DisconnectReason::*;
 
 pub async fn gateway(
 	state: State<ApiState>,

src/id.rs

@@ -1,6 +1,6 @@
 use chrono::Utc;
 use serde::{Deserialize, Serialize};
-use sqlx::{encode::IsNull, error::BoxDynError, Database, Decode, Encode, Type};
+use sqlx::{Database, Decode, Encode, Type, encode::IsNull, error::BoxDynError};
 use std::{cell::Cell, cell::RefCell, ops::Deref, sync::atomic::AtomicU8, sync::atomic::Ordering::Relaxed};
 
 #[derive(Deserialize, Serialize)]