From 26c3c5fedc14c60e9a14c3f29af3da7c2ff66847 Mon Sep 17 00:00:00 2001 From: oSumAtrIX Date: Wed, 21 Jun 2023 21:38:43 +0200 Subject: [PATCH] feat: remove media channels --- src/events/message_create.rs | 7 ------- src/utils/media_channel.rs | 34 ---------------------------------- src/utils/mod.rs | 5 ++--- 3 files changed, 2 insertions(+), 44 deletions(-) delete mode 100644 src/utils/media_channel.rs diff --git a/src/events/message_create.rs b/src/events/message_create.rs index 4d978a6..a856000 100644 --- a/src/events/message_create.rs +++ b/src/events/message_create.rs @@ -1,15 +1,8 @@ use super::*; use crate::utils::code_embed::utils::code_preview; -use crate::utils::media_channel::handle_media_channel; use crate::utils::message_response::handle_message_response; pub async fn message_create(ctx: &serenity::Context, new_message: &serenity::Message) { - let is_media_channel = handle_media_channel(ctx, new_message).await; - - if is_media_channel { - return; - }; - tokio::join!( handle_message_response(ctx, new_message), code_preview(ctx, new_message) diff --git a/src/utils/media_channel.rs b/src/utils/media_channel.rs deleted file mode 100644 index ff98943..0000000 --- a/src/utils/media_channel.rs +++ /dev/null @@ -1,34 +0,0 @@ -use tracing::error; - -use super::bot::get_data_lock; -use super::*; - -pub async fn handle_media_channel( - ctx: &serenity::Context, - new_message: &serenity::Message, -) -> bool { - let current_channel = new_message.channel_id.0; - - let data_lock = get_data_lock(ctx).await; - - let configuration = &data_lock.read().await.configuration; - - let is_media_channel = configuration - .general - .media_channels - .iter() - .any(|&channel| channel == current_channel); - - let is_admin = configuration - .administrators - .users - .contains(&new_message.author.id.0); - - if is_media_channel && new_message.attachments.is_empty() && !is_admin { - if let Err(why) = new_message.delete(&ctx.http).await { - error!("Error deleting message: {:?}", why); - } - } - - is_media_channel -} diff --git a/src/utils/mod.rs b/src/utils/mod.rs index 2cdee9f..31e887d 100644 --- a/src/utils/mod.rs +++ b/src/utils/mod.rs @@ -1,13 +1,12 @@ use chrono::Duration; use poise::serenity_prelude::{self as serenity, Member, RoleId}; -pub mod message_response; pub mod bot; pub mod code_embed; pub mod decancer; -pub mod message; pub mod macros; -pub mod media_channel; +pub mod message; +pub mod message_response; pub mod moderation; pub mod poll;