diff options
| author | Nathan Perry <avaglir@gmail.com> | 2018-08-13 19:51:07 -0400 |
|---|---|---|
| committer | Nathan Perry <avaglir@gmail.com> | 2018-08-13 19:51:07 -0400 |
| commit | 831a906e8e422ff2bf294e5496c3a6acef804d8e (patch) | |
| tree | f1263a067d8b70d51590eb6ff9c782421368483f /src/commands/meme.rs | |
| parent | a064941bd542a4d66ac1452bd876fef91b0bf87f (diff) | |
update for 2018 edition
Diffstat (limited to 'src/commands/meme.rs')
| -rw-r--r-- | src/commands/meme.rs | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/commands/meme.rs b/src/commands/meme.rs index 44e29f1..3fd9db3 100644 --- a/src/commands/meme.rs +++ b/src/commands/meme.rs @@ -5,19 +5,20 @@ use serenity::framework::standard::Args; use diesel::PgConnection; use failure::Error; use std::sync::RwLock; +use lazy_static::lazy_static; use super::*; use super::playback::CtxExt; -use db::*; -use Result; +use crate::db::*; +use crate::Result; lazy_static! { static ref LAST_MEME: RwLock<Option<i32>> = RwLock::new(None); } fn update_meme(meme: &Meme) -> Result<()> { - let mut opt = LAST_MEME.write().map_err(|_| ::failure::err_msg("unable to acquire lock"))?; + let mut opt = LAST_MEME.write().map_err(|_| crate::failure::err_msg("unable to acquire lock"))?; *opt = Some(meme.id); Ok(()) @@ -69,7 +70,7 @@ pub fn wat(_: &mut Context, msg: &Message, _: Args) -> Result<()> { match meme { Ok(ref meme) => { let metadata = Metadata::find(&conn, meme.metadata_id)?; - let author = ::TARGET_GUILD_ID.member(metadata.created_by as u64)?; + let author = crate::TARGET_GUILD_ID.member(metadata.created_by as u64)?; send(msg.channel_id, &format!("that was \"{}\" by {} ({})", |
