videogame-hacker
/
rustcord
forked from sorceress/rustcord
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Clean up 5æm code from last night

This commit is contained in:
Agatha Rose 2020-04-29 17:26:29 +03:00
parent 634e8508d4
commit 238f8f9593
1 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/main.rs
View File

@ -6,7 +6,10 @@ extern crate lazy_static;
use colored::*; use colored::*;
use rand::Rng; use rand::Rng;
use serenity::{ use serenity::{
client::{Client, bridge::gateway::{ShardId, ShardManager}}, client::{
bridge::gateway::{ShardId, ShardManager},
Client,
},
framework::standard::{ framework::standard::{
macros::{check, command, group}, macros::{check, command, group},
Args, CheckResult, CommandError, CommandOptions, CommandResult, DispatchError, Reason, Args, CheckResult, CommandError, CommandOptions, CommandResult, DispatchError, Reason,
@ -144,8 +147,10 @@ fn ping(ctx: &mut Context, message: &Message) -> CommandResult {
let shard_manager = match data.get::<ShardManagerContainer>() { let shard_manager = match data.get::<ShardManagerContainer>() {
Some(v) => v, Some(v) => v,
None => { None => {
return Err(CommandError("There was a problem getting the shard manager!".to_string())); return Err(CommandError(
}, "There was a problem getting the shard manager!".to_string(),
))
}
}; };
let manager = shard_manager.lock(); let manager = shard_manager.lock();
@ -153,12 +158,15 @@ fn ping(ctx: &mut Context, message: &Message) -> CommandResult {
let runner = match runners.get(&ShardId(ctx.shard_id)) { let runner = match runners.get(&ShardId(ctx.shard_id)) {
Some(v) => v, Some(v) => v,
None => { None => return Err(CommandError("No shard found!".to_string())),
return Err(CommandError("No shard found!".to_string()));
}
}; };
let _ = message.reply(&ctx, format!("Pong! Latency: {:?}", runner.latency)); let ping = match runner.latency {
Some(v) => v.as_millis(),
None => return Err(CommandError("Could not get latency!".to_string())),
};
let _ = message.reply(&ctx, format!("Pong! Latency: {}ms", ping));
Ok(()) Ok(())
} }
@ -435,14 +443,14 @@ fn uwu(ctx: &mut Context, message: &Message) -> CommandResult {
"https://i.redd.it/ifwsmbme48q41.jpg" "https://i.redd.it/ifwsmbme48q41.jpg"
]; ];
let num = rand::thread_rng().gen_range(0, images.len()); let num = rand::thread_rng().gen_range(0, images.len());
let _ = message let _ = message.channel_id.send_message(&ctx.http, |m| {
.channel_id m.embed(|e| {
.send_message(&ctx.http, |m| m.embed(|e| {
e.image(images[num]); e.image(images[num]);
e.footer(|f| f.text(format!("Source: {}", images[num]))); e.footer(|f| f.text(format!("Source: {}", images[num])));
e e
})); })
});
Ok(()) Ok(())
} }
@ -524,7 +532,7 @@ fn help(ctx: &mut Context, message: &Message) -> CommandResult {
#[command] #[command]
fn info(ctx: &mut Context, message: &Message, args: Args) -> CommandResult { fn info(ctx: &mut Context, message: &Message, args: Args) -> CommandResult {
if !args.is_empty() { if !args.is_empty() {
return Err(CommandError("Error: Called with args!".to_string())); return Err(CommandError("Called with args!".to_string()));
} }
let num = ctx.cache.read().guilds.len(); let num = ctx.cache.read().guilds.len();