y2!kick now actually kicks instead of ban (#17)

Fix formatting

y2!kick now actually kicks instead of ban
This commit is contained in:
Natsu Kagami 2020-03-27 21:21:56 +00:00
parent 20a15efcc4
commit 99c7888dfb

View file

@ -58,7 +58,7 @@ fn clean(ctx: &mut Context, msg: &Message, mut args: Args) -> CommandResult {
#[command] #[command]
#[required_permissions(ADMINISTRATOR)] #[required_permissions(ADMINISTRATOR)]
#[description = "Ban an user with a certain reason."] #[description = "Ban an user with a certain reason."]
#[usage = "ban user#1234 spam"] #[usage = "@user#1234/spam"]
#[min_args(1)] #[min_args(1)]
#[max_args(2)] #[max_args(2)]
#[only_in("guilds")] #[only_in("guilds")]
@ -83,26 +83,18 @@ fn ban(ctx: &mut Context, msg: &Message, mut args: Args) -> CommandResult {
#[command] #[command]
#[required_permissions(ADMINISTRATOR)] #[required_permissions(ADMINISTRATOR)]
#[description = "Kick an user with a certain reason."] #[description = "Kick an user."]
#[usage = "kick user#1234 spam"] #[usage = "@user#1234"]
#[min_args(1)] #[num_args(1)]
#[max_args(2)]
#[only_in("guilds")] #[only_in("guilds")]
fn kick(ctx: &mut Context, msg: &Message, mut args: Args) -> CommandResult { fn kick(ctx: &mut Context, msg: &Message, mut args: Args) -> CommandResult {
let user = args.single::<UserId>()?.to_user(&ctx)?; let user = args.single::<UserId>()?.to_user(&ctx)?;
let reason = args
.remains()
.map(|v| format!("`{}`", v))
.unwrap_or("no provided reason".to_owned());
msg.reply( msg.reply(&ctx, format!("🔫 Kicking user {}.", user.tag()))?;
&ctx,
format!("🔫 Kicking user {} for {}.", user.tag(), reason),
)?;
msg.guild_id msg.guild_id
.ok_or("Can't get guild from message?")? // we had a contract .ok_or("Can't get guild from message?")? // we had a contract
.ban(&ctx.http, user, &reason)?; .kick(&ctx.http, user)?;
Ok(()) Ok(())
} }