diff options
Diffstat (limited to 'src/ext/framework')
| -rw-r--r-- | src/ext/framework/help_commands.rs | 18 | ||||
| -rw-r--r-- | src/ext/framework/mod.rs | 28 |
2 files changed, 24 insertions, 22 deletions
diff --git a/src/ext/framework/help_commands.rs b/src/ext/framework/help_commands.rs index 863f3fd..d5e6ae2 100644 --- a/src/ext/framework/help_commands.rs +++ b/src/ext/framework/help_commands.rs @@ -8,7 +8,9 @@ use ::model::Message; use ::utils::Colour; fn error_embed(ctx: &mut Context, input: &str) { - let _ = ctx.send_message(|m| m + let _ = ctx.channel_id + .unwrap() + .send_message(|m| m .embed(|e| e .colour(Colour::dark_red()) .description(input))); @@ -63,7 +65,7 @@ pub fn with_embeds(ctx: &mut Context, return Ok(()); } - let _ = ctx.send_message(|m| { + let _ = ctx.channel_id.unwrap().send_message(|m| { m.embed(|e| { let mut embed = e.colour(Colour::rosewater()) .title(command_name); @@ -115,7 +117,7 @@ pub fn with_embeds(ctx: &mut Context, return Ok(()); } - let _ = ctx.send_message(|m| m + let _ = ctx.channel_id.unwrap().send_message(|m| m .embed(|mut e| { e = e.colour(Colour::rosewater()) .description("To get help with an individual command, pass its \ @@ -174,7 +176,7 @@ pub fn plain(ctx: &mut Context, found = Some((command_name, cmd)); }, CommandOrAlias::Alias(ref name) => { - let _ = ctx.say(&format!("Did you mean {:?}?", name)); + let _ = ctx.channel_id.unwrap().say(&format!("Did you mean {:?}?", name)); return Ok(()); } } @@ -183,7 +185,7 @@ pub fn plain(ctx: &mut Context, if let Some((command_name, command)) = found { if !command.help_available { - let _ = ctx.say("**Error**: No help available."); + let _ = ctx.channel_id.unwrap().say("**Error**: No help available."); return Ok(()); } @@ -215,13 +217,13 @@ pub fn plain(ctx: &mut Context, }); result.push_str("\n"); - let _ = ctx.say(&result); + let _ = ctx.channel_id.unwrap().say(&result); return Ok(()); } } - let _ = ctx.say(&format!("**Error**: Command `{}` not found.", name)); + let _ = ctx.channel_id.unwrap().say(&format!("**Error**: Command `{}` not found.", name)); return Ok(()); } @@ -254,7 +256,7 @@ pub fn plain(ctx: &mut Context, result.push('\n'); } - let _ = ctx.say(&result); + let _ = ctx.channel_id.unwrap().say(&result); Ok(()) } diff --git a/src/ext/framework/mod.rs b/src/ext/framework/mod.rs index 30a5c8f..3c926a7 100644 --- a/src/ext/framework/mod.rs +++ b/src/ext/framework/mod.rs @@ -349,7 +349,7 @@ impl Framework { if !is_owner { if command.owners_only { if let Some(ref message) = self.configuration.invalid_permission_message { - let _ = context.say(message); + let _ = context.channel_id.unwrap().say(message); } return; @@ -363,7 +363,7 @@ impl Framework { { if !self.configuration.allow_dm && message.is_private() { if let Some(ref message) = self.configuration.no_dm_message { - let _ = context.say(message); + let _ = context.channel_id.unwrap().say(message); } return; @@ -372,7 +372,7 @@ impl Framework { if self.configuration.blocked_users.contains(&message.author.id) { if let Some(ref message) = self.configuration.blocked_user_message { - let _ = context.say(message); + let _ = context.channel_id.unwrap().say(message); } return; @@ -383,7 +383,7 @@ impl Framework { if let Some(ref message) = self.configuration.command_disabled_message { let msg = message.replace("%command%", &to_check); - let _ = context.say(&msg); + let _ = context.channel_id.unwrap().say(&msg); } return; @@ -396,7 +396,7 @@ impl Framework { if let Some(ref message) = self.configuration.rate_limit_message { let msg = message.replace("%time%", &rate_limit.to_string()); - let _ = context.say(&msg); + let _ = context.channel_id.unwrap().say(&msg); } return; @@ -416,7 +416,7 @@ impl Framework { if let Some(guild_id) = guild_id { if self.configuration.blocked_guilds.contains(&guild_id) { if let Some(ref message) = self.configuration.blocked_guild_message { - let _ = context.say(message); + let _ = context.channel_id.unwrap().say(message); } return; @@ -425,7 +425,7 @@ impl Framework { if let Some(guild) = guild_id.find() { if self.configuration.blocked_users.contains(&guild.read().unwrap().owner_id) { if let Some(ref message) = self.configuration.blocked_guild_message { - let _ = context.say(message); + let _ = context.channel_id.unwrap().say(message); } return; @@ -436,14 +436,14 @@ impl Framework { if message.is_private() { if command.guild_only { if let Some(ref message) = self.configuration.no_guild_message { - let _ = context.say(message); + let _ = context.channel_id.unwrap().say(message); } return; } } else if command.dm_only { if let Some(ref message) = self.configuration.no_dm_message { - let _ = context.say(message); + let _ = context.channel_id.unwrap().say(message); } return; @@ -453,7 +453,7 @@ impl Framework { for check in &command.checks { if !(check)(&mut context, &message) { if let Some(ref message) = self.configuration.invalid_check_message { - let _ = context.say(message); + let _ = context.channel_id.unwrap().say(message); } continue 'outer; @@ -481,7 +481,7 @@ impl Framework { let msg = message.replace("%min%", &x.to_string()) .replace("%given%", &args.len().to_string()); - let _ = context.say(&msg); + let _ = context.channel_id.unwrap().say(&msg); } return; @@ -494,7 +494,7 @@ impl Framework { let msg = message.replace("%max%", &x.to_string()) .replace("%given%", &args.len().to_string()); - let _ = context.say(&msg); + let _ = context.channel_id.unwrap().say(&msg); } return; @@ -538,7 +538,7 @@ impl Framework { if !permissions_fulfilled { if let Some(ref message) = self.configuration.invalid_permission_message { - let _ = context.say(message); + let _ = context.channel_id.unwrap().say(message); } return; @@ -555,7 +555,7 @@ impl Framework { let result = match command.exec { CommandType::StringResponse(ref x) => { - let _ = &mut context.say(x); + let _ = &mut context.channel_id.unwrap().say(x); Ok(()) }, |