style: cargo clippy & cargo fmt
This commit is contained in:
parent
19f64d413c
commit
e59f7b5a1f
20 changed files with 137 additions and 67 deletions
|
@ -10,10 +10,7 @@ use crate::{
|
|||
Data,
|
||||
error::Error,
|
||||
schema::*,
|
||||
utils::{
|
||||
PASSWORD_REGEX, generate_token, new_refresh_token_cookie,
|
||||
user_uuid_from_identifier,
|
||||
},
|
||||
utils::{PASSWORD_REGEX, generate_token, new_refresh_token_cookie, user_uuid_from_identifier},
|
||||
};
|
||||
|
||||
use super::Response;
|
||||
|
|
|
@ -42,7 +42,7 @@ pub async fn res(req: HttpRequest, data: web::Data<Data>) -> Result<HttpResponse
|
|||
.execute(&mut conn)
|
||||
.await
|
||||
{
|
||||
error!("{}", error);
|
||||
error!("{error}");
|
||||
}
|
||||
|
||||
refresh_token_cookie.make_removal();
|
||||
|
@ -70,7 +70,7 @@ pub async fn res(req: HttpRequest, data: web::Data<Data>) -> Result<HttpResponse
|
|||
refresh_token = new_refresh_token;
|
||||
}
|
||||
Err(error) => {
|
||||
error!("{}", error);
|
||||
error!("{error}");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -12,11 +12,17 @@ use uuid::Uuid;
|
|||
|
||||
use super::Response;
|
||||
use crate::{
|
||||
error::Error, objects::Member, schema::{
|
||||
access_tokens::{self, dsl as adsl}, refresh_tokens::{self, dsl as rdsl}, users::{self, dsl as udsl}
|
||||
}, utils::{
|
||||
generate_token, new_refresh_token_cookie, EMAIL_REGEX, PASSWORD_REGEX, USERNAME_REGEX
|
||||
}, Data
|
||||
Data,
|
||||
error::Error,
|
||||
objects::Member,
|
||||
schema::{
|
||||
access_tokens::{self, dsl as adsl},
|
||||
refresh_tokens::{self, dsl as rdsl},
|
||||
users::{self, dsl as udsl},
|
||||
},
|
||||
utils::{
|
||||
EMAIL_REGEX, PASSWORD_REGEX, USERNAME_REGEX, generate_token, new_refresh_token_cookie,
|
||||
},
|
||||
};
|
||||
|
||||
#[derive(Deserialize)]
|
||||
|
|
|
@ -72,8 +72,7 @@ pub async fn post(
|
|||
reset_password: web::Json<ResetPassword>,
|
||||
data: web::Data<Data>,
|
||||
) -> Result<HttpResponse, Error> {
|
||||
let password_reset_token =
|
||||
PasswordResetToken::get(&data, reset_password.token.clone()).await?;
|
||||
let password_reset_token = PasswordResetToken::get(&data, reset_password.token.clone()).await?;
|
||||
|
||||
password_reset_token
|
||||
.set_password(&data, reset_password.password.clone())
|
||||
|
|
|
@ -4,7 +4,11 @@ pub mod messages;
|
|||
pub mod socket;
|
||||
|
||||
use crate::{
|
||||
api::v1::auth::check_access_token, error::Error, objects::{Channel, Member, Permissions}, utils::{get_auth_header, global_checks}, Data
|
||||
Data,
|
||||
api::v1::auth::check_access_token,
|
||||
error::Error,
|
||||
objects::{Channel, Member, Permissions},
|
||||
utils::{get_auth_header, global_checks},
|
||||
};
|
||||
use actix_web::{HttpRequest, HttpResponse, delete, get, patch, web};
|
||||
use serde::Deserialize;
|
||||
|
@ -57,7 +61,9 @@ pub async fn delete(
|
|||
|
||||
let member = Member::check_membership(&mut conn, uuid, channel.guild_uuid).await?;
|
||||
|
||||
member.check_permission(&data, Permissions::DeleteChannel).await?;
|
||||
member
|
||||
.check_permission(&data, Permissions::DeleteChannel)
|
||||
.await?;
|
||||
|
||||
channel.delete(&data).await?;
|
||||
|
||||
|
@ -125,7 +131,9 @@ pub async fn patch(
|
|||
|
||||
let member = Member::check_membership(&mut conn, uuid, channel.guild_uuid).await?;
|
||||
|
||||
member.check_permission(&data, Permissions::ManageChannel).await?;
|
||||
member
|
||||
.check_permission(&data, Permissions::ManageChannel)
|
||||
.await?;
|
||||
|
||||
if let Some(new_name) = &new_info.name {
|
||||
channel.set_name(&data, new_name.to_string()).await?;
|
||||
|
|
|
@ -1,5 +1,9 @@
|
|||
use crate::{
|
||||
api::v1::auth::check_access_token, error::Error, objects::{Channel, Member, Permissions}, utils::{get_auth_header, global_checks, order_by_is_above}, Data
|
||||
Data,
|
||||
api::v1::auth::check_access_token,
|
||||
error::Error,
|
||||
objects::{Channel, Member, Permissions},
|
||||
utils::{get_auth_header, global_checks, order_by_is_above},
|
||||
};
|
||||
use ::uuid::Uuid;
|
||||
use actix_web::{HttpRequest, HttpResponse, get, post, web};
|
||||
|
@ -31,7 +35,7 @@ pub async fn get(
|
|||
|
||||
Member::check_membership(&mut conn, uuid, guild_uuid).await?;
|
||||
|
||||
if let Ok(cache_hit) = data.get_cache_key(format!("{}_channels", guild_uuid)).await {
|
||||
if let Ok(cache_hit) = data.get_cache_key(format!("{guild_uuid}_channels")).await {
|
||||
return Ok(HttpResponse::Ok()
|
||||
.content_type("application/json")
|
||||
.body(cache_hit));
|
||||
|
@ -42,7 +46,7 @@ pub async fn get(
|
|||
let channels_ordered = order_by_is_above(channels).await?;
|
||||
|
||||
data.set_cache_key(
|
||||
format!("{}_channels", guild_uuid),
|
||||
format!("{guild_uuid}_channels"),
|
||||
channels_ordered.clone(),
|
||||
1800,
|
||||
)
|
||||
|
@ -72,7 +76,9 @@ pub async fn create(
|
|||
|
||||
let member = Member::check_membership(&mut conn, uuid, guild_uuid).await?;
|
||||
|
||||
member.check_permission(&data, Permissions::CreateChannel).await?;
|
||||
member
|
||||
.check_permission(&data, Permissions::CreateChannel)
|
||||
.await?;
|
||||
|
||||
let channel = Channel::new(
|
||||
data.clone(),
|
||||
|
|
|
@ -5,7 +5,11 @@ use futures_util::StreamExt as _;
|
|||
use uuid::Uuid;
|
||||
|
||||
use crate::{
|
||||
api::v1::auth::check_access_token, error::Error, objects::{Guild, Member, Permissions}, utils::{get_auth_header, global_checks}, Data
|
||||
Data,
|
||||
api::v1::auth::check_access_token,
|
||||
error::Error,
|
||||
objects::{Guild, Member, Permissions},
|
||||
utils::{get_auth_header, global_checks},
|
||||
};
|
||||
|
||||
/// `PUT /api/v1/guilds/{uuid}/icon` Icon upload
|
||||
|
@ -34,7 +38,9 @@ pub async fn upload(
|
|||
|
||||
let member = Member::check_membership(&mut conn, uuid, guild_uuid).await?;
|
||||
|
||||
member.check_permission(&data, Permissions::ManageServer).await?;
|
||||
member
|
||||
.check_permission(&data, Permissions::ManageServer)
|
||||
.await?;
|
||||
|
||||
let mut guild = Guild::fetch_one(&mut conn, guild_uuid).await?;
|
||||
|
||||
|
|
|
@ -3,7 +3,11 @@ use serde::Deserialize;
|
|||
use uuid::Uuid;
|
||||
|
||||
use crate::{
|
||||
api::v1::auth::check_access_token, error::Error, objects::{Guild, Member, Permissions}, utils::{get_auth_header, global_checks}, Data
|
||||
Data,
|
||||
api::v1::auth::check_access_token,
|
||||
error::Error,
|
||||
objects::{Guild, Member, Permissions},
|
||||
utils::{get_auth_header, global_checks},
|
||||
};
|
||||
|
||||
#[derive(Deserialize)]
|
||||
|
@ -59,11 +63,15 @@ pub async fn create(
|
|||
|
||||
let member = Member::check_membership(&mut conn, uuid, guild_uuid).await?;
|
||||
|
||||
member.check_permission(&data, Permissions::CreateInvite).await?;
|
||||
member
|
||||
.check_permission(&data, Permissions::CreateInvite)
|
||||
.await?;
|
||||
|
||||
let guild = Guild::fetch_one(&mut conn, guild_uuid).await?;
|
||||
|
||||
let invite = guild.create_invite(&mut conn, uuid, invite_request.custom_id.clone()).await?;
|
||||
let invite = guild
|
||||
.create_invite(&mut conn, uuid, invite_request.custom_id.clone())
|
||||
.await?;
|
||||
|
||||
Ok(HttpResponse::Ok().json(invite))
|
||||
}
|
||||
|
|
|
@ -3,7 +3,11 @@ use actix_web::{HttpRequest, HttpResponse, get, post, web};
|
|||
use serde::Deserialize;
|
||||
|
||||
use crate::{
|
||||
api::v1::auth::check_access_token, error::Error, objects::{Member, Permissions, Role}, utils::{get_auth_header, global_checks, order_by_is_above}, Data
|
||||
Data,
|
||||
api::v1::auth::check_access_token,
|
||||
error::Error,
|
||||
objects::{Member, Permissions, Role},
|
||||
utils::{get_auth_header, global_checks, order_by_is_above},
|
||||
};
|
||||
|
||||
pub mod uuid;
|
||||
|
@ -31,7 +35,7 @@ pub async fn get(
|
|||
|
||||
Member::check_membership(&mut conn, uuid, guild_uuid).await?;
|
||||
|
||||
if let Ok(cache_hit) = data.get_cache_key(format!("{}_roles", guild_uuid)).await {
|
||||
if let Ok(cache_hit) = data.get_cache_key(format!("{guild_uuid}_roles")).await {
|
||||
return Ok(HttpResponse::Ok()
|
||||
.content_type("application/json")
|
||||
.body(cache_hit));
|
||||
|
@ -41,7 +45,7 @@ pub async fn get(
|
|||
|
||||
let roles_ordered = order_by_is_above(roles).await?;
|
||||
|
||||
data.set_cache_key(format!("{}_roles", guild_uuid), roles_ordered.clone(), 1800)
|
||||
data.set_cache_key(format!("{guild_uuid}_roles"), roles_ordered.clone(), 1800)
|
||||
.await?;
|
||||
|
||||
Ok(HttpResponse::Ok().json(roles_ordered))
|
||||
|
@ -68,7 +72,9 @@ pub async fn create(
|
|||
|
||||
let member = Member::check_membership(&mut conn, uuid, guild_uuid).await?;
|
||||
|
||||
member.check_permission(&data, Permissions::CreateRole).await?;
|
||||
member
|
||||
.check_permission(&data, Permissions::CreateRole)
|
||||
.await?;
|
||||
|
||||
let role = Role::new(&mut conn, guild_uuid, role_info.name.clone()).await?;
|
||||
|
||||
|
|
|
@ -28,7 +28,7 @@ pub async fn get(
|
|||
|
||||
Member::check_membership(&mut conn, uuid, guild_uuid).await?;
|
||||
|
||||
if let Ok(cache_hit) = data.get_cache_key(format!("{}", role_uuid)).await {
|
||||
if let Ok(cache_hit) = data.get_cache_key(format!("{role_uuid}")).await {
|
||||
return Ok(HttpResponse::Ok()
|
||||
.content_type("application/json")
|
||||
.body(cache_hit));
|
||||
|
@ -36,7 +36,7 @@ pub async fn get(
|
|||
|
||||
let role = Role::fetch_one(&mut conn, role_uuid).await?;
|
||||
|
||||
data.set_cache_key(format!("{}", role_uuid), role.clone(), 60)
|
||||
data.set_cache_key(format!("{role_uuid}"), role.clone(), 60)
|
||||
.await?;
|
||||
|
||||
Ok(HttpResponse::Ok().json(role))
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue