From 9dd24526ef848675d2932c34488e04f5e4c4f0f1 Mon Sep 17 00:00:00 2001 From: Paul Makles Date: Mon, 12 Feb 2024 21:13:31 +0000 Subject: [PATCH] chore: clippy recommendations --- crates/core/permissions/src/impl.rs | 2 +- crates/delta/src/routes/channels/message_send.rs | 9 ++------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/crates/core/permissions/src/impl.rs b/crates/core/permissions/src/impl.rs index b129bcf9..9975eeda 100644 --- a/crates/core/permissions/src/impl.rs +++ b/crates/core/permissions/src/impl.rs @@ -111,7 +111,7 @@ pub async fn calculate_channel_permissions(query: &mut P) -> query.set_server_from_channel().await; if query.are_we_server_owner().await { - return ChannelPermission::GrantAllSafe.into(); + ChannelPermission::GrantAllSafe.into() } else if query.are_we_a_member().await { let mut permissions = calculate_server_permissions(query).await; permissions.apply(query.get_default_channel_permissions().await); diff --git a/crates/delta/src/routes/channels/message_send.rs b/crates/delta/src/routes/channels/message_send.rs index ea403371..07531ad2 100644 --- a/crates/delta/src/routes/channels/message_send.rs +++ b/crates/delta/src/routes/channels/message_send.rs @@ -65,13 +65,8 @@ pub async fn message_send( // Disallow mentions for new users (TRUST-0: <12 hours age) in public servers let allow_mentions = if let Some(server) = query.server_ref() { if server.discoverable { - if (Utc::now() - ulid::Ulid::from_string(&user.id).unwrap().datetime()) - < Duration::hours(12) - { - false - } else { - true - } + (Utc::now() - ulid::Ulid::from_string(&user.id).unwrap().datetime()) + >= Duration::hours(12) } else { true }