From f3092185732132f04ad12a86533e393e47534202 Mon Sep 17 00:00:00 2001 From: Zomatree Date: Wed, 15 Mar 2023 19:47:30 +0000 Subject: [PATCH] chore: cleanup code --- crates/delta/build.rs | 2 +- crates/delta/src/routes/servers/channel_create.rs | 9 ++------- crates/quark/src/events/impl.rs | 2 +- crates/quark/src/impl/mongo/media/attachment.rs | 2 +- crates/quark/src/impl/mongo/users/user.rs | 2 +- crates/quark/src/models/channels/message.rs | 9 ++------- crates/quark/src/models/media/attachment.rs | 9 ++------- crates/quark/src/tasks/ack.rs | 1 - crates/quark/src/tasks/last_message_id.rs | 1 - crates/quark/src/tasks/web_push.rs | 1 - crates/quark/src/web/ratelimiter.rs | 2 +- 11 files changed, 11 insertions(+), 29 deletions(-) diff --git a/crates/delta/build.rs b/crates/delta/build.rs index 981237b4..098d7b25 100644 --- a/crates/delta/build.rs +++ b/crates/delta/build.rs @@ -8,7 +8,7 @@ fn main() { .output() { if let Ok(git_origin) = String::from_utf8(output.stdout) { - println!("cargo:rustc-env=GIT_ORIGIN_URL={}", git_origin); + println!("cargo:rustc-env=GIT_ORIGIN_URL={git_origin}"); } } diff --git a/crates/delta/src/routes/servers/channel_create.rs b/crates/delta/src/routes/servers/channel_create.rs index aff4f964..1c777639 100644 --- a/crates/delta/src/routes/servers/channel_create.rs +++ b/crates/delta/src/routes/servers/channel_create.rs @@ -11,20 +11,15 @@ use ulid::Ulid; use validator::Validate; /// # Channel Type -#[derive(Serialize, Deserialize, JsonSchema)] +#[derive(Serialize, Deserialize, JsonSchema, Default)] enum ChannelType { /// Text Channel + #[default] Text, /// Voice Channel Voice, } -impl Default for ChannelType { - fn default() -> Self { - ChannelType::Text - } -} - /// # Channel Data #[derive(Validate, Serialize, Deserialize, JsonSchema)] pub struct DataCreateChannel { diff --git a/crates/quark/src/events/impl.rs b/crates/quark/src/events/impl.rs index d4b36c19..6010e6f0 100644 --- a/crates/quark/src/events/impl.rs +++ b/crates/quark/src/events/impl.rs @@ -557,7 +557,7 @@ impl EventV1 { /// Publish private event pub async fn private(self, id: String) { - self.p(format!("{}!", id)).await; + self.p(format!("{id}!")).await; } /// Publish internal global event diff --git a/crates/quark/src/impl/mongo/media/attachment.rs b/crates/quark/src/impl/mongo/media/attachment.rs index caeae66a..204ca712 100644 --- a/crates/quark/src/impl/mongo/media/attachment.rs +++ b/crates/quark/src/impl/mongo/media/attachment.rs @@ -37,7 +37,7 @@ impl AbstractAttachment for MongoDb { parent_type: &str, parent_id: &str, ) -> Result { - let key = format!("{}_id", parent_type); + let key = format!("{parent_type}_id"); match self .find_one::( COL, diff --git a/crates/quark/src/impl/mongo/users/user.rs b/crates/quark/src/impl/mongo/users/user.rs index e7dd2383..bbfe84f1 100644 --- a/crates/quark/src/impl/mongo/users/user.rs +++ b/crates/quark/src/impl/mongo/users/user.rs @@ -264,7 +264,7 @@ impl AbstractUser for MongoDb { [ { "_id": target_id, - "status": format!("{:?}", relationship) + "status": format!("{relationship:?}") } ] ] diff --git a/crates/quark/src/models/channels/message.rs b/crates/quark/src/models/channels/message.rs index 71e89f16..62cb080f 100644 --- a/crates/quark/src/models/channels/message.rs +++ b/crates/quark/src/models/channels/message.rs @@ -157,10 +157,11 @@ pub struct Message { /// # Message Sort /// /// Sort used for retrieving messages -#[derive(Serialize, Deserialize, JsonSchema, Debug)] +#[derive(Serialize, Deserialize, JsonSchema, Debug, Default)] #[cfg_attr(feature = "rocket_impl", derive(FromFormField))] pub enum MessageSort { /// Sort by the most relevant messages + #[default] Relevance, /// Sort by the newest messages first Latest, @@ -168,12 +169,6 @@ pub enum MessageSort { Oldest, } -impl Default for MessageSort { - fn default() -> MessageSort { - MessageSort::Relevance - } -} - /// # Message Time Period /// /// Filter and sort messages by time diff --git a/crates/quark/src/models/media/attachment.rs b/crates/quark/src/models/media/attachment.rs index 120da29a..4cef5dfb 100644 --- a/crates/quark/src/models/media/attachment.rs +++ b/crates/quark/src/models/media/attachment.rs @@ -1,10 +1,11 @@ use serde::{Deserialize, Serialize}; /// Metadata associated with file -#[derive(Serialize, Deserialize, JsonSchema, Debug, Clone)] +#[derive(Serialize, Deserialize, JsonSchema, Debug, Clone, Default)] #[serde(tag = "type")] pub enum Metadata { /// File is just a generic uncategorised file + #[default] File, /// File contains textual data and should be displayed as such Text, @@ -16,12 +17,6 @@ pub enum Metadata { Audio, } -impl Default for Metadata { - fn default() -> Metadata { - Metadata::File - } -} - /// Representation of a File on Revolt /// Generated by Autumn #[derive(Serialize, Deserialize, JsonSchema, Debug, Clone, Default)] diff --git a/crates/quark/src/tasks/ack.rs b/crates/quark/src/tasks/ack.rs index 9c0d16f9..25cf6e2b 100644 --- a/crates/quark/src/tasks/ack.rs +++ b/crates/quark/src/tasks/ack.rs @@ -2,7 +2,6 @@ use crate::Database; use deadqueue::limited::Queue; -use mongodb::bson::doc; use std::{collections::HashMap, time::Duration}; use once_cell::sync::Lazy; diff --git a/crates/quark/src/tasks/last_message_id.rs b/crates/quark/src/tasks/last_message_id.rs index facd5ffb..976a725d 100644 --- a/crates/quark/src/tasks/last_message_id.rs +++ b/crates/quark/src/tasks/last_message_id.rs @@ -2,7 +2,6 @@ use crate::{models::channel::PartialChannel, Database}; use deadqueue::limited::Queue; -use mongodb::bson::doc; use std::{collections::HashMap, time::Duration}; use once_cell::sync::Lazy; diff --git a/crates/quark/src/tasks/web_push.rs b/crates/quark/src/tasks/web_push.rs index ac2f8dc9..b0c5acb1 100644 --- a/crates/quark/src/tasks/web_push.rs +++ b/crates/quark/src/tasks/web_push.rs @@ -1,4 +1,3 @@ -use crate::bson::doc; use crate::util::variables::delta::VAPID_PRIVATE_KEY; use authifier::Database; diff --git a/crates/quark/src/web/ratelimiter.rs b/crates/quark/src/web/ratelimiter.rs index 53415a69..0d264c72 100644 --- a/crates/quark/src/web/ratelimiter.rs +++ b/crates/quark/src/web/ratelimiter.rs @@ -31,7 +31,7 @@ struct Entry { reset: u128, } -static MAP: Lazy> = Lazy::new(|| DashMap::new()); +static MAP: Lazy> = Lazy::new(DashMap::new); /// Get the current time from Unix Epoch as a Duration fn now() -> Duration {