db: fixup build, async-await

1 files changed, 14 insertions, 11 deletions

diff --git a/src/commands/meme/invoke.rs b/src/commands/meme/invoke.rs
index 2db9e83..1400452 100644
--- a/src/commands/meme/invoke.rs
+++ b/src/commands/meme/invoke.rs
@@ -82,10 +82,11 @@ async fn _meme(
 
     let search = args.raw().join(" ");
 
-    let mut conn = connection()?;
-    let mem = match find_meme(&mut conn, search) {
+    let mut conn = connection().await?;
+    let mem = match find_meme(&mut conn, search).await {
         Ok(x) => {
-            InvocationRecord::create(&mut conn, msg.author.id.get(), msg.id.get(), x.id, false)?;
+            InvocationRecord::create(&mut conn, msg.author.id.get(), msg.id.get(), x.id, false)
+                .await?;
 
             x
         },
@@ -110,14 +111,14 @@ async fn rand_meme(
     message: &Message,
     audio_playback: AudioPlayback,
 ) -> CommandResult {
-    let mut conn = connection()?;
+    let mut conn = connection().await?;
 
     let should_audio = util::users_listening(ctx).await?;
 
     let mem = match audio_playback {
-        AudioPlayback::Required => db::rand_audio_meme(&mut conn),
-        AudioPlayback::Optional => db::rand_meme(&mut conn, should_audio),
-        AudioPlayback::Prohibited => db::rand_silent_meme(&mut conn),
+        AudioPlayback::Required => db::rand_audio_meme(&mut conn).await,
+        AudioPlayback::Optional => db::rand_meme(&mut conn, should_audio).await,
+        AudioPlayback::Prohibited => db::rand_silent_meme(&mut conn).await,
     };
 
     match mem {
@@ -128,7 +129,8 @@ async fn rand_meme(
                 message.id.get(),
                 mem.id,
                 true,
-            )?;
+            )
+            .await?;
             send_meme(ctx, &mem, &mut conn, message).await?;
             Ok(())
         },
@@ -151,12 +153,13 @@ async fn rand_meme(
 pub async fn rare_meme(ctx: &Context, msg: &Message, _args: Args) -> CommandResult {
     let should_audio = util::users_listening(ctx).await?;
 
-    let mut conn = connection()?;
+    let mut conn = connection().await?;
+    let meme = db::rare_meme(&mut conn, should_audio).await;
 
-    let meme = db::rare_meme(&mut conn, should_audio);
     match meme {
         Ok(meme) => {
-            InvocationRecord::create(&mut conn, msg.author.id.get(), msg.id.get(), meme.id, true)?;
+            InvocationRecord::create(&mut conn, msg.author.id.get(), msg.id.get(), meme.id, true)
+                .await?;
             send_meme(ctx, &meme, &mut conn, msg).await
         },
         Err(e) => {