refactor: expand Settings

1 files changed, 10 insertions, 4 deletions

diff --git a/src/handlers/event/message.rs b/src/handlers/event/message.rs
index a84ec59..88faf85 100644
--- a/src/handlers/event/message.rs
+++ b/src/handlers/event/message.rs
@@ -1,4 +1,5 @@
-use crate::{consts, utils, Data};
+use crate::settings::Settings;
+use crate::{consts, Data};
 
 use color_eyre::eyre::{Report, Result};
 use log::*;
@@ -9,17 +10,22 @@ pub async fn handle(
 	ctx: &Context,
 	framework: FrameworkContext<'_, Data, Report>,
 	msg: &Message,
+	settings: &Settings,
 ) -> Result<()> {
-	if should_echo(framework, msg) {
+	if should_echo(framework, msg, settings) {
 		msg.reply(ctx, &msg.content).await?;
 	}
 
 	Ok(())
 }
 
-fn should_echo(framework: FrameworkContext<'_, Data, Report>, msg: &Message) -> bool {
+fn should_echo(
+	framework: FrameworkContext<'_, Data, Report>,
+	msg: &Message,
+	settings: &Settings,
+) -> bool {
 	let gid = msg.guild_id.unwrap_or_default();
-	if msg.author.id == framework.bot_id || !utils::is_guild_allowed(gid) {
+	if msg.author.id == framework.bot_id || !settings.is_guild_allowed(gid) {
 		info!("not running copypasta command in {gid}");
 		return false;
 	}