From 6f1adcee5e095dcfa49e04b30b9e7f4c15100d5d Mon Sep 17 00:00:00 2001 From: minneelyyyy Date: Sat, 17 May 2025 23:16:59 -0400 Subject: [PATCH] use consistent guild getter syntax --- src/commands/administration/ban.rs | 18 +++++---------- src/commands/self_roles/color.rs | 6 ++--- src/commands/self_roles/disown.rs | 6 ++--- src/commands/self_roles/name.rs | 7 ++---- src/commands/self_roles/register.rs | 6 ++--- src/commands/self_roles/remove.rs | 6 ++--- src/commands/settings.rs | 36 ++++++++++------------------- src/common.rs | 1 + src/main.rs | 5 ++-- 9 files changed, 31 insertions(+), 60 deletions(-) diff --git a/src/commands/administration/ban.rs b/src/commands/administration/ban.rs index a18bdd1..ce6fbc4 100644 --- a/src/commands/administration/ban.rs +++ b/src/commands/administration/ban.rs @@ -10,12 +10,9 @@ pub async fn ban(ctx: Context<'_>, #[rest] reason: Option) -> Result<(), Error> { - let guild = match ctx.guild_id() { - Some(g) => g, - None => { - ctx.reply("This command must be ran within a guild.").await?; - return Ok(()); - } + let Some(guild) = ctx.guild_id() else { + ctx.reply("This command must be ran within a guild.").await?; + return Ok(()); }; if let Some(role) = settings::get_banrole(ctx, guild).await? { @@ -35,12 +32,9 @@ pub async fn ban(ctx: Context<'_>, #[poise::command(slash_command, prefix_command)] pub async fn unban(ctx: Context<'_>, user: serenity::User) -> Result<(), Error> { - let guild = match ctx.guild_id() { - Some(g) => g, - None => { - ctx.reply("This command must be ran within a guild.").await?; - return Ok(()); - } + let Some(guild) = ctx.guild_id() else { + ctx.reply("This command must be ran within a guild.").await?; + return Ok(()); }; if let Some(role) = settings::get_banrole(ctx, guild).await? { diff --git a/src/commands/self_roles/color.rs b/src/commands/self_roles/color.rs index f0f6979..e8e93e5 100644 --- a/src/commands/self_roles/color.rs +++ b/src/commands/self_roles/color.rs @@ -73,10 +73,8 @@ pub async fn color(ctx: Context<'_>, Color::from_rgb(rgb.r, rgb.g, rgb.b) }; - let guild = if let Some(guild) = ctx.guild_id() { - guild - } else { - ctx.reply("This command can only be run inside of a guild.").await?; + let Some(guild) = ctx.guild_id() else { + ctx.reply("This command must be ran within a guild.").await?; return Ok(()); }; diff --git a/src/commands/self_roles/disown.rs b/src/commands/self_roles/disown.rs index 5f2a818..1fbe8b3 100644 --- a/src/commands/self_roles/disown.rs +++ b/src/commands/self_roles/disown.rs @@ -4,10 +4,8 @@ use crate::common::{Context, Error}; /// Remove and delete your personal role #[poise::command(slash_command, prefix_command)] pub async fn disown(ctx: Context<'_>) -> Result<(), Error> { - let guild = if let Some(guild) = ctx.guild_id() { - guild - } else { - ctx.reply("This command can only be run inside of a guild.").await?; + let Some(guild) = ctx.guild_id() else { + ctx.reply("This command must be ran within a guild.").await?; return Ok(()); }; diff --git a/src/commands/self_roles/name.rs b/src/commands/self_roles/name.rs index 5f353c6..c0ee3c5 100644 --- a/src/commands/self_roles/name.rs +++ b/src/commands/self_roles/name.rs @@ -6,13 +6,10 @@ use poise::serenity_prelude::EditRole; /// Change the name of your personal role #[poise::command(slash_command, prefix_command)] pub async fn name(ctx: Context<'_>, #[rest] name: String) -> Result<(), Error> { - let guild = if let Some(guild) = ctx.guild_id() { - guild - } else { - ctx.reply("This command can only be run inside of a guild.").await?; + let Some(guild) = ctx.guild_id() else { + ctx.reply("This command must be ran within a guild.").await?; return Ok(()); }; - let user = ctx.author(); let mut tx = ctx.data().database.begin().await?; diff --git a/src/commands/self_roles/register.rs b/src/commands/self_roles/register.rs index 92ebb02..57140e6 100644 --- a/src/commands/self_roles/register.rs +++ b/src/commands/self_roles/register.rs @@ -6,10 +6,8 @@ use poise::serenity_prelude as serenity; /// Register an existing role as a user's custom role. This deletes their current self role. #[poise::command(slash_command, prefix_command, required_permissions = "MANAGE_ROLES")] pub async fn register(ctx: Context<'_>, user: serenity::User, role: serenity::Role) -> Result<(), Error> { - let guild = if let Some(guild) = ctx.guild_id() { - guild - } else { - ctx.reply("This command can only be run inside of a guild.").await?; + let Some(guild) = ctx.guild_id() else { + ctx.reply("This command must be ran within a guild.").await?; return Ok(()); }; diff --git a/src/commands/self_roles/remove.rs b/src/commands/self_roles/remove.rs index e145c12..c0f941f 100644 --- a/src/commands/self_roles/remove.rs +++ b/src/commands/self_roles/remove.rs @@ -5,10 +5,8 @@ use poise::serenity_prelude as serenity; #[poise::command(slash_command, prefix_command, required_permissions = "MANAGE_ROLES")] pub async fn remove(ctx: Context<'_>, user: serenity::User) -> Result<(), Error> { - let guild = if let Some(guild) = ctx.guild_id() { - guild - } else { - ctx.reply("This command can only be run inside of a guild.").await?; + let Some(guild) = ctx.guild_id() else { + ctx.reply("This command must be ran within a guild.").await?; return Ok(()); }; diff --git a/src/commands/settings.rs b/src/commands/settings.rs index 48f8bef..8ea13eb 100644 --- a/src/commands/settings.rs +++ b/src/commands/settings.rs @@ -20,12 +20,9 @@ async fn get_prefix(ctx: Context<'_>, guild: GuildId) -> Result, #[poise::command(prefix_command, slash_command)] async fn prefix(ctx: Context<'_>, prefix: Option) -> Result<(), Error> { - let guild = match ctx.guild_id() { - Some(g) => g, - None => { - ctx.reply("This command must be ran within a guild.").await?; - return Ok(()); - } + let Some(guild) = ctx.guild_id() else { + ctx.reply("This command must be ran within a guild.").await?; + return Ok(()); }; match prefix { @@ -74,12 +71,9 @@ pub async fn get_positional_role(ctx: Context<'_>, guild: GuildId) -> Result, role: Option) -> Result<(), Error> { - let guild = match ctx.guild_id() { - Some(g) => g, - None => { - ctx.reply("This command must be ran within a guild.").await?; - return Ok(()); - } + let Some(guild) = ctx.guild_id() else { + ctx.reply("This command must be ran within a guild.").await?; + return Ok(()); }; let member = ctx.author_member().await.unwrap(); @@ -132,12 +126,9 @@ pub async fn get_hoist_selfroles(ctx: Context<'_>, guild: GuildId) -> Result, hoist: Option) -> Result<(), Error> { - let guild = match ctx.guild_id() { - Some(g) => g, - None => { - ctx.reply("This command must be ran within a guild.").await?; - return Ok(()); - } + let Some(guild) = ctx.guild_id() else { + ctx.reply("This command must be ran within a guild.").await?; + return Ok(()); }; match hoist { @@ -195,12 +186,9 @@ pub async fn get_banrole(ctx: Context<'_>, guild: GuildId) -> Result, role: Option) -> Result<(), Error> { - let guild = match ctx.guild_id() { - Some(g) => g, - None => { - ctx.reply("This command must be ran within a guild.").await?; - return Ok(()); - } + let Some(guild) = ctx.guild_id() else { + ctx.reply("This command must be ran within a guild.").await?; + return Ok(()); }; let member = ctx.author_member().await.unwrap(); diff --git a/src/common.rs b/src/common.rs index 240bba4..17dcff1 100644 --- a/src/common.rs +++ b/src/common.rs @@ -1,3 +1,4 @@ +use poise::serenity_prelude::GuildId; use poise::ReplyHandle; use sqlx::{Pool, Postgres}; diff --git a/src/main.rs b/src/main.rs index b063c6e..6b1c045 100644 --- a/src/main.rs +++ b/src/main.rs @@ -55,9 +55,8 @@ async fn event_handler( } async fn get_prefix(ctx: PartialContext<'_, Data, Error>) -> Result, Error> { - let guild = match ctx.guild_id { - Some(guild) => guild, - None => return Ok(ctx.data.prefix.clone()), + let Some(guild) = ctx.guild_id else { + return Ok(ctx.data.prefix.clone()); }; let db = &ctx.data.database;