osmarks/autobotrobot
1
0
Fork 0
mirror of https://github.com/osmarks/autobotrobot synced 2025-01-05 05:10:26 +00:00
Code Issues Releases Wiki Activity

stuff

Browse Source
This commit is contained in:
osmarks 2018-11-10 22:58:22 +00:00
parent 90a5fce01e
commit a2718a2442
1 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/main.rs
View File

@ -8,7 +8,6 @@ extern crate regex;
use serenity::client::{Client, EventHandler}; use serenity::client::{Client, EventHandler};
use serenity::framework::standard::{StandardFramework, help_commands}; use serenity::framework::standard::{StandardFramework, help_commands};
use serenity::model::{channel::Message, id::ChannelId}; use serenity::model::{channel::Message, id::ChannelId};
use serenity::utils::Colour;
use std::env; use std::env;
use std::fmt::Display; use std::fmt::Display;
use regex::Regex; use regex::Regex;
@ -83,11 +82,24 @@ command!(eval_polish(_context, message, args) {
command!(exec(_context, message) { command!(exec(_context, message) {
lazy_static! { lazy_static! {
static ref RE: Regex = Regex::new("^.*exec.*```(.*)\n(.*)```").unwrap(); static ref RE: Regex = Regex::new("(?s)^.*exec.*```([a-zA-Z0-9_\\-+]+)\n(.+)\n```").unwrap();
} }
println!("{:?}", &message.content); let captures = match RE.captures(&message.content) {
println!("{:?}", RE.captures(&message.content)); Some(x) => x,
// Presumably just returning the Result from send_error should work, but it doesn't.
None => {
send_error(&message.channel_id, r#"Invalid format; expected a codeblock with a language set."#)?;
return Ok(());
}
};
let code = &captures[2];
let lang = &captures[1];
match lang {
_ => send_error(&message.channel_id, &format!("Unknown language `{}`.", lang))?
};
}); });
// BELOW THIS LINE BE DRAGONS // BELOW THIS LINE BE DRAGONS
@ -161,12 +173,14 @@ command!(search(_context, message, args) {
} }
} }
}, },
ddg::Type::Exclusive => send_search_result(channel, SearchResult { ddg::Type::Exclusive => {
title: query, send_search_result(channel, SearchResult {
text: String::from("[see link]"), title: query,
image: None, text: result.redirect.clone(),
url: Some(result.abstract_url) image: None,
})?, url: Some(result.redirect)
})?
},
ddg::Type::Nothing => send_error(channel, "No results.")?, ddg::Type::Nothing => send_error(channel, "No results.")?,
other => send_error(channel, &format!("{:?} - unrecognized result type", other))? other => send_error(channel, &format!("{:?} - unrecognized result type", other))?
} }