From 69ae76717558591605c976a2c98241a4073ee9fc Mon Sep 17 00:00:00 2001 From: izzy Date: Tue, 13 May 2025 10:48:56 +0100 Subject: [PATCH] refactor: some clippy recommendations --- crates/bonfire/src/events/impl.rs | 13 +++++----- crates/bonfire/src/websocket.rs | 2 +- crates/core/database/src/models/bots/model.rs | 1 - .../src/models/channel_webhooks/model.rs | 2 +- .../database/src/models/channels/model.rs | 11 +++----- .../database/src/models/file_hashes/model.rs | 2 +- .../database/src/models/messages/model.rs | 23 +++++++++------- .../src/models/safety_snapshots/model.rs | 4 +-- .../database/src/models/server_bans/model.rs | 1 + .../src/models/server_members/model.rs | 2 +- .../core/database/src/models/servers/model.rs | 2 +- .../core/database/src/models/users/model.rs | 19 ++++++-------- .../core/database/src/models/users/schema.rs | 2 +- crates/core/database/src/tasks/ack.rs | 1 - crates/core/database/src/util/bridge/v0.rs | 6 ++--- .../database/src/util/bulk_permissions.rs | 6 ++--- crates/core/database/src/util/permissions.rs | 26 +++++++++---------- crates/core/models/src/v0/messages.rs | 2 +- .../src/routes/channels/members_fetch.rs | 1 - .../routes/channels/message_bulk_delete.rs | 1 - .../delta/src/routes/channels/message_edit.rs | 1 - .../src/routes/channels/permissions_set.rs | 3 +-- .../src/routes/customisation/emoji_delete.rs | 3 +-- crates/delta/src/routes/mod.rs | 2 +- crates/delta/src/routes/servers/ban_create.rs | 5 +--- .../routes/servers/permissions_set_default.rs | 2 +- crates/delta/src/routes/servers/roles_edit.rs | 1 - .../src/routes/users/fetch_user_flags.rs | 1 - .../routes/webhooks/webhook_execute_github.rs | 3 ++- 29 files changed, 67 insertions(+), 81 deletions(-) diff --git a/crates/bonfire/src/events/impl.rs b/crates/bonfire/src/events/impl.rs index 36518e0e..62da6108 100644 --- a/crates/bonfire/src/events/impl.rs +++ b/crates/bonfire/src/events/impl.rs @@ -175,7 +175,7 @@ impl State { .iter() .find(|e| matches!(e, ReadyPayloadFields::UserSettings(_))) { - Some(db.fetch_user_settings(&user.id, &keys).await?) + Some(db.fetch_user_settings(&user.id, keys).await?) } else { None }; @@ -199,12 +199,11 @@ impl State { .collect(); // Make all users appear from our perspective. - let mut users: Vec = join_all(users - .into_iter() - .map(|other_user| async { - let is_online = online_ids.contains(&other_user.id); - other_user.into_known(&user, is_online).await - })).await; + let mut users: Vec = join_all(users.into_iter().map(|other_user| async { + let is_online = online_ids.contains(&other_user.id); + other_user.into_known(&user, is_online).await + })) + .await; // Make sure we see our own user correctly. users.push(user.into_self(true).await); diff --git a/crates/bonfire/src/websocket.rs b/crates/bonfire/src/websocket.rs index 810befbf..dbebfdbd 100644 --- a/crates/bonfire/src/websocket.rs +++ b/crates/bonfire/src/websocket.rs @@ -3,7 +3,7 @@ use std::{collections::HashSet, net::SocketAddr, sync::Arc}; use async_tungstenite::WebSocketStream; use authifier::AuthifierEvent; use fred::{ - error::{RedisError, RedisErrorKind}, + error::RedisErrorKind, interfaces::{ClientLike, EventInterface, PubsubInterface}, types::RedisConfig, }; diff --git a/crates/core/database/src/models/bots/model.rs b/crates/core/database/src/models/bots/model.rs index 0a796049..24c56bb1 100644 --- a/crates/core/database/src/models/bots/model.rs +++ b/crates/core/database/src/models/bots/model.rs @@ -1,4 +1,3 @@ -use revolt_config::config; use revolt_result::Result; use ulid::Ulid; diff --git a/crates/core/database/src/models/channel_webhooks/model.rs b/crates/core/database/src/models/channel_webhooks/model.rs index b163cbfe..cdf94db4 100644 --- a/crates/core/database/src/models/channel_webhooks/model.rs +++ b/crates/core/database/src/models/channel_webhooks/model.rs @@ -142,7 +142,7 @@ mod tests { ..Default::default() }; - db.insert_webhook(&webhook).await.unwrap(); + webhook.create(&db).await.unwrap(); let mut updated_webhook = webhook.clone(); updated_webhook diff --git a/crates/core/database/src/models/channels/model.rs b/crates/core/database/src/models/channels/model.rs index 359d7a4a..536632a7 100644 --- a/crates/core/database/src/models/channels/model.rs +++ b/crates/core/database/src/models/channels/model.rs @@ -328,13 +328,10 @@ impl Channel { db.insert_channel(&channel).await?; - match &channel { - Channel::DirectMessage { .. } => { - let event = EventV1::ChannelCreate(channel.clone().into()); - event.clone().private(user_a.id.clone()).await; - event.private(user_b.id.clone()).await; - } - _ => {} + if let Channel::DirectMessage { .. } = &channel { + let event = EventV1::ChannelCreate(channel.clone().into()); + event.clone().private(user_a.id.clone()).await; + event.private(user_b.id.clone()).await; }; Ok(channel) diff --git a/crates/core/database/src/models/file_hashes/model.rs b/crates/core/database/src/models/file_hashes/model.rs index 46a249f0..cec7a39d 100644 --- a/crates/core/database/src/models/file_hashes/model.rs +++ b/crates/core/database/src/models/file_hashes/model.rs @@ -28,7 +28,7 @@ auto_derived_partial!( /// Size of this file (in bytes) pub size: isize, }, - "PartialFile" + "PartialFileHash" ); auto_derived!( diff --git a/crates/core/database/src/models/messages/model.rs b/crates/core/database/src/models/messages/model.rs index 02ad765f..2c24567a 100644 --- a/crates/core/database/src/models/messages/model.rs +++ b/crates/core/database/src/models/messages/model.rs @@ -5,7 +5,7 @@ use iso8601_timestamp::Timestamp; use revolt_config::{config, FeaturesLimits}; use revolt_models::v0::{ self, BulkMessageResponse, DataMessageSend, Embed, MessageAuthor, MessageFlags, MessageSort, - MessageWebhook, PushNotification, ReplyIntent, SendableEmbed, Text + MessageWebhook, PushNotification, ReplyIntent, SendableEmbed, Text, }; use revolt_permissions::{calculate_channel_permissions, ChannelPermission, PermissionValue}; use revolt_result::{ErrorType, Result}; @@ -286,9 +286,9 @@ impl Message { .map_err(|_| create_error!(InvalidOperation))?; // Check the message is not empty - if (data.content.as_ref().map_or(true, |v| v.is_empty())) - && (data.attachments.as_ref().map_or(true, |v| v.is_empty())) - && (data.embeds.as_ref().map_or(true, |v| v.is_empty())) + if (data.content.as_ref().is_none_or(|v| v.is_empty())) + && (data.attachments.as_ref().is_none_or(|v| v.is_empty())) + && (data.embeds.as_ref().is_none_or(|v| v.is_empty())) { return Err(create_error!(EmptyMessage)); } @@ -382,7 +382,7 @@ impl Message { mut user_mentions, mut role_mentions, mut mentions_everyone, - mut mentions_online + mut mentions_online, } = message_mentions; if allow_mass_mentions && server_id.is_some() && !role_mentions.is_empty() { @@ -489,7 +489,9 @@ impl Message { let valid_members = db.fetch_members(server.as_str(), &mentions_vec[..]).await; if let Ok(valid_members) = valid_members { - let valid_mentions = HashSet::<&String, RandomState>::from_iter(valid_members.iter().map(|m| &m.id.user)); + let valid_mentions = HashSet::<&String, RandomState>::from_iter( + valid_members.iter().map(|m| &m.id.user), + ); user_mentions.retain(|m| valid_mentions.contains(m)); // quick pass, validate mentions are in the server @@ -503,7 +505,8 @@ impl Message { .members_can_see_channel() .await; - user_mentions.retain(|m| *member_channel_view_perms.get(m).unwrap_or(&false)); + user_mentions + .retain(|m| *member_channel_view_perms.get(m).unwrap_or(&false)); } } else { revolt_config::capture_error(&valid_members.unwrap_err()); @@ -517,7 +520,9 @@ impl Message { } if !user_mentions.is_empty() { - message.mentions.replace(user_mentions.into_iter().collect()); + message + .mentions + .replace(user_mentions.into_iter().collect()); } if !role_mentions.is_empty() { @@ -651,7 +656,7 @@ impl Message { pub async fn send( &mut self, db: &Database, - amqp: Option<&AMQP>, // this is optional mostly for tests. + _amqp: Option<&AMQP>, // this is optional mostly for tests. author: MessageAuthor<'_>, user: Option, member: Option, diff --git a/crates/core/database/src/models/safety_snapshots/model.rs b/crates/core/database/src/models/safety_snapshots/model.rs index e82ab388..e277f3a9 100644 --- a/crates/core/database/src/models/safety_snapshots/model.rs +++ b/crates/core/database/src/models/safety_snapshots/model.rs @@ -85,8 +85,8 @@ impl SnapshotContent { Ok(( SnapshotContent::Message { message, - prior_context: prior_context.into_iter().map(Into::into).collect(), - leading_context: leading_context.into_iter().map(Into::into).collect(), + prior_context: prior_context.into_iter().collect(), + leading_context: leading_context.into_iter().collect(), }, files, )) diff --git a/crates/core/database/src/models/server_bans/model.rs b/crates/core/database/src/models/server_bans/model.rs index 46e8a889..51044efe 100644 --- a/crates/core/database/src/models/server_bans/model.rs +++ b/crates/core/database/src/models/server_bans/model.rs @@ -13,6 +13,7 @@ auto_derived!( } ); +#[allow(clippy::disallowed_methods)] impl ServerBan { /// Create ban pub async fn create( diff --git a/crates/core/database/src/models/server_members/model.rs b/crates/core/database/src/models/server_members/model.rs index 72e16162..25b6979a 100644 --- a/crates/core/database/src/models/server_members/model.rs +++ b/crates/core/database/src/models/server_members/model.rs @@ -159,7 +159,7 @@ impl Member { } /// Update member data - pub async fn update<'a>( + pub async fn update( &mut self, db: &Database, partial: PartialMember, diff --git a/crates/core/database/src/models/servers/model.rs b/crates/core/database/src/models/servers/model.rs index 67c4daed..33cfa713 100644 --- a/crates/core/database/src/models/servers/model.rs +++ b/crates/core/database/src/models/servers/model.rs @@ -285,7 +285,7 @@ impl Role { } /// Update server data - pub async fn update<'a>( + pub async fn update( &mut self, db: &Database, server_id: &str, diff --git a/crates/core/database/src/models/users/model.rs b/crates/core/database/src/models/users/model.rs index 4fbf3029..fc2866cf 100644 --- a/crates/core/database/src/models/users/model.rs +++ b/crates/core/database/src/models/users/model.rs @@ -8,7 +8,7 @@ use iso8601_timestamp::Timestamp; use once_cell::sync::Lazy; use rand::seq::SliceRandom; use revolt_config::{config, FeaturesLimits}; -use revolt_models::v0::{self, UserFlags, UserBadges}; +use revolt_models::v0::{self, UserBadges, UserFlags}; use revolt_presence::filter_online; use revolt_result::{create_error, Result}; use serde_json::json; @@ -349,16 +349,13 @@ impl User { ) -> Result> { let online_ids = filter_online(ids).await; - Ok(join_all( - db - .fetch_users(ids) - .await? - .into_iter() - .map(|user| async { + Ok( + join_all(db.fetch_users(ids).await?.into_iter().map(|user| async { let is_online = online_ids.contains(&user.id); user.into_known(perspective, is_online).await - }) - ).await) + })) + .await, + ) } /// Find a free discriminator for a given username @@ -639,7 +636,7 @@ impl User { } /// Update user data - pub async fn update<'a>( + pub async fn update( &mut self, db: &Database, partial: PartialUser, @@ -817,7 +814,7 @@ impl User { if let Some(cutoff) = config.api.users.early_adopter_cutoff { if Ulid::from_string(&self.id).unwrap().timestamp_ms() < cutoff { - return badges + UserBadges::EarlyAdopter as u32 + return badges + UserBadges::EarlyAdopter as u32; }; }; diff --git a/crates/core/database/src/models/users/schema.rs b/crates/core/database/src/models/users/schema.rs index d887b895..28f5e42e 100644 --- a/crates/core/database/src/models/users/schema.rs +++ b/crates/core/database/src/models/users/schema.rs @@ -6,7 +6,7 @@ use revolt_rocket_okapi::{ use crate::User; -impl<'r> OpenApiFromRequest<'r> for User { +impl OpenApiFromRequest<'_> for User { fn from_request_input( _gen: &mut OpenApiGenerator, _name: String, diff --git a/crates/core/database/src/tasks/ack.rs b/crates/core/database/src/tasks/ack.rs index 1d2aff38..6b036da1 100644 --- a/crates/core/database/src/tasks/ack.rs +++ b/crates/core/database/src/tasks/ack.rs @@ -4,7 +4,6 @@ use crate::{Database, Message, AMQP}; use deadqueue::limited::Queue; use once_cell::sync::Lazy; use revolt_models::v0::PushNotification; -use rocket::form::validate::Contains; use std::{ collections::{HashMap, HashSet}, time::Duration, diff --git a/crates/core/database/src/util/bridge/v0.rs b/crates/core/database/src/util/bridge/v0.rs index 8872ef10..12f7c8fc 100644 --- a/crates/core/database/src/util/bridge/v0.rs +++ b/crates/core/database/src/util/bridge/v0.rs @@ -1,7 +1,7 @@ use revolt_models::v0::*; use revolt_permissions::{calculate_user_permissions, UserPermission}; -use crate::{util::permissions::DatabasePermissionQuery, Database, FileUsedFor}; +use crate::{util::permissions::DatabasePermissionQuery, Database}; impl crate::Bot { pub fn into_public_bot(self, user: crate::User) -> PublicBot { @@ -488,7 +488,7 @@ impl crate::Message { reactions: self.reactions, interactions: self.interactions.into(), masquerade: self.masquerade.map(Into::into), - flags: self.flags.map(|flags| flags as u32).unwrap_or_default(), + flags: self.flags.unwrap_or_default(), pinned: self.pinned, } } @@ -517,7 +517,7 @@ impl From for PartialMessage { reactions: value.reactions, interactions: value.interactions.map(Into::into), masquerade: value.masquerade.map(Into::into), - flags: value.flags.map(|flags| flags as u32), + flags: value.flags, pinned: value.pinned, } } diff --git a/crates/core/database/src/util/bulk_permissions.rs b/crates/core/database/src/util/bulk_permissions.rs index 928acfce..9e7a1f7a 100644 --- a/crates/core/database/src/util/bulk_permissions.rs +++ b/crates/core/database/src/util/bulk_permissions.rs @@ -87,7 +87,7 @@ impl<'z> BulkDatabasePermissionQuery<'z> { } } - pub fn channel(self, channel: &'z Channel) -> BulkDatabasePermissionQuery { + pub fn channel(self, channel: &'z Channel) -> BulkDatabasePermissionQuery<'z> { BulkDatabasePermissionQuery { channel: Some(channel.clone()), ..self @@ -109,7 +109,7 @@ impl<'z> BulkDatabasePermissionQuery<'z> { } } - pub fn members(self, members: &'z [Member]) -> BulkDatabasePermissionQuery { + pub fn members(self, members: &'z [Member]) -> BulkDatabasePermissionQuery<'z> { BulkDatabasePermissionQuery { members: Some(members.to_owned()), cached_member_perms: None, @@ -120,7 +120,7 @@ impl<'z> BulkDatabasePermissionQuery<'z> { } } - pub fn users(self, users: &'z [User]) -> BulkDatabasePermissionQuery { + pub fn users(self, users: &'z [User]) -> BulkDatabasePermissionQuery<'z> { BulkDatabasePermissionQuery { users: Some(users.to_owned()), cached_member_perms: None, diff --git a/crates/core/database/src/util/permissions.rs b/crates/core/database/src/util/permissions.rs index e80b0da1..605b05b7 100644 --- a/crates/core/database/src/util/permissions.rs +++ b/crates/core/database/src/util/permissions.rs @@ -305,16 +305,14 @@ impl PermissionQuery for DatabasePermissionQuery<'_> { /// Are we a recipient of this channel? async fn are_we_part_of_the_channel(&mut self) -> bool { - if let Some(channel) = &self.channel { - match channel { - Cow::Borrowed(Channel::DirectMessage { recipients, .. }) - | Cow::Owned(Channel::DirectMessage { recipients, .. }) - | Cow::Borrowed(Channel::Group { recipients, .. }) - | Cow::Owned(Channel::Group { recipients, .. }) => { - recipients.contains(&self.perspective.id) - } - _ => false, - } + if let Some( + Cow::Borrowed(Channel::DirectMessage { recipients, .. }) + | Cow::Owned(Channel::DirectMessage { recipients, .. }) + | Cow::Borrowed(Channel::Group { recipients, .. }) + | Cow::Owned(Channel::Group { recipients, .. }), + ) = &self.channel + { + recipients.contains(&self.perspective.id) } else { false } @@ -420,7 +418,7 @@ impl<'a> DatabasePermissionQuery<'a> { } /// Use user - pub fn user(self, user: &'a User) -> DatabasePermissionQuery { + pub fn user(self, user: &'a User) -> DatabasePermissionQuery<'a> { DatabasePermissionQuery { user: Some(Cow::Borrowed(user)), ..self @@ -428,7 +426,7 @@ impl<'a> DatabasePermissionQuery<'a> { } /// Use channel - pub fn channel(self, channel: &'a Channel) -> DatabasePermissionQuery { + pub fn channel(self, channel: &'a Channel) -> DatabasePermissionQuery<'a> { DatabasePermissionQuery { channel: Some(Cow::Borrowed(channel)), ..self @@ -436,7 +434,7 @@ impl<'a> DatabasePermissionQuery<'a> { } /// Use server - pub fn server(self, server: &'a Server) -> DatabasePermissionQuery { + pub fn server(self, server: &'a Server) -> DatabasePermissionQuery<'a> { DatabasePermissionQuery { server: Some(Cow::Borrowed(server)), ..self @@ -444,7 +442,7 @@ impl<'a> DatabasePermissionQuery<'a> { } /// Use member - pub fn member(self, member: &'a Member) -> DatabasePermissionQuery { + pub fn member(self, member: &'a Member) -> DatabasePermissionQuery<'a> { DatabasePermissionQuery { member: Some(Cow::Borrowed(member)), ..self diff --git a/crates/core/models/src/v0/messages.rs b/crates/core/models/src/v0/messages.rs index 0324e8b1..1ef8aab0 100644 --- a/crates/core/models/src/v0/messages.rs +++ b/crates/core/models/src/v0/messages.rs @@ -399,7 +399,7 @@ impl Interactions { } } -impl<'a> MessageAuthor<'a> { +impl MessageAuthor<'_> { pub fn id(&self) -> &str { match self { MessageAuthor::User(user) => &user.id, diff --git a/crates/delta/src/routes/channels/members_fetch.rs b/crates/delta/src/routes/channels/members_fetch.rs index 64a14a9b..4a6688bf 100644 --- a/crates/delta/src/routes/channels/members_fetch.rs +++ b/crates/delta/src/routes/channels/members_fetch.rs @@ -1,4 +1,3 @@ -use futures::future::join_all; use revolt_database::{ util::{permissions::DatabasePermissionQuery, reference::Reference}, Channel, Database, User, diff --git a/crates/delta/src/routes/channels/message_bulk_delete.rs b/crates/delta/src/routes/channels/message_bulk_delete.rs index 6cb2b37a..446b1e26 100644 --- a/crates/delta/src/routes/channels/message_bulk_delete.rs +++ b/crates/delta/src/routes/channels/message_bulk_delete.rs @@ -8,7 +8,6 @@ use revolt_permissions::{calculate_channel_permissions, ChannelPermission}; use revolt_result::{create_error, Result}; use rocket::{serde::json::Json, State}; use rocket_empty::EmptyResponse; -use serde::Deserialize; use validator::Validate; /// # Bulk Delete Messages diff --git a/crates/delta/src/routes/channels/message_edit.rs b/crates/delta/src/routes/channels/message_edit.rs index 3662ee63..2b5d24f7 100644 --- a/crates/delta/src/routes/channels/message_edit.rs +++ b/crates/delta/src/routes/channels/message_edit.rs @@ -1,5 +1,4 @@ use iso8601_timestamp::Timestamp; -use revolt_config::config; use revolt_database::{ tasks, util::{permissions::DatabasePermissionQuery, reference::Reference}, diff --git a/crates/delta/src/routes/channels/permissions_set.rs b/crates/delta/src/routes/channels/permissions_set.rs index b4b3c3dc..70ded35d 100644 --- a/crates/delta/src/routes/channels/permissions_set.rs +++ b/crates/delta/src/routes/channels/permissions_set.rs @@ -1,12 +1,11 @@ use revolt_database::{ util::{permissions::DatabasePermissionQuery, reference::Reference}, - Channel, Database, User, + Database, User, }; use revolt_models::v0; use revolt_permissions::{calculate_channel_permissions, ChannelPermission, Override}; use revolt_result::{create_error, Result}; use rocket::{serde::json::Json, State}; -use serde::Deserialize; /// # Set Role Permission /// diff --git a/crates/delta/src/routes/customisation/emoji_delete.rs b/crates/delta/src/routes/customisation/emoji_delete.rs index 53cbb837..05d89eb0 100644 --- a/crates/delta/src/routes/customisation/emoji_delete.rs +++ b/crates/delta/src/routes/customisation/emoji_delete.rs @@ -3,7 +3,7 @@ use revolt_database::{ Database, EmojiParent, User, }; use revolt_permissions::{calculate_server_permissions, ChannelPermission}; -use revolt_result::{create_error, Result}; +use revolt_result::Result; use rocket::State; use rocket_empty::EmptyResponse; @@ -18,7 +18,6 @@ pub async fn delete_emoji( user: User, emoji_id: Reference, ) -> Result { - // Fetch the emoji let emoji = emoji_id.as_emoji(db).await?; diff --git a/crates/delta/src/routes/mod.rs b/crates/delta/src/routes/mod.rs index 5107e7c2..25ed460d 100644 --- a/crates/delta/src/routes/mod.rs +++ b/crates/delta/src/routes/mod.rs @@ -1,4 +1,4 @@ -use revolt_config::{config, Settings}; +use revolt_config::Settings; use revolt_rocket_okapi::{revolt_okapi::openapi3::OpenApi, settings::OpenApiSettings}; pub use rocket::http::Status; pub use rocket::response::Redirect; diff --git a/crates/delta/src/routes/servers/ban_create.rs b/crates/delta/src/routes/servers/ban_create.rs index 8003e79e..a73be114 100644 --- a/crates/delta/src/routes/servers/ban_create.rs +++ b/crates/delta/src/routes/servers/ban_create.rs @@ -4,12 +4,9 @@ use revolt_database::{ }; use revolt_models::v0; -use revolt_permissions::{ - calculate_channel_permissions, calculate_server_permissions, ChannelPermission, -}; +use revolt_permissions::{calculate_server_permissions, ChannelPermission}; use revolt_result::{create_error, Result}; use rocket::{serde::json::Json, State}; -use serde::{Deserialize, Serialize}; use validator::Validate; /// # Ban User diff --git a/crates/delta/src/routes/servers/permissions_set_default.rs b/crates/delta/src/routes/servers/permissions_set_default.rs index 8189e956..96bda2de 100644 --- a/crates/delta/src/routes/servers/permissions_set_default.rs +++ b/crates/delta/src/routes/servers/permissions_set_default.rs @@ -1,6 +1,6 @@ use revolt_database::{ util::{permissions::DatabasePermissionQuery, reference::Reference}, - Database, PartialServer, Server, User, + Database, PartialServer, User, }; use revolt_models::v0; use revolt_permissions::{ diff --git a/crates/delta/src/routes/servers/roles_edit.rs b/crates/delta/src/routes/servers/roles_edit.rs index c7f5124c..72ec6635 100644 --- a/crates/delta/src/routes/servers/roles_edit.rs +++ b/crates/delta/src/routes/servers/roles_edit.rs @@ -6,7 +6,6 @@ use revolt_models::v0; use revolt_permissions::{calculate_server_permissions, ChannelPermission}; use revolt_result::{create_error, Result}; use rocket::{serde::json::Json, State}; -use serde::{Deserialize, Serialize}; use validator::Validate; /// # Edit Role diff --git a/crates/delta/src/routes/users/fetch_user_flags.rs b/crates/delta/src/routes/users/fetch_user_flags.rs index 39c731d0..92377a57 100644 --- a/crates/delta/src/routes/users/fetch_user_flags.rs +++ b/crates/delta/src/routes/users/fetch_user_flags.rs @@ -2,7 +2,6 @@ use revolt_database::{util::reference::Reference, Database}; use revolt_models::v0; use revolt_result::Result; use rocket::{serde::json::Json, State}; -use serde::Serialize; /// # Fetch User Flags /// diff --git a/crates/delta/src/routes/webhooks/webhook_execute_github.rs b/crates/delta/src/routes/webhooks/webhook_execute_github.rs index 6d9c8b60..ae7ff40c 100644 --- a/crates/delta/src/routes/webhooks/webhook_execute_github.rs +++ b/crates/delta/src/routes/webhooks/webhook_execute_github.rs @@ -588,6 +588,7 @@ pub enum PullRequestEvent { #[derive(Debug)] #[allow(clippy::large_enum_variant)] pub enum BaseEvent { + #[allow(dead_code)] Star(StarEvent), Ping, Push(PushEvent), @@ -829,7 +830,7 @@ pub async fn webhook_execute_github( }) .collect::>() .join("\n"), - 1000 + 1000, ); SendableEmbed {