1 files changed, 23 insertions, 18 deletions
diff --git a/src/handlers/event/guild.rs b/src/handlers/event/guild.rs
index 51ae3b7..774179c 100644
--- a/src/handlers/event/guild.rs
+++ b/src/handlers/event/guild.rs
@@ -3,30 +3,35 @@ use log::{debug, warn};
 use poise::serenity_prelude::{Guild, UnavailableGuild};
 
 use crate::{storage, Data};
-use storage::Settings;
-
-pub async fn handle_create(guild: &Guild, _is_new: &bool, data: &Data) -> Result<()> {
-	let storage = &data.storage;
-
-	if storage.guild_settings_exist(&guild.id).await? {
-		debug!("Not recreating settings key for {}", guild.id);
-		return Ok(());
+use storage::settings::Settings;
+
+pub async fn handle_create(guild: &Guild, data: &Data) -> Result<()> {
+	if let Some(storage) = &data.storage {
+		if storage.guild_settings_exist(&guild.id).await? {
+			debug!("Not recreating settings key for {}", guild.id);
+			return Ok(());
+		}
+
+		let settings = Settings {
+			guild_id: guild.id,
+			..Default::default()
+		};
+
+		warn!("Creating new settings key for {}:\n{settings:#?}", guild.id);
+		storage.create_guild_settings(settings).await?;
+	} else {
+		warn!("Can't create guild settings; no storage backend found!");
 	}
 
-	let settings = Settings {
-		guild_id: guild.id,
-		optional_commands_enabled: false,
-		..Default::default()
-	};
-
-	warn!("Creating new settings key for {}:\n{settings:#?}", guild.id);
-	storage.create_guild_settings(settings).await?;
-
 	Ok(())
 }
 
 pub async fn handle_delete(guild: &UnavailableGuild, data: &Data) -> Result<()> {
-	data.storage.delete_guild_settings(&guild.id).await?;
+	if let Some(storage) = &data.storage {
+		storage.delete_guild_settings(&guild.id).await?;
+	} else {
+		warn!("Can't delete guild settings; no storage backend found!");
+	}
 
 	Ok(())
 }