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

Improve error handling

This commit is contained in:
Agatha Rose 2020-06-11 17:48:29 +03:00
parent 4a43bf6218
commit 3540aff172
No known key found for this signature in database
GPG Key ID: 3F9F2317B3D5C3AC
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/main.rs
View File

@ -99,11 +99,19 @@ fn main() {
.say(&ctx.http, &format!("Try again in {} seconds.", seconds));
}
})
.after(|_ctx, _msg, cmd_name, error| {
.after(|ctx, msg, cmd_name, error| {
if let Err(why) = error {
let _ = msg.channel_id.send_message(&ctx.http, |m| {
m.embed(|e| {
e.title(format!("Error in **{}**", cmd_name))
.description(&why.0)
/*.thumbnail("https://i.imgur.com/VzOEz2E.png") oh no */
.colour(0xff6961)
})
});
eprintln!(
"{}",
format!("Error in {}: {}", cmd_name.purple(), why.0.red().bold())
format!("Error in {}: {}", cmd_name.purple(), &why.0.red().bold())
);
}
})
@ -229,13 +237,12 @@ fn host(ctx: &mut Context, message: &Message) -> CommandResult {
&ctx.http,
format!(
"OS: {os}; {release}\nHost: {host}\nCPU: {cpu}MHz",
os = sys_info::os_type().unwrap(),
host = sys_info::hostname().unwrap(),
release = sys_info::linux_os_release()
.unwrap()
os = sys_info::os_type()?,
host = sys_info::hostname()?,
release = sys_info::linux_os_release()?
.pretty_name
.unwrap_or_else(|| "Unknown".to_string()),
cpu = sys_info::cpu_speed().unwrap()
cpu = sys_info::cpu_speed()?
),
);
@ -349,7 +356,7 @@ fn bottom_rng(ctx: &mut Context, message: &Message, mut args: Args) -> CommandRe
if let Err(e) = messages {
let _ = message.channel_id.say(&ctx.http, format!("Error: {}", e));
} else {
let mut messages = messages.unwrap();
let mut messages = messages?;
messages.retain(|v| v.author != message.mentions[0]);
let mut input = String::new();
for msg in messages {
@ -561,7 +568,7 @@ fn info(ctx: &mut Context, message: &Message, args: Args) -> CommandResult {
}
let num = ctx.cache.read().guilds.len();
let aganame = OWNERS.clone()[0].to_user(ctx.http.clone()).unwrap().tag();
let aganame = OWNERS.clone()[0].to_user(ctx.http.clone())?.tag();
let _ = message.channel_id.send_message(&ctx.http, |m| m
.embed(|e| e
.title("Discordinator9000's info:")