Cleanup :)

Cargo.toml

@@ -16,3 +16,4 @@ serenity_utils = "0.7.0"
 tokio = { version = "1.29.1", features = ["macros", "rt-multi-thread"] }
 rand = "0.8.4"
 regex = "1.9.0"
+url = "2.4.0"

src/main.rs

@@ -1,9 +1,10 @@
+use moove::moove;
+use rand::random;
 use serenity::async_trait;
 use serenity::model::channel::Message;
 use serenity::model::gateway::Ready;
 use serenity::prelude::*;
 use util::security::dotenv_var;
-use rand::random;
 
 mod moove;
 mod util;
@@ -13,6 +14,10 @@ struct Handler;
 #[async_trait]
 impl EventHandler for Handler {
     async fn message(&self, ctx: Context, msg: Message) {
+        match moove(ctx.http.clone(), msg.clone()).await {
+            Ok(_) => (),
+            Err(e) => println!("ERROR MOVING!{e}"),
+        }
         if msg.content == "!ping" {
             if let Err(why) = msg.channel_id.say(&ctx.http, "Pong!").await {
                 println!("Error sending message: {:?}", why);
@@ -24,7 +29,7 @@ impl EventHandler for Handler {
         println!("{} is connected!", ready.user.name);
         let debug = match dotenv_var("DEBUG") {
             Some(v) => v,
-            None => "OFF".to_string()
+            None => "OFF".to_string(),
         };
         if debug == "ON" {
             let messages = [
@@ -42,7 +47,7 @@ impl EventHandler for Handler {
             let channel = ctx.http.get_channel(780439236867653635).await.unwrap().id();
             match channel.say(&ctx.http, messages[rand_num]).await {
                 Err(e) => println!("Something went wrong: {e}"),
-                Ok(_) => return
+                Ok(_) => return,
             };
         }
     }
@@ -52,8 +57,7 @@ impl EventHandler for Handler {
 async fn main() -> anyhow::Result<()> {
     use anyhow::Context;
     let token = dotenv_var("TOKEN").context("No TOKEN in env")?;
-    let intents = GatewayIntents::GUILD_MESSAGES
-        | GatewayIntents::MESSAGE_CONTENT;
+    let intents = GatewayIntents::GUILD_MESSAGES | GatewayIntents::MESSAGE_CONTENT;
 
     let mut client = Client::builder(&token, intents)
         .event_handler(Handler)

src/moove.rs

@@ -1,73 +1,56 @@
+use std::sync::Arc;
+
+use anyhow::{self, Context};
+use poise::serenity_prelude::AttachmentType;
 use serenity::builder::{CreateEmbed, CreateMessage};
-use serenity::model::channel::Message;
 use serenity::http::Http;
 use serenity::model::channel::Attachment;
-use anyhow;
+use serenity::model::channel::Message;
 use serenity::model::mention;
+use url::Url;
 
 // use regex::Regex;
 
 // Checks if the message should be mooved, if not returns Ok(0)
 // If the message should be mooved, try to move it and return Ok(1) if mooved succesfully
 // else returns Err()
-pub async fn moove(http: Http, msg: Message) -> Result<u8, String>{
+
+pub async fn moove(http: Arc<Http>, msg: Message) -> anyhow::Result<()> {
     let channel_mentions = msg.mention_channels;
     let words = msg.content.trim().split_whitespace().count();
-    
     // let re = Regex::new(r"<#[0-9]*>$").unwrap();
     // if re.captures(content)
 
-    if channel_mentions.len() != 1 || words != 1 {
-        return Ok(0);
+    if channel_mentions.len() != 1 || words != 1 || msg.content.is_empty() {
+        anyhow::bail!("no message worth processing");
     }
 
-    let mut msg_to_moove = match msg.referenced_message {
-        Some(m) => m,
-        None => return Ok(0)
-    };
+    let msg_to_moove = msg.referenced_message.context("no message present")?;
 
     let mentioned_channel = channel_mentions[0].id;
 
-    let attachments = msg_to_moove.attachments;
-    let embeds = msg_to_moove.embeds;
+    //steals all attachments, but sets all of them as Image urls, so rip actual docs etc
+    let attachments = msg_to_moove
+        .attachments
+        .into_iter()
+        .map(|att| AttachmentType::Image(Url::parse(att.url.as_str()).unwrap()));
 
-    let sent_by = format!("Sent by {}\n mooved {}\n", msg_to_moove.author, msg.author);
+    //steals all the embeds
+    let embeds: Vec<CreateEmbed> = msg_to_moove
+        .embeds
+        .into_iter()
+        .map(|em| CreateEmbed::from(em))
+        .collect();
 
-    let mut embeds_copy : Vec<CreateEmbed> = Vec::new();
-    for embed in msg_to_moove.embeds {
-        embeds_copy.push(CreateEmbed::from(embed));
-    }
+    let mut new_content = format!("Sent by {}\n mooved {}\n", msg_to_moove.author, msg.author);
+    new_content += format!("Message:\n{}", msg_to_moove.content).as_str();
 
-    // let mut attachment_links : Vec<String> = Vec::new();
-    let attachment_link = msg_to_moove.attachments.pop();
-    // for attachment in msg_to_moove.attachments {
-    //     attachment_links.push(attachment.url);
-    // }
-
-    // if embeds_copy.len() > 0 || attachment_links.len() > 0 {
-    if embeds_copy.len() > 0 {
-        let mut new_content = "".to_string();
-        if !msg_to_moove.content.is_empty() {
-            new_content = format!("Message:\n{}", msg_to_moove.content);
-        }
-        sent_by.push_str(&new_content);
-        match mentioned_channel.send_message(http, |m| {
-            m.content(sent_by).add_embeds(embeds_copy).add_file(attachment_link)
-        }).await {
-            Ok(_) => return Ok(0),
-            Err(e) => return Err(e.to_string())
-        };
-    }
-    else if !msg_to_moove.content.is_empty() {
-        match mentioned_channel.send_message(http, |m| {
-            m.add_embed(|e| {
-                e.title("MOO").field(sent_by, " ", false).field("Message:\n", msg_to_moove.content, false)
+    mentioned_channel
+        .send_message(http, |m| {
+            m.content(new_content)
+                .add_embeds(embeds)
+                .add_files(attachments)
         })
-        }).await {
-            Ok(_) => return Ok(0),
-            Err(e) => return Err(e.to_string())
-        };
-    }
-
-    Err("Something went wrong while mooving the message".to_string())
+        .await?;
+    Ok(())
 }