restructure meme module

4 files changed, 325 insertions, 249 deletions

diff --git a/src/commands/meme/create.rs b/src/commands/meme/create.rs
new file mode 100644
index 0000000..245f067
--- /dev/null
+++ b/src/commands/meme/create.rs
@@ -0,0 +1,174 @@
+use std::{
+    io::Read,
+    process::{
+        Command,
+        Stdio,
+    },
+};
+
+use diesel::result::Error as DieselError;
+use serenity::{
+    framework::standard::Args,
+    model::channel::Message,
+    prelude::*,
+};
+use url::Url;
+
+use crate::{
+    audio::{
+        parse_times,
+        ytdl_url,
+    },
+    commands::send,
+    db::{
+        Audio,
+        connection,
+        Image,
+        NewMeme,
+    },
+    Result,
+};
+
+pub fn addmeme(_: &mut Context, msg: &Message, args: Args) -> Result<()> {
+    let mut args = Args::new(args.rest(), &[" ".to_owned(), "\n".to_owned(), "\t".to_owned()]);
+
+    let title = args.single_quoted::<String>()?;
+    let text = args.rest().to_owned();
+
+    let text = if text.is_empty() { None } else { Some(text) };
+
+    let conn = connection()?;
+
+    let image = msg.attachments.first()
+        .ok_or(::failure::err_msg("no attachment"))
+        .and_then(|att| {
+            let data = att.download()?;
+            Image::create(&conn, &att.filename, data, msg.author.id.0)
+        })
+        .ok();
+
+    if image.is_none() && text.is_none() {
+        warn!("tried to create non-audio meme with no image or text");
+        return send(msg.channel_id, "hahAA it's empty xdddd", msg.tts);
+    }
+
+    let save_result = NewMeme {
+        title,
+        content: text,
+        image_id: image,
+        audio_id: None,
+        metadata_id: 0,
+    }.save(&conn, msg.author.id.0).map(|_| {});
+
+    use diesel::result::DatabaseErrorKind;
+    match save_result {
+        Ok(_) => msg.react("👌"),
+        Err(e) => {
+            if let Some(DieselError::DatabaseError(DatabaseErrorKind::UniqueViolation, _)) = e.downcast_ref::<DieselError>() {
+                error!("tried to create meme that already exists");
+                msg.react("❌")?;
+                return send(msg.channel_id, "that meme already exists", msg.tts);
+            }
+
+            return Err(e);
+        }
+    }
+}
+
+pub fn addaudiomeme(_: &mut Context, msg: &Message, args: Args) -> Result<()> {
+    let mut args = Args::new(args.rest(), &[" ".to_owned(), "\n".to_owned(), "\t".to_owned()]);
+
+    let title = args.single_quoted::<String>()?;
+    let audio_str = args.single_quoted::<String>()?;
+
+    let elems = audio_str.split_whitespace().collect::<Vec<_>>();
+
+    if elems.len() == 0 {
+        send(msg.channel_id, "are you stupid", msg.tts)?;
+        return Err(::failure::err_msg("no audio link was provided"))
+    }
+
+    let audio_link = Url::parse(elems[0])?;
+    let opts = elems[1..].join(" ");
+    let (start, end) = parse_times(opts);
+
+    let youtube_url = ytdl_url(audio_link.as_str())?;
+
+    let duration_opts = if let Some(e) = end {
+        vec! [
+            "-ss".to_owned(), start.map_or_else(
+                || "00:00:00".to_owned(),
+                |s| format!("{:02}:{:02}:{:02}", s.num_hours(), s.num_minutes() % 60, s.num_seconds() % 60)
+            ),
+
+            "-to".to_owned(), format!("{:02}:{:02}:{:02}", e.num_hours(), e.num_minutes() % 60, e.num_seconds() % 60),
+        ]
+    } else {
+        vec! []
+    };
+
+    let ffmpeg_command = Command::new("ffmpeg")
+        .arg("-i")
+        .arg(youtube_url)
+        .args(duration_opts)
+        .args(&[
+            "-ac", "2",
+            "-ar", "48000",
+            "-f", "opus",
+            "-acodec", "libopus",
+            "-b:a", "96k",
+            "-fs", "5M",
+            "-",
+        ])
+        .stdout(Stdio::piped())
+        .stderr(Stdio::null())
+        .stdin(Stdio::null())
+        .spawn()?;
+
+    let mut audio_reader = ffmpeg_command.stdout.unwrap();
+
+    let text = args.rest().to_owned();
+    let text = if text.is_empty() { None } else { Some(text) };
+
+    let conn = connection()?;
+
+    let image = msg.attachments.first()
+        .ok_or(::failure::err_msg("no attachment"))
+        .and_then(|att| {
+            let data = att.download()?;
+            Image::create(&conn, &att.filename, data, msg.author.id.0)
+        })
+        .ok();
+
+    let mut audio_data = Vec::new();
+    let bytes = audio_reader.read_to_end(&mut audio_data)?;
+
+    if bytes == 0 {
+        debug!("read 0 bytes from audio reader");
+        return send(msg.channel_id, "🔇🔇🔇🔕🔕🔕🔕🔕🔇🔕🔕🔇🔕🔕📣📢📣📢📣", msg.tts);
+    }
+
+    let audio_id = Audio::create(&conn, audio_data, msg.author.id.0)?;
+
+    let save_result = NewMeme {
+        title,
+        content: text,
+        image_id: image,
+        audio_id: Some(audio_id),
+        metadata_id: 0,
+    }.save(&conn, msg.author.id.0).map(|_| {});
+
+    use diesel::result::DatabaseErrorKind;
+    match save_result {
+        Ok(_) => msg.react("👌"),
+        Err(e) => {
+            if let Some(DieselError::DatabaseError(DatabaseErrorKind::UniqueViolation, _)) = e.downcast_ref::<DieselError>() {
+                error!("tried to create meme that already exists");
+                msg.react("❌")?;
+                return send(msg.channel_id, "that meme already exists", msg.tts);
+            }
+
+            return Err(e);
+        }
+    }
+}
diff --git a/src/commands/meme/delete.rs b/src/commands/meme/delete.rs
new file mode 100644
index 0000000..5c6eb13
--- /dev/null
+++ b/src/commands/meme/delete.rs
@@ -0,0 +1,37 @@
+use diesel::{
+    NotFound,
+    result::Error as DieselError,
+};
+use serenity::{
+    framework::standard::Args,
+    model::channel::Message,
+    prelude::*,
+};
+
+use crate::{
+    commands::send,
+    db::{
+        connection,
+        delete_meme,
+    },
+    Result,
+};
+
+pub fn delmeme(_: &mut Context, msg: &Message, mut args: Args) -> Result<()> {
+    let title = args.single_quoted::<String>()?;
+
+    let conn = connection()?;
+    match delete_meme(&conn, &title, msg.author.id.0) {
+        Ok(_) => msg.react("💀"),
+        Err(e) => {
+            if let Some(NotFound) = e.downcast_ref::<DieselError>() {
+                msg.react("❓")?;
+                info!("attempted to delete nonexistent meme: '{}'", title);
+                send(msg.channel_id, "nice try", msg.tts)?;
+                return Ok(());
+            }
+
+            Err(e)
+        }
+    }
+}
diff --git a/src/commands/meme/invoke.rs b/src/commands/meme/invoke.rs
new file mode 100644
index 0000000..8deecb5
--- /dev/null
+++ b/src/commands/meme/invoke.rs
@@ -0,0 +1,105 @@
+use diesel::result::Error as DieselError;
+use failure::Error;
+use serenity::{
+    framework::standard::Args,
+    model::channel::Message,
+    prelude::*,
+};
+
+use crate::{
+    audio::CtxExt,
+    commands::{
+        meme::send_meme,
+        send,
+    },
+    db::{
+        connection,
+        find_meme,
+        InvocationRecord,
+        rand_audio_meme as db_rand_audio_meme,
+        rand_meme as db_rand_meme,
+        rand_silent_meme as db_rand_silent_meme,
+    },
+    Result,
+};
+
+#[inline]
+pub fn meme(ctx: &mut Context, msg: &Message, args: Args) -> Result<()> {
+    _meme(ctx, msg, args, AudioPlayback::Optional)
+}
+
+#[inline]
+pub fn audio_meme(ctx: &mut Context, msg: &Message, args: Args) -> Result<()> {
+    _meme(ctx, msg, args, AudioPlayback::Required)
+}
+
+#[inline]
+pub fn silent_meme(ctx: &mut Context, msg: &Message, args: Args) -> Result<()> {
+    _meme(ctx, msg, args, AudioPlayback::Prohibited)
+}
+
+#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)]
+enum AudioPlayback {
+    Required,
+    Optional,
+    Prohibited,
+}
+
+fn _meme(ctx: &mut Context, msg: &Message, args: Args, audio_playback: AudioPlayback) -> Result<()> {
+    if args.len() == 0 || audio_playback != AudioPlayback::Optional {
+        return rand_meme(ctx, msg, audio_playback);
+    }
+
+    let search = args.full();
+
+    let conn = connection()?;
+    let mem = match find_meme(&conn, search) {
+        Ok(x) => {
+            InvocationRecord::create(&conn, msg.author.id.0, msg.id.0, x.id, false)?;
+
+            x
+        },
+        Err(e) => {
+            return if let Some(NotFound) = e.downcast_ref::<DieselError>() {
+                info!("requested meme not found in database");
+                send(msg.channel_id, "c'mon baby, guesstimate", msg.tts)
+            } else {
+                send(msg.channel_id, "what in ryan's name", msg.tts)?;
+                Err(e)
+            };
+        },
+    };
+
+    send_meme(ctx, &mem, &conn, msg)
+}
+
+fn rand_meme(ctx: &Context, message: &Message, audio_playback: AudioPlayback) -> Result<()> {
+    let conn = connection()?;
+
+    let should_audio = ctx.users_listening()?;
+
+    let mem = match audio_playback {
+        AudioPlayback::Required => db_rand_audio_meme(&conn),
+        AudioPlayback::Optional => db_rand_meme(&conn, should_audio),
+        AudioPlayback::Prohibited => db_rand_silent_meme(&conn),
+    };
+
+    match mem {
+        Ok(mem) => {
+            InvocationRecord::create(&conn, message.author.id.0, message.id.0, mem.id, true)?;
+            send_meme(ctx, &mem, &conn, message).map_err(Error::from)
+        },
+        Err(e) => {
+            match e.downcast_ref::<DieselError>() {
+                Some(NotFound) => {
+                    info!("random meme not found");
+                    return send(message.channel_id, "i don't know any :(", message.tts)
+                },
+                _ => {},
+            }
+
+            send(message.channel_id, "HELP", message.tts)?;
+            return Err(e);
+        },
+    }
+}
diff --git a/src/commands/meme/mod.rs b/src/commands/meme/mod.rs
index 3c30a61..d29a025 100644
--- a/src/commands/meme/mod.rs
+++ b/src/commands/meme/mod.rs
@@ -40,261 +40,21 @@ use crate::{
         InvocationRecord,
         Meme,
         NewMeme,
-        rand_audio_meme as db_rand_audio_meme,
-        rand_meme as db_rand_meme,
-        rand_silent_meme as db_rand_silent_meme,
     },
     Result,
 };
 
-pub use self::history::*;
+pub use self::{
+    create::*,
+    delete::*,
+    history::*,
+    invoke::*,
+};
 
 mod history;
-
-#[inline]
-pub fn meme(ctx: &mut Context, msg: &Message, args: Args) -> Result<()> {
-    _meme(ctx, msg, args, AudioPlayback::Optional)
-}
-
-#[inline]
-pub fn audio_meme(ctx: &mut Context, msg: &Message, args: Args) -> Result<()> {
-    _meme(ctx, msg, args, AudioPlayback::Required)
-}
-
-pub fn silent_meme(ctx: &mut Context, msg: &Message, args: Args) -> Result<()> {
-    _meme(ctx, msg, args, AudioPlayback::Prohibited)
-}
-
-#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)]
-enum AudioPlayback {
-    Required,
-    Optional,
-    Prohibited,
-}
-
-fn _meme(ctx: &mut Context, msg: &Message, args: Args, audio_playback: AudioPlayback) -> Result<()> {
-    if args.len() == 0 || audio_playback != AudioPlayback::Optional {
-        return rand_meme(ctx, msg, audio_playback);
-    }
-
-    let search = args.full();
-
-    let conn = connection()?;
-    let mem = match find_meme(&conn, search) {
-        Ok(x) => {
-            InvocationRecord::create(&conn, msg.author.id.0, msg.id.0, x.id, false)?;
-
-            x
-        },
-        Err(e) => {
-            return if let Some(NotFound) = e.downcast_ref::<DieselError>() {
-                info!("requested meme not found in database");
-                send(msg.channel_id, "c'mon baby, guesstimate", msg.tts)
-            } else {
-                send(msg.channel_id, "what in ryan's name", msg.tts)?;
-                Err(e)
-            };
-        },
-    };
-
-    send_meme(ctx, &mem, &conn, msg)
-}
-
-
-pub fn addmeme(_: &mut Context, msg: &Message, args: Args) -> Result<()> {
-    let mut args = Args::new(args.rest(), &[" ".to_owned(), "\n".to_owned(), "\t".to_owned()]);
-
-    let title = args.single_quoted::<String>()?;
-    let text = args.rest().to_owned();
-
-    let text = if text.is_empty() { None } else { Some(text) };
-
-    let conn = connection()?;
-
-    let image = msg.attachments.first()
-        .ok_or(::failure::err_msg("no attachment"))
-        .and_then(|att| {
-            let data = att.download()?;
-            Image::create(&conn, &att.filename, data, msg.author.id.0)
-        })
-        .ok();
-
-    if image.is_none() && text.is_none() {
-        warn!("tried to create non-audio meme with no image or text");
-        return send(msg.channel_id, "hahAA it's empty xdddd", msg.tts);
-    }
-
-    let save_result = NewMeme {
-        title,
-        content: text,
-        image_id: image,
-        audio_id: None,
-        metadata_id: 0,
-    }.save(&conn, msg.author.id.0).map(|_| {});
-
-    use diesel::result::DatabaseErrorKind;
-    match save_result {
-        Ok(_) => msg.react("👌"),
-        Err(e) => {
-            if let Some(DieselError::DatabaseError(DatabaseErrorKind::UniqueViolation, _)) = e.downcast_ref::<DieselError>() {
-                error!("tried to create meme that already exists");
-                msg.react("❌")?;
-                return send(msg.channel_id, "that meme already exists", msg.tts);
-            }
-
-            return Err(e);
-        }
-    }
-}
-
-pub fn addaudiomeme(_: &mut Context, msg: &Message, args: Args) -> Result<()> {
-    let mut args = Args::new(args.rest(), &[" ".to_owned(), "\n".to_owned(), "\t".to_owned()]);
-
-    let title = args.single_quoted::<String>()?;
-    let audio_str = args.single_quoted::<String>()?;
-
-    let elems = audio_str.split_whitespace().collect::<Vec<_>>();
-
-    if elems.len() == 0 {
-        send(msg.channel_id, "are you stupid", msg.tts)?;
-        return Err(::failure::err_msg("no audio link was provided"))
-    }
-
-    let audio_link = Url::parse(elems[0])?;
-    let opts = elems[1..].join(" ");
-    let (start, end) = parse_times(opts);
-
-    let youtube_url = ytdl_url(audio_link.as_str())?;
-
-    let duration_opts = if let Some(e) = end {
-        vec! [
-            "-ss".to_owned(), start.map_or_else(
-                || "00:00:00".to_owned(),
-                |s| format!("{:02}:{:02}:{:02}", s.num_hours(), s.num_minutes() % 60, s.num_seconds() % 60)
-            ),
-
-            "-to".to_owned(), format!("{:02}:{:02}:{:02}", e.num_hours(), e.num_minutes() % 60, e.num_seconds() % 60),
-        ]
-    } else {
-        vec! []
-    };
-
-    let ffmpeg_command = Command::new("ffmpeg")
-        .arg("-i")
-        .arg(youtube_url)
-        .args(duration_opts)
-        .args(&[
-            "-ac", "2",
-            "-ar", "48000",
-            "-f", "opus",
-            "-acodec", "libopus",
-            "-b:a", "96k",
-            "-fs", "5M",
-            "-",
-        ])
-        .stdout(Stdio::piped())
-        .stderr(Stdio::null())
-        .stdin(Stdio::null())
-        .spawn()?;
-
-    let mut audio_reader = ffmpeg_command.stdout.unwrap();
-
-    let text = args.rest().to_owned();
-    let text = if text.is_empty() { None } else { Some(text) };
-
-    let conn = connection()?;
-
-    let image = msg.attachments.first()
-        .ok_or(::failure::err_msg("no attachment"))
-        .and_then(|att| {
-            let data = att.download()?;
-            Image::create(&conn, &att.filename, data, msg.author.id.0)
-        })
-        .ok();
-
-    let mut audio_data = Vec::new();
-    let bytes = audio_reader.read_to_end(&mut audio_data)?;
-
-    if bytes == 0 {
-        debug!("read 0 bytes from audio reader");
-        return send(msg.channel_id, "🔇🔇🔇🔕🔕🔕🔕🔕🔇🔕🔕🔇🔕🔕📣📢📣📢📣", msg.tts);
-    }
-
-    let audio_id = Audio::create(&conn, audio_data, msg.author.id.0)?;
-
-    let save_result = NewMeme {
-        title,
-        content: text,
-        image_id: image,
-        audio_id: Some(audio_id),
-        metadata_id: 0,
-    }.save(&conn, msg.author.id.0).map(|_| {});
-
-    use diesel::result::DatabaseErrorKind;
-    match save_result {
-        Ok(_) => msg.react("👌"),
-        Err(e) => {
-            if let Some(DieselError::DatabaseError(DatabaseErrorKind::UniqueViolation, _)) = e.downcast_ref::<DieselError>() {
-                error!("tried to create meme that already exists");
-                msg.react("❌")?;
-                return send(msg.channel_id, "that meme already exists", msg.tts);
-            }
-
-            return Err(e);
-        }
-    }
-}
-
-pub fn delmeme(_: &mut Context, msg: &Message, mut args: Args) -> Result<()> {
-    let title = args.single_quoted::<String>()?;
-
-    let conn = connection()?;
-    match delete_meme(&conn, &title, msg.author.id.0) {
-        Ok(_) => msg.react("💀"),
-        Err(e) => {
-            if let Some(NotFound) = e.downcast_ref::<DieselError>() {
-                msg.react("❓")?;
-                info!("attempted to delete nonexistent meme: '{}'", title);
-                send(msg.channel_id, "nice try", msg.tts)?;
-                return Ok(());
-            }
-
-            Err(e)
-        }
-    }
-}
-
-
-fn rand_meme(ctx: &Context, message: &Message, audio_playback: AudioPlayback) -> Result<()> {
-    let conn = connection()?;
-
-    let should_audio = ctx.users_listening()?;
-
-    let mem = match audio_playback {
-        AudioPlayback::Required => db_rand_audio_meme(&conn),
-        AudioPlayback::Optional => db_rand_meme(&conn, should_audio),
-        AudioPlayback::Prohibited => db_rand_silent_meme(&conn),
-    };
-
-    match mem {
-        Ok(mem) => {
-            InvocationRecord::create(&conn, message.author.id.0, message.id.0, mem.id, true)?;
-            send_meme(ctx, &mem, &conn, message).map_err(Error::from)
-        },
-        Err(e) => {
-            match e.downcast_ref::<DieselError>() {
-                Some(NotFound) => {
-                    info!("random meme not found");
-                    return send(message.channel_id, "i don't know any :(", message.tts)
-                },
-                _ => {},
-            }
-
-            send(message.channel_id, "HELP", message.tts)?;
-            return Err(e);
-        },
-    }
-}
+mod create;
+mod invoke;
+mod delete;
 
 fn send_meme(ctx: &Context, t: &Meme, conn: &PgConnection, msg: &Message) -> Result<()> {
     debug!("sending meme: {:?}", t);