diff --git a/src/definitions.rs b/src/definitions.rs index c27b995..13dae73 100644 --- a/src/definitions.rs +++ b/src/definitions.rs @@ -39,48 +39,44 @@ pub async fn event_handler( ) -> Result<(), Error> { // Future event handling will go here // Data will contain the database connection - match &event { - &FullEvent::Message { new_message } => { - if new_message.guild_id.unwrap() == SLOP_SCOUNDREL_SERVER_ID { - if new_message - .author - .has_role( - ctx.http.clone(), - new_message.guild_id.unwrap(), - RoleId::new(SLOP_SCOUNDREL_ROLE_ID), - ) - .await - .unwrap() - { - info!("Testing message with ID: {}", new_message.id); - // TODO: Find out why this is necessary - let real_message = new_message - .channel(ctx.http.clone()) - .await - .unwrap() - .guild() - .unwrap() - .message(ctx.http.clone(), new_message.id) - .await - .unwrap(); - if !real_message.attachments.is_empty() - || !real_message.embeds.is_empty() - || real_message.content.contains("https://tenor.com/view") - { - let message = { - let mut rng = rand::rng(); - HATE.choose(&mut rng).unwrap().to_string() - }; - info!("Sending a rude message"); - let _reply = real_message - .channel_id - .say(ctx.http.clone(), message) - .await?; - } - } + if let &FullEvent::Message { new_message } = &event { + if new_message.guild_id.unwrap() == SLOP_SCOUNDREL_SERVER_ID + && new_message + .author + .has_role( + ctx.http.clone(), + new_message.guild_id.unwrap(), + RoleId::new(SLOP_SCOUNDREL_ROLE_ID), + ) + .await + .unwrap() + { + info!("Testing message with ID: {}", new_message.id); + // TODO: Find out why this is necessary + let real_message = new_message + .channel(ctx.http.clone()) + .await + .unwrap() + .guild() + .unwrap() + .message(ctx.http.clone(), new_message.id) + .await + .unwrap(); + if !real_message.attachments.is_empty() + || !real_message.embeds.is_empty() + || real_message.content.contains("https://tenor.com/view") + { + let message = { + let mut rng = rand::rng(); + HATE.choose(&mut rng).unwrap().to_string() + }; + info!("Sending a rude message"); + let _reply = real_message + .channel_id + .say(ctx.http.clone(), message) + .await?; } } - _ => {} } Ok(()) }