Przeglądaj źródła

bin/ircd: revert back to suppurt only Privmsg with colon

Dastan-glitch 3 lat temu
rodzic
commit
75a7f8fab6
1 zmienionych plików z 7 dodań i 12 usunięć
  1. 7 12
      bin/ircd/src/irc/client.rs

+ 7 - 12
bin/ircd/src/irc/client.rs

@@ -450,18 +450,13 @@ impl<C: AsyncRead + AsyncWrite + Send + Unpin + 'static> IrcClient<C> {
     }
 
     async fn on_receive_privmsg(&mut self, line: &str, target: &str) -> Result<()> {
-        let message = match line.find(':') {
-            Some(substr_idx) => {
-                if substr_idx >= line.len() {
-                    return Err(Error::MalformedPacket)
-                }
-                line[substr_idx + 1..].to_string()
-            }
-            None => {
-                let split = line.split(' ').collect::<Vec<_>>()[2..].to_vec();
-                split.join(" ")
-            }
-        };
+        let substr_idx = line.find(':').ok_or(Error::MalformedPacket)?;
+
+        if substr_idx >= line.len() {
+            return Err(Error::MalformedPacket)
+        }
+
+        let message = line[substr_idx + 1..].to_string();
 
         info!("[CLIENT {}] (Plain) PRIVMSG {} :{}", self.address, target, message,);