diff --git a/src/commands/self_roles/admin.rs b/src/commands/self_roles/admin.rs index 46f96dc..96c21ec 100644 --- a/src/commands/self_roles/admin.rs +++ b/src/commands/self_roles/admin.rs @@ -50,9 +50,9 @@ pub async fn remove(ctx: Context<'_>, user: User) -> Result<(), Error> { guild.delete_role(ctx, role).await?; super::remove_role(role, guild, &mut *tx).await?; tx.commit().await?; - common::no_ping_reply(&ctx, format!("{}'s self role has been deleted.", user)).await?; + common::no_ping_reply(&ctx, format!("{user}'s self role has been deleted.")).await?; } else { - common::no_ping_reply(&ctx, format!("{} has no self role.", user)).await?; + common::no_ping_reply(&ctx, format!("{user} has no self role.")).await?; } Ok(()) @@ -103,11 +103,13 @@ pub async fn give(ctx: Context<'_>, user: User, role: Role, force: Option) member.add_role(ctx, role.id).await?; } else { if let Some(original) = super::get_user_role(member.user.id, guild, &mut *tx).await? { + let original = guild.role(ctx, original).await?; common::no_ping_reply(&ctx, format!("{original} is already set as this user's self role, enable force to overwrite.")).await?; return Ok(()); } if let Some(owner) = super::get_user_by_role(role.id, guild, &mut *tx).await? { + let owner = owner.to_user(ctx).await?; common::no_ping_reply(&ctx, format!("{role} is already owned by {owner}, enable force to overwrite.")).await?; return Ok(()); } diff --git a/src/commands/self_roles/name.rs b/src/commands/self_roles/name.rs index 5e96c0c..11052af 100644 --- a/src/commands/self_roles/name.rs +++ b/src/commands/self_roles/name.rs @@ -17,7 +17,7 @@ pub async fn name(ctx: Context<'_>, #[rest] name: String) -> Result<(), Error> { let user = ctx.author(); let role = guild.role(ctx, change_user_role_name(ctx, user, guild, name).await?).await?; - common::no_ping_reply(&ctx, format!("{} has been updated.", role)).await?; + common::no_ping_reply(&ctx, format!("{role} has been updated.")).await?; Ok(()) } diff --git a/src/commands/self_roles/whois.rs b/src/commands/self_roles/whois.rs index de1d177..ff7f502 100644 --- a/src/commands/self_roles/whois.rs +++ b/src/commands/self_roles/whois.rs @@ -25,7 +25,7 @@ pub async fn whois(ctx: Context<'_>, role: serenity::Role) -> Result<(), Error> let member = guild.member(ctx, user).await?; - common::no_ping_reply(&ctx, format!("{} owns this role.", member)).await?; + common::no_ping_reply(&ctx, format!("{member} owns this role.")).await?; } else { ctx.reply("This command must be used within a server!").await?; }