fix text meme creation

2 files changed, 5 insertions, 8 deletions

diff --git a/src/commands/meme/create.rs b/src/commands/meme/create.rs
index 9a89dbe..11af7e9 100644
--- a/src/commands/meme/create.rs
+++ b/src/commands/meme/create.rs
@@ -63,17 +63,15 @@ pub fn addmeme(ctx: &mut Context, msg: &Message, args: Args) -> Result<()> {
         return ctx.send(msg.channel_id, "hahAA it's empty xdddd", msg.tts);
     }
 
-    let image_id = image
-        .ok_or(anyhow!("no attachment"))
-        .and_then(|att| {
-            let data = att.download()?;
-            Image::create(&conn, &att.filename, data, msg.author.id.0)
-        })?;
+    let image_id = image.map(|att| {
+        let data = att.download()?;
+        Image::create(&conn, &att.filename, data, msg.author.id.0)
+    }).transpose()?;
 
     let save_result = NewMeme {
         title,
         content: text,
-        image_id: Some(image_id),
+        image_id,
         audio_id: None,
         metadata_id: 0,
     }.save(&conn, msg.author.id.0).map(|_| {});
diff --git a/src/main.rs b/src/main.rs
index 636fe44..4cdd1cb 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,4 +1,3 @@
-#![feature(impl_trait_in_bindings)]
 #![feature(try_trait)]
 #![feature(pattern)]
 #![feature(concat_idents)]