Remove DCC message origin check

Apparently the bot that initiates the DCC transfer is not always the
same bot as the one that was sent the request.

Author: elementalchopsticks

src/main.rs

@@ -30,15 +30,15 @@ fn run(args: &Args) -> Result<()> {
     let query = args.query.join(" ");
     let mut packs = search(&query, args.episode)?;
 
-    if packs.is_empty() {
-        return Err(anyhow!("No results"));
-    }
-
     if args.resolution != 0 {
         let res = format!("{}p", args.resolution);
         packs.retain(|p| p.name.contains(&res));
     }
 
+    if packs.is_empty() {
+        return Err(anyhow!("No results"));
+    }
+
     println!("\x1b[;1mAvailable packs:\x1b[0m");
     for (i, pack) in packs.iter().enumerate() {
         println!(

src/xdcc/mod.rs

@@ -27,7 +27,7 @@ pub struct Pack {
 static PING_RE: SyncLazy<Regex> = SyncLazy::new(|| Regex::new(r#"^(?:\S+ )?PING (\S+)"#).unwrap());
 static MODE_RE: SyncLazy<Regex> = SyncLazy::new(|| Regex::new(r#"^(?:\S+ )?MODE"#).unwrap());
 static DCC_RE: SyncLazy<Regex> = SyncLazy::new(|| {
-    Regex::new(r#"^:(\S+)!.+ PRIVMSG.*(?:DCC|dcc) (?:SEND|send) "?(.*?)"? (\d+) (\d+) (\d+)"#)
+    Regex::new(r#"^(?:\S+ )?PRIVMSG.*(?:DCC|dcc) (?:SEND|send) "?(.*?)"? (\d+) (\d+) (\d+)"#)
         .unwrap()
 });
 
@@ -103,21 +103,18 @@ fn handle_message(
         println!("Waiting for DCC connection...");
     } else if DCC_RE.is_match(message) {
         let caps = DCC_RE.captures(message).unwrap();
-        let botname = &caps[1];
-        let filename = &caps[2];
-        let ip = &caps[3];
-        let port = &caps[4];
-        let size = &caps[5];
-
-        if botname == bot {
-            let dcc = Dcc::new(
-                filename.to_owned(),
-                &format!("{}:{}", ip, port),
-                size.parse().unwrap(),
-            )?;
-
-            return Ok(Some(dcc));
-        }
+        let filename = &caps[1];
+        let ip = &caps[2];
+        let port = &caps[3];
+        let size = &caps[4];
+
+        let dcc = Dcc::new(
+            filename.to_owned(),
+            &format!("{}:{}", ip, port),
+            size.parse().unwrap(),
+        )?;
+
+        return Ok(Some(dcc));
     }
 
     Ok(None)