From 3d07413690c551d9f034c93af85ae8da5a495e14 Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Sat, 20 Apr 2024 02:31:40 +0000
Subject: spring cleaning (#165)

* treewide: lightly refactor everything

* once_cell -> std::sync

* remove build.rs

we can get our target at runtime

* commands::copypasta: refactor selection

* drop owo_colors

* reactboard: always remove author from count

* commands: better handle behavior outside of guilds

* ci: garnix -> gha

* nix: drop flake-parts & pre-commit-hooks

* nix: fix rust flags in derivation

* add gha badge to readme

* ci: fail when format changes are made

* ci: only run on push to main

* nix: fix nil script

* nix: add libiconv to darwin deps

* ci: disable fail-fast

* nix: fix actionlint & static checks

* ci: add release gates

* nix: fix nil check again

* ci: give release gates unique names

* ci: only build static packages in docker workflow

* nix: move dev outputs to subflake

* fix some typos

* nix: cleanup checks & dev shell

* add editorconfig
---
 src/commands/optional/uwurandom.rs | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

(limited to 'src/commands/optional/uwurandom.rs')

diff --git a/src/commands/optional/uwurandom.rs b/src/commands/optional/uwurandom.rs
index 312e54f..e717d5e 100644
--- a/src/commands/optional/uwurandom.rs
+++ b/src/commands/optional/uwurandom.rs
@@ -1,4 +1,4 @@
-use crate::Context;
+use crate::{Context, Error};
 
 use eyre::Result;
 use log::debug;
@@ -12,14 +12,22 @@ pub async fn uwurandom(
 	#[min = 1]
 	#[max = 2000]
 	length: Option<u16>,
-) -> Result<()> {
-	let gid = ctx.guild_id().unwrap_or_default();
-	let settings = ctx.data().storage.get_guild_settings(&gid).await?;
+) -> Result<(), Error> {
+	if let Some(guild_id) = ctx.guild_id() {
+		if let Some(storage) = &ctx.data().storage {
+			let settings = storage.get_guild_settings(&guild_id).await?;
 
-	if !settings.optional_commands_enabled {
-		debug!("Not running uwurandom in {gid} since it's disabled");
-		ctx.say("I'm not allowed to do that here").await?;
-		return Ok(());
+			if !settings.optional_commands_enabled {
+				debug!("Not running command in {guild_id} since it's disabled");
+				ctx.say("I'm not allowed to do that here").await?;
+
+				return Ok(());
+			}
+		} else {
+			debug!("Ignoring restrictions on command; no storage backend is attached!");
+		}
+	} else {
+		debug!("Ignoring restrictions on command; we're not in a guild");
 	}
 
 	let length = length.unwrap_or(rand::thread_rng().gen_range(1..50));
-- 
cgit v1.2.3